From 65b0d73cb749fd9757352f472e399024f1c597df Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Tue, 10 Feb 2015 18:14:23 -0800 Subject: [PATCH] Move storagedriver package to registry/storage/driver This change is slightly more complex than previous package maves in that the package name changed. To address this, we simply always reference the package driver as storagedriver to avoid compatbility issues with existing code. While unfortunate, this can be cleaned up over time. Signed-off-by: Stephen J Day --- cmd/registry-storagedriver-azure/main.go | 4 ++-- cmd/registry-storagedriver-filesystem/main.go | 4 ++-- cmd/registry-storagedriver-inmemory/main.go | 4 ++-- cmd/registry-storagedriver-s3/main.go | 4 ++-- cmd/registry/main.go | 10 +++++----- registry/handlers/api_test.go | 4 ++-- registry/handlers/app.go | 8 ++++---- registry/handlers/app_test.go | 4 ++-- registry/storage/blobstore.go | 2 +- registry/storage/cloudfrontlayerhandler.go | 2 +- registry/storage/delegatelayerhandler.go | 2 +- {storagedriver => registry/storage/driver}/README.md | 0 .../storage/driver}/azure/azure.go | 6 +++--- .../storage/driver}/azure/azure_test.go | 4 ++-- .../storage/driver}/azure/blockblob.go | 0 .../storage/driver}/azure/blockblob_test.go | 0 .../storage/driver}/azure/blockid.go | 0 .../storage/driver}/azure/blockid_test.go | 0 .../storage/driver}/azure/randomwriter.go | 0 .../storage/driver}/azure/randomwriter_test.go | 0 .../storage/driver}/azure/zerofillwriter.go | 0 .../storage/driver}/azure/zerofillwriter_test.go | 0 .../storage/driver}/base/base.go | 2 +- .../storage/driver}/factory/factory.go | 2 +- {storagedriver => registry/storage/driver}/fileinfo.go | 2 +- .../storage/driver}/filesystem/README.md | 0 .../storage/driver}/filesystem/driver.go | 6 +++--- .../storage/driver}/filesystem/driver_test.go | 4 ++-- .../storage/driver}/inmemory/README.md | 0 .../storage/driver}/inmemory/driver.go | 6 +++--- .../storage/driver}/inmemory/driver_test.go | 4 ++-- .../storage/driver}/inmemory/mfs.go | 0 .../storage/driver}/ipc/client.go | 2 +- {storagedriver => registry/storage/driver}/ipc/ipc.go | 2 +- .../storage/driver}/ipc/server.go | 2 +- .../storage/driver}/s3/README.md | 0 {storagedriver => registry/storage/driver}/s3/s3.go | 6 +++--- .../storage/driver}/s3/s3_test.go | 4 ++-- .../storage/driver}/storagedriver.go | 2 +- .../storage/driver}/testsuites/testsuites.go | 2 +- registry/storage/filereader.go | 2 +- registry/storage/filereader_test.go | 2 +- registry/storage/filewriter.go | 2 +- registry/storage/filewriter_test.go | 2 +- registry/storage/layer_test.go | 4 ++-- registry/storage/layerhandler.go | 2 +- registry/storage/layerstore.go | 2 +- registry/storage/layerupload.go | 2 +- registry/storage/manifeststore_test.go | 2 +- registry/storage/notifications/listener_test.go | 2 +- registry/storage/registry.go | 2 +- registry/storage/tagstore.go | 2 +- 52 files changed, 65 insertions(+), 65 deletions(-) rename {storagedriver => registry/storage/driver}/README.md (100%) rename {storagedriver => registry/storage/driver}/azure/azure.go (97%) rename {storagedriver => registry/storage/driver}/azure/azure_test.go (90%) rename {storagedriver => registry/storage/driver}/azure/blockblob.go (100%) rename {storagedriver => registry/storage/driver}/azure/blockblob_test.go (100%) rename {storagedriver => registry/storage/driver}/azure/blockid.go (100%) rename {storagedriver => registry/storage/driver}/azure/blockid_test.go (100%) rename {storagedriver => registry/storage/driver}/azure/randomwriter.go (100%) rename {storagedriver => registry/storage/driver}/azure/randomwriter_test.go (100%) rename {storagedriver => registry/storage/driver}/azure/zerofillwriter.go (100%) rename {storagedriver => registry/storage/driver}/azure/zerofillwriter_test.go (100%) rename {storagedriver => registry/storage/driver}/base/base.go (98%) rename {storagedriver => registry/storage/driver}/factory/factory.go (97%) rename {storagedriver => registry/storage/driver}/fileinfo.go (99%) rename {storagedriver => registry/storage/driver}/filesystem/README.md (100%) rename {storagedriver => registry/storage/driver}/filesystem/driver.go (97%) rename {storagedriver => registry/storage/driver}/filesystem/driver_test.go (81%) rename {storagedriver => registry/storage/driver}/inmemory/README.md (100%) rename {storagedriver => registry/storage/driver}/inmemory/driver.go (96%) rename {storagedriver => registry/storage/driver}/inmemory/driver_test.go (79%) rename {storagedriver => registry/storage/driver}/inmemory/mfs.go (100%) rename {storagedriver => registry/storage/driver}/ipc/client.go (99%) rename {storagedriver => registry/storage/driver}/ipc/ipc.go (98%) rename {storagedriver => registry/storage/driver}/ipc/server.go (98%) rename {storagedriver => registry/storage/driver}/s3/README.md (100%) rename {storagedriver => registry/storage/driver}/s3/s3.go (98%) rename {storagedriver => registry/storage/driver}/s3/s3_test.go (93%) rename {storagedriver => registry/storage/driver}/storagedriver.go (99%) rename {storagedriver => registry/storage/driver}/testsuites/testsuites.go (99%) diff --git a/cmd/registry-storagedriver-azure/main.go b/cmd/registry-storagedriver-azure/main.go index 71b1faaf65..8083d23b44 100644 --- a/cmd/registry-storagedriver-azure/main.go +++ b/cmd/registry-storagedriver-azure/main.go @@ -7,8 +7,8 @@ import ( "os" log "github.com/Sirupsen/logrus" - "github.com/docker/distribution/storagedriver/azure" - "github.com/docker/distribution/storagedriver/ipc" + "github.com/docker/distribution/registry/storage/driver/azure" + "github.com/docker/distribution/registry/storage/driver/ipc" ) // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-filesystem/main.go b/cmd/registry-storagedriver-filesystem/main.go index 2ad6d82e76..93756d2c01 100644 --- a/cmd/registry-storagedriver-filesystem/main.go +++ b/cmd/registry-storagedriver-filesystem/main.go @@ -8,8 +8,8 @@ import ( "github.com/Sirupsen/logrus" - "github.com/docker/distribution/storagedriver/filesystem" - "github.com/docker/distribution/storagedriver/ipc" + "github.com/docker/distribution/registry/storage/driver/filesystem" + "github.com/docker/distribution/registry/storage/driver/ipc" ) // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-inmemory/main.go b/cmd/registry-storagedriver-inmemory/main.go index ef6fabe49b..d957cc2540 100644 --- a/cmd/registry-storagedriver-inmemory/main.go +++ b/cmd/registry-storagedriver-inmemory/main.go @@ -4,8 +4,8 @@ package main import ( "github.com/Sirupsen/logrus" - "github.com/docker/distribution/storagedriver/inmemory" - "github.com/docker/distribution/storagedriver/ipc" + "github.com/docker/distribution/registry/storage/driver/inmemory" + "github.com/docker/distribution/registry/storage/driver/ipc" ) // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry-storagedriver-s3/main.go b/cmd/registry-storagedriver-s3/main.go index be49f15769..8604fef076 100644 --- a/cmd/registry-storagedriver-s3/main.go +++ b/cmd/registry-storagedriver-s3/main.go @@ -8,8 +8,8 @@ import ( "github.com/Sirupsen/logrus" - "github.com/docker/distribution/storagedriver/ipc" - "github.com/docker/distribution/storagedriver/s3" + "github.com/docker/distribution/registry/storage/driver/ipc" + "github.com/docker/distribution/registry/storage/driver/s3" ) // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient diff --git a/cmd/registry/main.go b/cmd/registry/main.go index 535b9cde0f..79f45ab0ce 100644 --- a/cmd/registry/main.go +++ b/cmd/registry/main.go @@ -10,14 +10,14 @@ import ( log "github.com/Sirupsen/logrus" "github.com/bugsnag/bugsnag-go" - _ "github.com/docker/distribution/registry/auth/silly" - _ "github.com/docker/distribution/registry/auth/token" "github.com/docker/distribution/configuration" ctxu "github.com/docker/distribution/context" + _ "github.com/docker/distribution/registry/auth/silly" + _ "github.com/docker/distribution/registry/auth/token" "github.com/docker/distribution/registry/handlers" - _ "github.com/docker/distribution/storagedriver/filesystem" - _ "github.com/docker/distribution/storagedriver/inmemory" - _ "github.com/docker/distribution/storagedriver/s3" + _ "github.com/docker/distribution/registry/storage/driver/filesystem" + _ "github.com/docker/distribution/registry/storage/driver/inmemory" + _ "github.com/docker/distribution/registry/storage/driver/s3" "github.com/docker/distribution/version" gorhandlers "github.com/gorilla/handlers" "github.com/yvasiyarov/gorelic" diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go index 08d0cf9724..a14e93dc96 100644 --- a/registry/handlers/api_test.go +++ b/registry/handlers/api_test.go @@ -14,11 +14,11 @@ import ( "reflect" "testing" - "github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/configuration" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - _ "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/api/v2" + _ "github.com/docker/distribution/registry/storage/driver/inmemory" "github.com/docker/distribution/testutil" "github.com/docker/libtrust" "github.com/gorilla/handlers" diff --git a/registry/handlers/app.go b/registry/handlers/app.go index 09c0c621e6..7a36309bb2 100644 --- a/registry/handlers/app.go +++ b/registry/handlers/app.go @@ -7,14 +7,14 @@ import ( "os" "code.google.com/p/go-uuid/uuid" - "github.com/docker/distribution/registry/api/v2" - "github.com/docker/distribution/registry/auth" "github.com/docker/distribution/configuration" ctxu "github.com/docker/distribution/context" + "github.com/docker/distribution/registry/api/v2" + "github.com/docker/distribution/registry/auth" "github.com/docker/distribution/registry/storage" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/factory" "github.com/docker/distribution/registry/storage/notifications" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/factory" "github.com/gorilla/mux" "golang.org/x/net/context" ) diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go index b27c788a0d..158f5fc18c 100644 --- a/registry/handlers/app_test.go +++ b/registry/handlers/app_test.go @@ -7,11 +7,11 @@ import ( "net/url" "testing" + "github.com/docker/distribution/configuration" "github.com/docker/distribution/registry/api/v2" _ "github.com/docker/distribution/registry/auth/silly" - "github.com/docker/distribution/configuration" "github.com/docker/distribution/registry/storage" - "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/storage/driver/inmemory" "golang.org/x/net/context" ) diff --git a/registry/storage/blobstore.go b/registry/storage/blobstore.go index ac123f44a6..975df19f96 100644 --- a/registry/storage/blobstore.go +++ b/registry/storage/blobstore.go @@ -5,7 +5,7 @@ import ( ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "golang.org/x/net/context" ) diff --git a/registry/storage/cloudfrontlayerhandler.go b/registry/storage/cloudfrontlayerhandler.go index fa420cc7d2..f887895c63 100644 --- a/registry/storage/cloudfrontlayerhandler.go +++ b/registry/storage/cloudfrontlayerhandler.go @@ -10,7 +10,7 @@ import ( "time" "github.com/AdRoll/goamz/cloudfront" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // cloudFrontLayerHandler provides an simple implementation of layerHandler that diff --git a/registry/storage/delegatelayerhandler.go b/registry/storage/delegatelayerhandler.go index 7ed6d87b98..0135402385 100644 --- a/registry/storage/delegatelayerhandler.go +++ b/registry/storage/delegatelayerhandler.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // delegateLayerHandler provides a simple implementation of layerHandler that diff --git a/storagedriver/README.md b/registry/storage/driver/README.md similarity index 100% rename from storagedriver/README.md rename to registry/storage/driver/README.md diff --git a/storagedriver/azure/azure.go b/registry/storage/driver/azure/azure.go similarity index 97% rename from storagedriver/azure/azure.go rename to registry/storage/driver/azure/azure.go index b6c42f666d..6ccbff40b0 100644 --- a/storagedriver/azure/azure.go +++ b/registry/storage/driver/azure/azure.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/base" - "github.com/docker/distribution/storagedriver/factory" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/base" + "github.com/docker/distribution/registry/storage/driver/factory" azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage" ) diff --git a/storagedriver/azure/azure_test.go b/registry/storage/driver/azure/azure_test.go similarity index 90% rename from storagedriver/azure/azure_test.go rename to registry/storage/driver/azure/azure_test.go index 170e20f87c..a8fdf3e900 100644 --- a/storagedriver/azure/azure_test.go +++ b/registry/storage/driver/azure/azure_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/testsuites" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/testsuites" . "gopkg.in/check.v1" ) diff --git a/storagedriver/azure/blockblob.go b/registry/storage/driver/azure/blockblob.go similarity index 100% rename from storagedriver/azure/blockblob.go rename to registry/storage/driver/azure/blockblob.go diff --git a/storagedriver/azure/blockblob_test.go b/registry/storage/driver/azure/blockblob_test.go similarity index 100% rename from storagedriver/azure/blockblob_test.go rename to registry/storage/driver/azure/blockblob_test.go diff --git a/storagedriver/azure/blockid.go b/registry/storage/driver/azure/blockid.go similarity index 100% rename from storagedriver/azure/blockid.go rename to registry/storage/driver/azure/blockid.go diff --git a/storagedriver/azure/blockid_test.go b/registry/storage/driver/azure/blockid_test.go similarity index 100% rename from storagedriver/azure/blockid_test.go rename to registry/storage/driver/azure/blockid_test.go diff --git a/storagedriver/azure/randomwriter.go b/registry/storage/driver/azure/randomwriter.go similarity index 100% rename from storagedriver/azure/randomwriter.go rename to registry/storage/driver/azure/randomwriter.go diff --git a/storagedriver/azure/randomwriter_test.go b/registry/storage/driver/azure/randomwriter_test.go similarity index 100% rename from storagedriver/azure/randomwriter_test.go rename to registry/storage/driver/azure/randomwriter_test.go diff --git a/storagedriver/azure/zerofillwriter.go b/registry/storage/driver/azure/zerofillwriter.go similarity index 100% rename from storagedriver/azure/zerofillwriter.go rename to registry/storage/driver/azure/zerofillwriter.go diff --git a/storagedriver/azure/zerofillwriter_test.go b/registry/storage/driver/azure/zerofillwriter_test.go similarity index 100% rename from storagedriver/azure/zerofillwriter_test.go rename to registry/storage/driver/azure/zerofillwriter_test.go diff --git a/storagedriver/base/base.go b/registry/storage/driver/base/base.go similarity index 98% rename from storagedriver/base/base.go rename to registry/storage/driver/base/base.go index 51fdf512bf..0365ba3cd1 100644 --- a/storagedriver/base/base.go +++ b/registry/storage/driver/base/base.go @@ -40,7 +40,7 @@ package base import ( "io" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // Base provides a wrapper around a storagedriver implementation that provides diff --git a/storagedriver/factory/factory.go b/registry/storage/driver/factory/factory.go similarity index 97% rename from storagedriver/factory/factory.go rename to registry/storage/driver/factory/factory.go index ba3b7dfac9..66d160f385 100644 --- a/storagedriver/factory/factory.go +++ b/registry/storage/driver/factory/factory.go @@ -3,7 +3,7 @@ package factory import ( "fmt" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // driverFactories stores an internal mapping between storage driver names and their respective diff --git a/storagedriver/fileinfo.go b/registry/storage/driver/fileinfo.go similarity index 99% rename from storagedriver/fileinfo.go rename to registry/storage/driver/fileinfo.go index 82e3d5469f..e5064029ad 100644 --- a/storagedriver/fileinfo.go +++ b/registry/storage/driver/fileinfo.go @@ -1,4 +1,4 @@ -package storagedriver +package driver import "time" diff --git a/storagedriver/filesystem/README.md b/registry/storage/driver/filesystem/README.md similarity index 100% rename from storagedriver/filesystem/README.md rename to registry/storage/driver/filesystem/README.md diff --git a/storagedriver/filesystem/driver.go b/registry/storage/driver/filesystem/driver.go similarity index 97% rename from storagedriver/filesystem/driver.go rename to registry/storage/driver/filesystem/driver.go index e76b4bab05..0e5aea755b 100644 --- a/storagedriver/filesystem/driver.go +++ b/registry/storage/driver/filesystem/driver.go @@ -9,9 +9,9 @@ import ( "path" "time" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/base" - "github.com/docker/distribution/storagedriver/factory" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/base" + "github.com/docker/distribution/registry/storage/driver/factory" ) const driverName = "filesystem" diff --git a/storagedriver/filesystem/driver_test.go b/registry/storage/driver/filesystem/driver_test.go similarity index 81% rename from storagedriver/filesystem/driver_test.go rename to registry/storage/driver/filesystem/driver_test.go index 08b203bd48..8572de16e7 100644 --- a/storagedriver/filesystem/driver_test.go +++ b/registry/storage/driver/filesystem/driver_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/testsuites" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/testsuites" . "gopkg.in/check.v1" ) diff --git a/storagedriver/inmemory/README.md b/registry/storage/driver/inmemory/README.md similarity index 100% rename from storagedriver/inmemory/README.md rename to registry/storage/driver/inmemory/README.md diff --git a/storagedriver/inmemory/driver.go b/registry/storage/driver/inmemory/driver.go similarity index 96% rename from storagedriver/inmemory/driver.go rename to registry/storage/driver/inmemory/driver.go index d3fdec57da..f2c9c3ffb4 100644 --- a/storagedriver/inmemory/driver.go +++ b/registry/storage/driver/inmemory/driver.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/base" - "github.com/docker/distribution/storagedriver/factory" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/base" + "github.com/docker/distribution/registry/storage/driver/factory" ) const driverName = "inmemory" diff --git a/storagedriver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go similarity index 79% rename from storagedriver/inmemory/driver_test.go rename to registry/storage/driver/inmemory/driver_test.go index 1034422ee7..a02ff23e32 100644 --- a/storagedriver/inmemory/driver_test.go +++ b/registry/storage/driver/inmemory/driver_test.go @@ -3,8 +3,8 @@ package inmemory import ( "testing" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/testsuites" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/testsuites" "gopkg.in/check.v1" ) diff --git a/storagedriver/inmemory/mfs.go b/registry/storage/driver/inmemory/mfs.go similarity index 100% rename from storagedriver/inmemory/mfs.go rename to registry/storage/driver/inmemory/mfs.go diff --git a/storagedriver/ipc/client.go b/registry/storage/driver/ipc/client.go similarity index 99% rename from storagedriver/ipc/client.go rename to registry/storage/driver/ipc/client.go index fab731132c..daa823d7e9 100644 --- a/storagedriver/ipc/client.go +++ b/registry/storage/driver/ipc/client.go @@ -13,7 +13,7 @@ import ( "os/exec" "syscall" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "github.com/docker/libchan" "github.com/docker/libchan/spdy" ) diff --git a/storagedriver/ipc/ipc.go b/registry/storage/driver/ipc/ipc.go similarity index 98% rename from storagedriver/ipc/ipc.go rename to registry/storage/driver/ipc/ipc.go index e7ddd69e76..dabb834de1 100644 --- a/storagedriver/ipc/ipc.go +++ b/registry/storage/driver/ipc/ipc.go @@ -7,7 +7,7 @@ import ( "io" "reflect" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "github.com/docker/libchan" ) diff --git a/storagedriver/ipc/server.go b/registry/storage/driver/ipc/server.go similarity index 98% rename from storagedriver/ipc/server.go rename to registry/storage/driver/ipc/server.go index 6d7df2eb70..4c6f1d4dee 100644 --- a/storagedriver/ipc/server.go +++ b/registry/storage/driver/ipc/server.go @@ -10,7 +10,7 @@ import ( "os" "reflect" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "github.com/docker/libchan" "github.com/docker/libchan/spdy" ) diff --git a/storagedriver/s3/README.md b/registry/storage/driver/s3/README.md similarity index 100% rename from storagedriver/s3/README.md rename to registry/storage/driver/s3/README.md diff --git a/storagedriver/s3/s3.go b/registry/storage/driver/s3/s3.go similarity index 98% rename from storagedriver/s3/s3.go rename to registry/storage/driver/s3/s3.go index c9d4ccbed7..eb9f08f492 100644 --- a/storagedriver/s3/s3.go +++ b/registry/storage/driver/s3/s3.go @@ -26,9 +26,9 @@ import ( "github.com/AdRoll/goamz/aws" "github.com/AdRoll/goamz/s3" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/base" - "github.com/docker/distribution/storagedriver/factory" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/base" + "github.com/docker/distribution/registry/storage/driver/factory" ) const driverName = "s3" diff --git a/storagedriver/s3/s3_test.go b/registry/storage/driver/s3/s3_test.go similarity index 93% rename from storagedriver/s3/s3_test.go rename to registry/storage/driver/s3/s3_test.go index 0175e8acbb..fb2003e1e3 100644 --- a/storagedriver/s3/s3_test.go +++ b/registry/storage/driver/s3/s3_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/AdRoll/goamz/aws" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/testsuites" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/testsuites" "gopkg.in/check.v1" ) diff --git a/storagedriver/storagedriver.go b/registry/storage/driver/storagedriver.go similarity index 99% rename from storagedriver/storagedriver.go rename to registry/storage/driver/storagedriver.go index c94ef8d619..dd8fb4a06f 100644 --- a/storagedriver/storagedriver.go +++ b/registry/storage/driver/storagedriver.go @@ -1,4 +1,4 @@ -package storagedriver +package driver import ( "errors" diff --git a/storagedriver/testsuites/testsuites.go b/registry/storage/driver/testsuites/testsuites.go similarity index 99% rename from storagedriver/testsuites/testsuites.go rename to registry/storage/driver/testsuites/testsuites.go index da12762712..cfa3a48a42 100644 --- a/storagedriver/testsuites/testsuites.go +++ b/registry/storage/driver/testsuites/testsuites.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "gopkg.in/check.v1" ) diff --git a/registry/storage/filereader.go b/registry/storage/filereader.go index 9bc09afefa..4cb2b3313c 100644 --- a/registry/storage/filereader.go +++ b/registry/storage/filereader.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // TODO(stevvooe): Set an optimal buffer size here. We'll have to diff --git a/registry/storage/filereader_test.go b/registry/storage/filereader_test.go index 53dd6c9a5f..7c554e8b9f 100644 --- a/registry/storage/filereader_test.go +++ b/registry/storage/filereader_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/storage/driver/inmemory" ) func TestSimpleRead(t *testing.T) { diff --git a/registry/storage/filewriter.go b/registry/storage/filewriter.go index 5037f1608a..cbf03704c7 100644 --- a/registry/storage/filewriter.go +++ b/registry/storage/filewriter.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // fileWriter implements a remote file writer backed by a storage driver. diff --git a/registry/storage/filewriter_test.go b/registry/storage/filewriter_test.go index 2235462f88..1a38a51936 100644 --- a/registry/storage/filewriter_test.go +++ b/registry/storage/filewriter_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/storage/driver/inmemory" ) // TestSimpleWrite takes the fileWriter through common write operations diff --git a/registry/storage/layer_test.go b/registry/storage/layer_test.go index c7d64b7945..4898299319 100644 --- a/registry/storage/layer_test.go +++ b/registry/storage/layer_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver" - "github.com/docker/distribution/storagedriver/inmemory" + storagedriver "github.com/docker/distribution/registry/storage/driver" + "github.com/docker/distribution/registry/storage/driver/inmemory" "github.com/docker/distribution/testutil" "golang.org/x/net/context" ) diff --git a/registry/storage/layerhandler.go b/registry/storage/layerhandler.go index 2755470ebf..5bcfedddfa 100644 --- a/registry/storage/layerhandler.go +++ b/registry/storage/layerhandler.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // LayerHandler provides middleware for serving the contents of a Layer. diff --git a/registry/storage/layerstore.go b/registry/storage/layerstore.go index b6578792d4..e4760b4ea4 100644 --- a/registry/storage/layerstore.go +++ b/registry/storage/layerstore.go @@ -7,7 +7,7 @@ import ( ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) type layerStore struct { diff --git a/registry/storage/layerupload.go b/registry/storage/layerupload.go index 54860913a7..e6cf21a9c7 100644 --- a/registry/storage/layerupload.go +++ b/registry/storage/layerupload.go @@ -9,7 +9,7 @@ import ( "github.com/Sirupsen/logrus" ctxu "github.com/docker/distribution/context" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "github.com/docker/docker/pkg/tarsum" ) diff --git a/registry/storage/manifeststore_test.go b/registry/storage/manifeststore_test.go index 8284ce9486..1fd026629b 100644 --- a/registry/storage/manifeststore_test.go +++ b/registry/storage/manifeststore_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" - "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/storage/driver/inmemory" "github.com/docker/distribution/testutil" "github.com/docker/libtrust" "golang.org/x/net/context" diff --git a/registry/storage/notifications/listener_test.go b/registry/storage/notifications/listener_test.go index b62e7e7e82..b8d6a31e54 100644 --- a/registry/storage/notifications/listener_test.go +++ b/registry/storage/notifications/listener_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" "github.com/docker/distribution/registry/storage" - "github.com/docker/distribution/storagedriver/inmemory" + "github.com/docker/distribution/registry/storage/driver/inmemory" "github.com/docker/distribution/testutil" "github.com/docker/libtrust" "golang.org/x/net/context" diff --git a/registry/storage/registry.go b/registry/storage/registry.go index ed8650076d..c4ca2f8004 100644 --- a/registry/storage/registry.go +++ b/registry/storage/registry.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" "golang.org/x/net/context" ) diff --git a/registry/storage/tagstore.go b/registry/storage/tagstore.go index f7b87a25af..6ae3e5f88e 100644 --- a/registry/storage/tagstore.go +++ b/registry/storage/tagstore.go @@ -4,7 +4,7 @@ import ( "path" "github.com/docker/distribution/digest" - "github.com/docker/distribution/storagedriver" + storagedriver "github.com/docker/distribution/registry/storage/driver" ) // tagStore provides methods to manage manifest tags in a backend storage driver.