Move volume to daemon/volume

Signed-off-by: Derek McGowan <derek@mcg.dev>

daemon/archive_unix.go

@@ -11,9 +11,9 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/ioutils"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/moby/go-archive"
 	"github.com/pkg/errors"
 )

daemon/cluster/executor/backend.go

@@ -22,8 +22,8 @@ import (
 	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	networkSettings "github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/image"
-	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/cluster/executor/container/adapter.go

@@ -23,7 +23,7 @@ import (
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
 	"github.com/docker/docker/daemon/libnetwork"
 	networkSettings "github.com/docker/docker/daemon/network"
-	volumeopts "github.com/docker/docker/volume/service/opts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"

daemon/container.go

@@ -17,10 +17,10 @@ import (
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/opts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/oci/caps"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/sys/signal"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/container/container.go

@@ -29,11 +29,11 @@ import (
 	"github.com/docker/docker/daemon/logger/local"
 	"github.com/docker/docker/daemon/logger/loggerutils/cache"
 	"github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/volume"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/oci"
-	"github.com/docker/docker/volume"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/go-units"
 	agentexec "github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/sys/atomicwriter"

daemon/container/container_unix.go

@@ -14,7 +14,7 @@ import (
 	"github.com/docker/docker/api/types/events"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	swarmtypes "github.com/docker/docker/api/types/swarm"
-	volumemounts "github.com/docker/docker/volume/mounts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/moby/sys/mount"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"

daemon/create_unix.go

@@ -13,10 +13,10 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/oci"
 	"github.com/docker/docker/pkg/idtools"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
 )

daemon/create_windows.go

@@ -6,8 +6,8 @@ import (
 
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/container"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	volumeopts "github.com/docker/docker/volume/service/opts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 )
 
 // createContainerOSSpecificSettings performs host-OS specific container create functionality

daemon/daemon.go

@@ -59,6 +59,7 @@ import (
 	"github.com/docker/docker/daemon/pkg/plugin"
 	"github.com/docker/docker/daemon/snapshotter"
 	"github.com/docker/docker/daemon/stats"
+	volumesservice "github.com/docker/docker/daemon/volume/service"
 	"github.com/docker/docker/distribution"
 	dmetadata "github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/dockerversion"
@@ -71,7 +72,6 @@ import (
 	"github.com/docker/docker/pkg/sysinfo"
 	refstore "github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
-	volumesservice "github.com/docker/docker/volume/service"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/tracing"
 	"github.com/moby/locker"

daemon/daemon_test.go

@@ -11,8 +11,8 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/libnetwork"
+	volumesservice "github.com/docker/docker/daemon/volume/service"
 	"github.com/docker/docker/pkg/idtools"
-	volumesservice "github.com/docker/docker/volume/service"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"

daemon/daemon_unix.go

@@ -38,12 +38,12 @@ import (
 	"github.com/docker/docker/daemon/libnetwork/options"
 	lntypes "github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/daemon/pkg/opts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/nlwrap"
 	"github.com/docker/docker/internal/otelutil"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/runconfig"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/user"
 	"github.com/opencontainers/runtime-spec/specs-go"

daemon/mounts.go

@@ -8,7 +8,7 @@ import (
 	"github.com/containerd/log"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/daemon/container"
-	volumesservice "github.com/docker/docker/volume/service"
+	volumesservice "github.com/docker/docker/daemon/volume/service"
 )
 
 func (daemon *Daemon) prepareMountPoints(container *container.Container) error {

daemon/oci_linux.go

@@ -16,12 +16,12 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	dconfig "github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/rootless/mountopts"
 	"github.com/docker/docker/internal/rootless/specconv"
 	"github.com/docker/docker/oci"
 	"github.com/docker/docker/oci/caps"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"
 	"github.com/moby/sys/user"

daemon/server/router/volume/backend.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/volume/service/opts"
+	"github.com/docker/docker/daemon/volume/service/opts"
 )
 
 // Backend is the methods that need to be implemented to provide

daemon/server/router/volume/volume_routes.go

@@ -12,8 +12,8 @@ import (
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/volume/service/opts"
 	"github.com/pkg/errors"
 )
 

daemon/server/router/volume/volume_routes_test.go

@@ -16,8 +16,8 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/volume/service/opts"
 )
 
 func callGetVolume(v *volumeRouter, name string) (*httptest.ResponseRecorder, error) {

daemon/volume/drivers/adapter.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/volume"
+	"github.com/docker/docker/daemon/volume"
 )
 
 var errNoSuchVolume = errors.New("no such volume")

daemon/volume/drivers/extpoint.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 
 	"github.com/containerd/log"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/volume"
 	"github.com/moby/locker"
 	"github.com/pkg/errors"
 )

daemon/volume/drivers/extpoint_test.go

@@ -3,7 +3,7 @@ package drivers
 import (
 	"testing"
 
-	volumetestutils "github.com/docker/docker/volume/testutils"
+	volumetestutils "github.com/docker/docker/daemon/volume/testutils"
 )
 
 func TestGetDriver(t *testing.T) {

daemon/volume/drivers/proxy.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"time"
 
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/volume"
 )
 
 const (

daemon/volume/local/local.go

@@ -15,10 +15,10 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/names"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/quota"
-	"github.com/docker/docker/volume"
 	"github.com/moby/sys/atomicwriter"
 	"github.com/moby/sys/user"
 	"github.com/pkg/errors"

daemon/volume/mounts/linux_parser.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/volume"
+	"github.com/docker/docker/daemon/volume"
 )
 
 // NewLinuxParser creates a parser with Linux semantics.

daemon/volume/mounts/mounts.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/containerd/log"
 	mounttypes "github.com/docker/docker/api/types/mount"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/internal/safepath"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/volume"
 	"github.com/moby/sys/user"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"

daemon/volume/service/by.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/volume"
+	"github.com/docker/docker/daemon/volume"
 )
 
 // By is an interface which is used to implement filtering on volumes.

daemon/volume/service/convert.go

@@ -9,9 +9,9 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/filters"
 	volumetypes "github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/directory"
-	"github.com/docker/docker/volume"
 )
 
 // convertOpts are used to pass options to `volumeToAPI`

daemon/volume/service/default_driver.go

@@ -3,10 +3,10 @@
 package service
 
 import (
+	"github.com/docker/docker/daemon/volume"
+	"github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/local"
 	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
 	"github.com/pkg/errors"
 )
 

daemon/volume/service/default_driver_stubs.go

@@ -3,8 +3,8 @@
 package service
 
 import (
+	"github.com/docker/docker/daemon/volume/drivers"
 	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/volume/drivers"
 )
 
 func setupDefaultDriver(_ *drivers.Store, _ string, _ idtools.Identity) error { return nil }

daemon/volume/service/restore.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/volume"
+	"github.com/docker/docker/daemon/volume"
 	bolt "go.etcd.io/bbolt"
 )
 

daemon/volume/service/restore_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/docker/docker/volume"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/service/opts"
-	volumetestutils "github.com/docker/docker/volume/testutils"
+	"github.com/docker/docker/daemon/volume"
+	volumedrivers "github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/service/opts"
+	volumetestutils "github.com/docker/docker/daemon/volume/testutils"
 	"gotest.tools/v3/assert"
 )
 

daemon/volume/service/service.go

@@ -9,14 +9,14 @@ import (
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 	volumetypes "github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/daemon/volume"
+	"github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/directory"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/service/opts"
 	"github.com/pkg/errors"
 )
 

daemon/volume/service/service_linux_test.go

@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/docker/docker/daemon/volume"
+	volumedrivers "github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/local"
+	"github.com/docker/docker/daemon/volume/service/opts"
+	"github.com/docker/docker/daemon/volume/testutils"
 	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/volume"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
-	"github.com/docker/docker/volume/service/opts"
-	"github.com/docker/docker/volume/testutils"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/volume/service/service_test.go

@@ -7,10 +7,10 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/volume"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/service/opts"
-	"github.com/docker/docker/volume/testutils"
+	"github.com/docker/docker/daemon/volume"
+	volumedrivers "github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/service/opts"
+	"github.com/docker/docker/daemon/volume/testutils"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/volume/service/store.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/events"
+	"github.com/docker/docker/daemon/volume"
+	"github.com/docker/docker/daemon/volume/drivers"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	"github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	"github.com/docker/docker/volume/service/opts"
 	"github.com/moby/locker"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"

daemon/volume/service/store_test.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/volume"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/service/opts"
-	volumetestutils "github.com/docker/docker/volume/testutils"
+	"github.com/docker/docker/daemon/volume"
+	volumedrivers "github.com/docker/docker/daemon/volume/drivers"
+	"github.com/docker/docker/daemon/volume/service/opts"
+	volumetestutils "github.com/docker/docker/daemon/volume/testutils"
 	"github.com/google/go-cmp/cmp"
 	"gotest.tools/v3/assert"
 )

