From bb3c9c5927d38f1e7251bbaf16fbf8c8631876d0 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 21 Jul 2017 13:58:08 -0700 Subject: [PATCH] Rename content/fs to content/local Signed-off-by: Derek McGowan --- content/{fs => local}/locks.go | 2 +- content/{fs => local}/readerat.go | 2 +- content/{fs => local}/store.go | 2 +- content/{fs => local}/store_linux.go | 2 +- content/{fs => local}/store_test.go | 2 +- content/{fs => local}/store_unix.go | 2 +- content/{fs => local}/store_windows.go | 2 +- content/{fs => local}/writer.go | 2 +- metadata/content_test.go | 4 ++-- server/server.go | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) rename content/{fs => local}/locks.go (97%) rename content/{fs => local}/readerat.go (96%) rename content/{fs => local}/store.go (99%) rename content/{fs => local}/store_linux.go (93%) rename content/{fs => local}/store_test.go (99%) rename content/{fs => local}/store_unix.go (94%) rename content/{fs => local}/store_windows.go (87%) rename content/{fs => local}/writer.go (99%) diff --git a/content/fs/locks.go b/content/local/locks.go similarity index 97% rename from content/fs/locks.go rename to content/local/locks.go index 65d4ad007..cf5d0c59f 100644 --- a/content/fs/locks.go +++ b/content/local/locks.go @@ -1,4 +1,4 @@ -package fs +package local import ( "sync" diff --git a/content/fs/readerat.go b/content/local/readerat.go similarity index 96% rename from content/fs/readerat.go rename to content/local/readerat.go index 2552dc642..47521bc1a 100644 --- a/content/fs/readerat.go +++ b/content/local/readerat.go @@ -1,4 +1,4 @@ -package fs +package local import ( "io" diff --git a/content/fs/store.go b/content/local/store.go similarity index 99% rename from content/fs/store.go rename to content/local/store.go index f99158b74..dd415c78d 100644 --- a/content/fs/store.go +++ b/content/local/store.go @@ -1,4 +1,4 @@ -package fs +package local import ( "context" diff --git a/content/fs/store_linux.go b/content/local/store_linux.go similarity index 93% rename from content/fs/store_linux.go rename to content/local/store_linux.go index 9000c2d97..e1f89f31d 100644 --- a/content/fs/store_linux.go +++ b/content/local/store_linux.go @@ -1,4 +1,4 @@ -package fs +package local import ( "os" diff --git a/content/fs/store_test.go b/content/local/store_test.go similarity index 99% rename from content/fs/store_test.go rename to content/local/store_test.go index 7cbdd45e4..47bb77a1f 100644 --- a/content/fs/store_test.go +++ b/content/local/store_test.go @@ -1,4 +1,4 @@ -package fs +package local import ( "bufio" diff --git a/content/fs/store_unix.go b/content/local/store_unix.go similarity index 94% rename from content/fs/store_unix.go rename to content/local/store_unix.go index 443c4150f..75b269972 100644 --- a/content/fs/store_unix.go +++ b/content/local/store_unix.go @@ -1,6 +1,6 @@ // +build darwin freebsd -package fs +package local import ( "os" diff --git a/content/fs/store_windows.go b/content/local/store_windows.go similarity index 87% rename from content/fs/store_windows.go rename to content/local/store_windows.go index 8e3350075..7fb6ad43a 100644 --- a/content/fs/store_windows.go +++ b/content/local/store_windows.go @@ -1,4 +1,4 @@ -package fs +package local import ( "os" diff --git a/content/fs/writer.go b/content/local/writer.go similarity index 99% rename from content/fs/writer.go rename to content/local/writer.go index 8b1c76aee..e7a74b290 100644 --- a/content/fs/writer.go +++ b/content/local/writer.go @@ -1,4 +1,4 @@ -package fs +package local import ( "os" diff --git a/metadata/content_test.go b/metadata/content_test.go index 9ce2fed8b..92df72bf5 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -7,14 +7,14 @@ import ( "github.com/boltdb/bolt" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/fs" + "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/content/testsuite" ) func TestContent(t *testing.T) { testsuite.ContentSuite(t, "metadata", func(ctx context.Context, root string) (content.Store, func(), error) { // TODO: Use mocked or in-memory store - cs, err := fs.NewStore(root) + cs, err := local.NewStore(root) if err != nil { return nil, nil, err } diff --git a/server/server.go b/server/server.go index ef75bb087..b2a260b11 100644 --- a/server/server.go +++ b/server/server.go @@ -19,7 +19,7 @@ import ( snapshot "github.com/containerd/containerd/api/services/snapshot/v1" tasks "github.com/containerd/containerd/api/services/tasks/v1" version "github.com/containerd/containerd/api/services/version/v1" - "github.com/containerd/containerd/content/fs" + "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/events" "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" @@ -161,7 +161,7 @@ func loadPlugins(config *Config) ([]*plugin.Registration, error) { Type: plugin.ContentPlugin, ID: "content", Init: func(ic *plugin.InitContext) (interface{}, error) { - return fs.NewStore(ic.Root) + return local.NewStore(ic.Root) }, }) plugin.Register(&plugin.Registration{