alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Move storagedriver package to registry/storage/driver

Browse source 
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>
This commit is contained in:
Stephen J Day 2015-02-10 18:14:23 -08:00
parent 3468fbd4a8
commit 65b0d73cb7
52 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/registry-storagedriver-azure/main.go
View file

@ -7,8 +7,8 @@ import (
"os" "os"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/distribution/storagedriver/azure" "github.com/docker/distribution/registry/storage/driver/azure"
"github.com/docker/distribution/storagedriver/ipc" "github.com/docker/distribution/registry/storage/driver/ipc"
) )
// An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient // An out-of-process Azure Storage driver, intended to be run by ipc.NewDriverClient

4
cmd/registry-storagedriver-filesystem/main.go
View file

@ -8,8 +8,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/distribution/storagedriver/filesystem" "github.com/docker/distribution/registry/storage/driver/filesystem"
"github.com/docker/distribution/storagedriver/ipc" "github.com/docker/distribution/registry/storage/driver/ipc"
) )
// An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient // An out-of-process filesystem driver, intended to be run by ipc.NewDriverClient

4
cmd/registry-storagedriver-inmemory/main.go
View file

@ -4,8 +4,8 @@ package main
import ( import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/distribution/storagedriver/inmemory" "github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/storagedriver/ipc" "github.com/docker/distribution/registry/storage/driver/ipc"
) )
// An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient // An out-of-process inmemory driver, intended to be run by ipc.NewDriverClient

4
cmd/registry-storagedriver-s3/main.go
View file

@ -8,8 +8,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/distribution/storagedriver/ipc" "github.com/docker/distribution/registry/storage/driver/ipc"
"github.com/docker/distribution/storagedriver/s3" "github.com/docker/distribution/registry/storage/driver/s3"
) )
// An out-of-process S3 driver, intended to be run by ipc.NewDriverClient // An out-of-process S3 driver, intended to be run by ipc.NewDriverClient

10
cmd/registry/main.go
View file

@ -10,14 +10,14 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/bugsnag/bugsnag-go" "github.com/bugsnag/bugsnag-go"
_ "github.com/docker/distribution/registry/auth/silly"
_ "github.com/docker/distribution/registry/auth/token"
"github.com/docker/distribution/configuration" "github.com/docker/distribution/configuration"
ctxu "github.com/docker/distribution/context" 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/registry/handlers"
_ "github.com/docker/distribution/storagedriver/filesystem" _ "github.com/docker/distribution/registry/storage/driver/filesystem"
_ "github.com/docker/distribution/storagedriver/inmemory" _ "github.com/docker/distribution/registry/storage/driver/inmemory"
_ "github.com/docker/distribution/storagedriver/s3" _ "github.com/docker/distribution/registry/storage/driver/s3"
"github.com/docker/distribution/version" "github.com/docker/distribution/version"
gorhandlers "github.com/gorilla/handlers" gorhandlers "github.com/gorilla/handlers"
"github.com/yvasiyarov/gorelic" "github.com/yvasiyarov/gorelic"

4
registry/handlers/api_test.go
View file

@ -14,11 +14,11 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/docker/distribution/registry/api/v2"
"github.com/docker/distribution/configuration" "github.com/docker/distribution/configuration"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/manifest" "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/distribution/testutil"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"

8
registry/handlers/app.go
View file

@ -7,14 +7,14 @@ import (
"os" "os"
"code.google.com/p/go-uuid/uuid" "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" "github.com/docker/distribution/configuration"
ctxu "github.com/docker/distribution/context" 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" "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/registry/storage/notifications"
"github.com/docker/distribution/storagedriver"
"github.com/docker/distribution/storagedriver/factory"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

4
registry/handlers/app_test.go
View file

@ -7,11 +7,11 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/api/v2"
_ "github.com/docker/distribution/registry/auth/silly" _ "github.com/docker/distribution/registry/auth/silly"
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/registry/storage" "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" "golang.org/x/net/context"
) )

2
registry/storage/blobstore.go
View file

@ -5,7 +5,7 @@ import (
ctxu "github.com/docker/distribution/context" ctxu "github.com/docker/distribution/context"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

2
registry/storage/cloudfrontlayerhandler.go
View file

@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/AdRoll/goamz/cloudfront" "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 // cloudFrontLayerHandler provides an simple implementation of layerHandler that

2
registry/storage/delegatelayerhandler.go
View file

@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
) )
// delegateLayerHandler provides a simple implementation of layerHandler that // delegateLayerHandler provides a simple implementation of layerHandler that