daemon/volume/testutils/testutils.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/volume"
 )
 
 // NoopVolume is a volume that doesn't perform any operation

daemon/volumes.go

@@ -15,12 +15,12 @@ import (
 	mounttypes "github.com/docker/docker/api/types/mount"
 	volumetypes "github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/volume"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
+	"github.com/docker/docker/daemon/volume/service"
+	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/layer"
-	"github.com/docker/docker/volume"
-	volumemounts "github.com/docker/docker/volume/mounts"
-	"github.com/docker/docker/volume/service"
-	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/pkg/errors"
 )
 

daemon/volumes_unit_test.go

@@ -3,7 +3,7 @@ package daemon
 import (
 	"testing"
 
-	volumemounts "github.com/docker/docker/volume/mounts"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 )
 
 func TestParseVolumesFrom(t *testing.T) {

daemon/volumes_unix.go

@@ -13,9 +13,9 @@ import (
 	"github.com/docker/docker/api/types/events"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/internal/cleanups"
 	"github.com/docker/docker/pkg/idtools"
-	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/pkg/errors"
 )
 

daemon/volumes_windows.go

@@ -6,9 +6,9 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/daemon/container"
+	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/internal/cleanups"
 	"github.com/docker/docker/pkg/idtools"
-	volumemounts "github.com/docker/docker/volume/mounts"
 )
 
 // setupMounts configures the mount points for a container by appending each

integration-cli/docker_api_containers_test.go

@@ -23,12 +23,12 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 	dconfig "github.com/docker/docker/daemon/config"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/integration-cli/cli"
 	"github.com/docker/docker/integration-cli/cli/build"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/testutil"
 	"github.com/docker/docker/testutil/request"
-	"github.com/docker/docker/volume"
 	"github.com/docker/go-connections/nat"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

integration-cli/docker_cli_external_volume_driver_test.go

@@ -17,13 +17,13 @@ import (
 
 	"github.com/docker/docker/api/types/container"
 	volumetypes "github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/integration-cli/cli"
 	"github.com/docker/docker/integration-cli/daemon"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/testutil"
 	testdaemon "github.com/docker/docker/testutil/daemon"
-	"github.com/docker/docker/volume"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

integration/container/mounts_linux_test.go

@@ -14,10 +14,10 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
+	"github.com/docker/docker/daemon/volume"
 	"github.com/docker/docker/integration/internal/container"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/testutil"
-	"github.com/docker/docker/volume"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"
 	"gotest.tools/v3/assert"