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 <stephen.day@docker.com>

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

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

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

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

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"

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"

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"
 )

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"
 )
 

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"
 )
 

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

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

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"
 )

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"
 )
 

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

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

registry/storage/driver/fileinfo.go

@@ -1,4 +1,4 @@
-package storagedriver
+package driver
 
 import "time"
 

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"

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"
 )
 

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"

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"
 )

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"
 )

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"
 )
 

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"
 )

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"

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"
 )

registry/storage/driver/storagedriver.go

@@ -1,4 +1,4 @@
-package storagedriver
+package driver
 
 import (
 	"errors"

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"
 )

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

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) {

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.

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

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"
 )

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.

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 {

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"
 )
 

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"

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"

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"
 )
 

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.