0
storagedriver/README.md → registry/storage/driver/README.md
View file

6
storagedriver/azure/azure.go → registry/storage/driver/azure/azure.go
View file

@ -11,9 +11,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/base" "github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/storagedriver/factory" "github.com/docker/distribution/registry/storage/driver/factory"
azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage" azure "github.com/MSOpenTech/azure-sdk-for-go/clients/storage"
) )

4
storagedriver/azure/azure_test.go → registry/storage/driver/azure/azure_test.go
View file

@ -6,8 +6,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/testsuites" "github.com/docker/distribution/registry/storage/driver/testsuites"
. "gopkg.in/check.v1" . "gopkg.in/check.v1"
) )

0
storagedriver/azure/blockblob.go → registry/storage/driver/azure/blockblob.go
View file

0
storagedriver/azure/blockblob_test.go → registry/storage/driver/azure/blockblob_test.go
View file

0
storagedriver/azure/blockid.go → registry/storage/driver/azure/blockid.go
View file

0
storagedriver/azure/blockid_test.go → registry/storage/driver/azure/blockid_test.go
View file

0
storagedriver/azure/randomwriter.go → registry/storage/driver/azure/randomwriter.go
View file

0
storagedriver/azure/randomwriter_test.go → registry/storage/driver/azure/randomwriter_test.go
View file

0
storagedriver/azure/zerofillwriter.go → registry/storage/driver/azure/zerofillwriter.go
View file

0
storagedriver/azure/zerofillwriter_test.go → registry/storage/driver/azure/zerofillwriter_test.go
View file

2
storagedriver/base/base.go → registry/storage/driver/base/base.go
View file

@ -40,7 +40,7 @@ package base
import ( import (
"io" "io"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
) )
// Base provides a wrapper around a storagedriver implementation that provides // Base provides a wrapper around a storagedriver implementation that provides

2
storagedriver/factory/factory.go → registry/storage/driver/factory/factory.go
View file

@ -3,7 +3,7 @@ package factory
import ( import (
"fmt" "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 // driverFactories stores an internal mapping between storage driver names and their respective

2
storagedriver/fileinfo.go → registry/storage/driver/fileinfo.go
View file

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

0
storagedriver/filesystem/README.md → registry/storage/driver/filesystem/README.md
View file

6
storagedriver/filesystem/driver.go → registry/storage/driver/filesystem/driver.go
View file

@ -9,9 +9,9 @@ import (
"path" "path"
"time" "time"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/base" "github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/storagedriver/factory" "github.com/docker/distribution/registry/storage/driver/factory"
) )
const driverName = "filesystem" const driverName = "filesystem"

4
storagedriver/filesystem/driver_test.go → registry/storage/driver/filesystem/driver_test.go
View file

@ -5,8 +5,8 @@ import (
"os" "os"
"testing" "testing"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/testsuites" "github.com/docker/distribution/registry/storage/driver/testsuites"
. "gopkg.in/check.v1" . "gopkg.in/check.v1"
) )

0
storagedriver/inmemory/README.md → registry/storage/driver/inmemory/README.md
View file

6
storagedriver/inmemory/driver.go → registry/storage/driver/inmemory/driver.go
View file

@ -8,9 +8,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/base" "github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/storagedriver/factory" "github.com/docker/distribution/registry/storage/driver/factory"
) )
const driverName = "inmemory" const driverName = "inmemory"

4
storagedriver/inmemory/driver_test.go → registry/storage/driver/inmemory/driver_test.go
View file

@ -3,8 +3,8 @@ package inmemory
import ( import (
"testing" "testing"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/testsuites" "github.com/docker/distribution/registry/storage/driver/testsuites"
"gopkg.in/check.v1" "gopkg.in/check.v1"
) )

0
storagedriver/inmemory/mfs.go → registry/storage/driver/inmemory/mfs.go
View file

2
storagedriver/ipc/client.go → registry/storage/driver/ipc/client.go
View file

@ -13,7 +13,7 @@ import (
"os/exec" "os/exec"
"syscall" "syscall"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/libchan" "github.com/docker/libchan"
"github.com/docker/libchan/spdy" "github.com/docker/libchan/spdy"
) )

2
storagedriver/ipc/ipc.go → registry/storage/driver/ipc/ipc.go
View file

