github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move client content store to proxy package

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2018-05-08 14:54:02 -07:00
parent 48b0a022ef
commit 6e64091322
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@ -38,6 +38,7 @@ import (
versionservice "github.com/containerd/containerd/api/services/version/v1" versionservice "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
contentproxy "github.com/containerd/containerd/content/proxy"
"github.com/containerd/containerd/defaults" "github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/dialer" "github.com/containerd/containerd/dialer"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
@ -460,7 +461,7 @@ func (c *Client) ContentStore() content.Store {
if c.contentStore != nil { if c.contentStore != nil {
return c.contentStore return c.contentStore
} }
return NewContentStoreFromClient(contentapi.NewContentClient(c.conn)) return contentproxy.NewContentStore(contentapi.NewContentClient(c.conn))
} }
// SnapshotService returns the underlying snapshotter for the provided snapshotter name // SnapshotService returns the underlying snapshotter for the provided snapshotter name

2
content_reader.go → content/proxy/content_reader.go
View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package containerd package proxy
import ( import (
"context" "context"

7
content_store.go → content/proxy/content_store.go
View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package containerd package proxy
import ( import (
"context" "context"
@ -31,8 +31,9 @@ type remoteContent struct {
client contentapi.ContentClient client contentapi.ContentClient
} }
// NewContentStoreFromClient returns a new content store // NewContentStore returns a new content store which communicates over a GRPC
func NewContentStoreFromClient(client contentapi.ContentClient) content.Store { // connection using the containerd content GRPC API.
func NewContentStore(client contentapi.ContentClient) content.Store {
return &remoteContent{ return &remoteContent{
client: client, client: client,
} }

2
content_writer.go → content/proxy/content_writer.go
View File

@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
*/ */
package containerd package proxy
import ( import (
"context" "context"