@ -7,7 +7,7 @@ import (
"io" "io"
"reflect" "reflect"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/libchan" "github.com/docker/libchan"
) )

2
storagedriver/ipc/server.go → registry/storage/driver/ipc/server.go
View file

@ -10,7 +10,7 @@ import (
"os" "os"
"reflect" "reflect"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/libchan" "github.com/docker/libchan"
"github.com/docker/libchan/spdy" "github.com/docker/libchan/spdy"
) )

0
storagedriver/s3/README.md → registry/storage/driver/s3/README.md
View file

6
storagedriver/s3/s3.go → registry/storage/driver/s3/s3.go
View file

@ -26,9 +26,9 @@ import (
"github.com/AdRoll/goamz/aws" "github.com/AdRoll/goamz/aws"
"github.com/AdRoll/goamz/s3" "github.com/AdRoll/goamz/s3"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/base" "github.com/docker/distribution/registry/storage/driver/base"
"github.com/docker/distribution/storagedriver/factory" "github.com/docker/distribution/registry/storage/driver/factory"
) )
const driverName = "s3" const driverName = "s3"

4
storagedriver/s3/s3_test.go → registry/storage/driver/s3/s3_test.go
View file

@ -7,8 +7,8 @@ import (
"testing" "testing"
"github.com/AdRoll/goamz/aws" "github.com/AdRoll/goamz/aws"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/testsuites" "github.com/docker/distribution/registry/storage/driver/testsuites"
"gopkg.in/check.v1" "gopkg.in/check.v1"
) )

2
storagedriver/storagedriver.go → registry/storage/driver/storagedriver.go
View file

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

2
storagedriver/testsuites/testsuites.go → registry/storage/driver/testsuites/testsuites.go
View file

@ -14,7 +14,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"gopkg.in/check.v1" "gopkg.in/check.v1"
) )

2
registry/storage/filereader.go
View file

@ -9,7 +9,7 @@ import (
"os" "os"
"time" "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 // TODO(stevvooe): Set an optimal buffer size here. We'll have to

2
registry/storage/filereader_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/storagedriver/inmemory" "github.com/docker/distribution/registry/storage/driver/inmemory"
) )
func TestSimpleRead(t *testing.T) { func TestSimpleRead(t *testing.T) {

2
registry/storage/filewriter.go
View file

@ -6,7 +6,7 @@ import (
"io" "io"
"os" "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. // fileWriter implements a remote file writer backed by a storage driver.

2
registry/storage/filewriter_test.go
View file

@ -8,7 +8,7 @@ import (
"testing" "testing"
"github.com/docker/distribution/digest" "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 // TestSimpleWrite takes the fileWriter through common write operations

4
registry/storage/layer_test.go
View file

@ -10,8 +10,8 @@ import (
"testing" "testing"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/storagedriver/inmemory" "github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil" "github.com/docker/distribution/testutil"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

2
registry/storage/layerhandler.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"net/http" "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. // LayerHandler provides middleware for serving the contents of a Layer.

2
registry/storage/layerstore.go
View file

@ -7,7 +7,7 @@ import (
ctxu "github.com/docker/distribution/context" ctxu "github.com/docker/distribution/context"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/manifest" "github.com/docker/distribution/manifest"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
) )
type layerStore struct { type layerStore struct {

2
registry/storage/layerupload.go
View file

@ -9,7 +9,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
ctxu "github.com/docker/distribution/context" ctxu "github.com/docker/distribution/context"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"github.com/docker/docker/pkg/tarsum" "github.com/docker/docker/pkg/tarsum"
) )

2
registry/storage/manifeststore_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/manifest" "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/distribution/testutil"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"golang.org/x/net/context" "golang.org/x/net/context"

2
registry/storage/notifications/listener_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/manifest" "github.com/docker/distribution/manifest"
"github.com/docker/distribution/registry/storage" "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/distribution/testutil"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"golang.org/x/net/context" "golang.org/x/net/context"

2
registry/storage/registry.go
View file

@ -1,7 +1,7 @@
package storage package storage
import ( import (
"github.com/docker/distribution/storagedriver" storagedriver "github.com/docker/distribution/registry/storage/driver"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

2
registry/storage/tagstore.go
View file

@ -4,7 +4,7 @@ import (
"path" "path"
"github.com/docker/distribution/digest" "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. // tagStore provides methods to manage manifest tags in a backend storage driver.