Merge pull request #50004 from dmcgowan/move-api-server-packages

Move api server packages to daemon

daemon/cluster/executor/container/validate_windows_test.go

@@ -1,6 +1,7 @@
 //go:build windows
 
 package container
+
 import (
 	"strings"
 	"testing"

daemon/command/daemon.go

@@ -19,32 +19,32 @@ import (
 	"github.com/containerd/containerd/v2/pkg/tracing"
 	"github.com/containerd/log"
 	"github.com/docker/docker/api"
-	apiserver "github.com/docker/docker/api/server"
-	buildbackend "github.com/docker/docker/api/server/backend/build"
-	"github.com/docker/docker/api/server/middleware"
-	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/api/server/router/build"
-	checkpointrouter "github.com/docker/docker/api/server/router/checkpoint"
-	"github.com/docker/docker/api/server/router/container"
-	debugrouter "github.com/docker/docker/api/server/router/debug"
-	distributionrouter "github.com/docker/docker/api/server/router/distribution"
-	grpcrouter "github.com/docker/docker/api/server/router/grpc"
-	"github.com/docker/docker/api/server/router/image"
-	"github.com/docker/docker/api/server/router/network"
-	pluginrouter "github.com/docker/docker/api/server/router/plugin"
-	sessionrouter "github.com/docker/docker/api/server/router/session"
-	swarmrouter "github.com/docker/docker/api/server/router/swarm"
-	systemrouter "github.com/docker/docker/api/server/router/system"
-	"github.com/docker/docker/api/server/router/volume"
 	buildkit "github.com/docker/docker/builder/builder-next"
 	"github.com/docker/docker/builder/builder-next/exporter"
 	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/daemon"
+	buildbackend "github.com/docker/docker/daemon/build"
 	"github.com/docker/docker/daemon/cluster"
 	"github.com/docker/docker/daemon/command/debug"
 	"github.com/docker/docker/daemon/command/trap"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/listeners"
+	apiserver "github.com/docker/docker/daemon/server"
+	"github.com/docker/docker/daemon/server/middleware"
+	"github.com/docker/docker/daemon/server/router"
+	"github.com/docker/docker/daemon/server/router/build"
+	checkpointrouter "github.com/docker/docker/daemon/server/router/checkpoint"
+	"github.com/docker/docker/daemon/server/router/container"
+	debugrouter "github.com/docker/docker/daemon/server/router/debug"
+	distributionrouter "github.com/docker/docker/daemon/server/router/distribution"
+	grpcrouter "github.com/docker/docker/daemon/server/router/grpc"
+	"github.com/docker/docker/daemon/server/router/image"
+	"github.com/docker/docker/daemon/server/router/network"
+	pluginrouter "github.com/docker/docker/daemon/server/router/plugin"
+	sessionrouter "github.com/docker/docker/daemon/server/router/session"
+	swarmrouter "github.com/docker/docker/daemon/server/router/swarm"
+	systemrouter "github.com/docker/docker/daemon/server/router/system"
+	"github.com/docker/docker/daemon/server/router/volume"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/internal/otelutil"
 	"github.com/docker/docker/libcontainerd/supervisor"

daemon/disk_usage.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/docker/api/server/router/system"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/image"
 	systemtypes "github.com/docker/docker/api/types/system"
 	"github.com/docker/docker/api/types/volume"
+	"github.com/docker/docker/daemon/server/router/system"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 )

daemon/server/middleware.go

@@ -2,8 +2,8 @@ package server
 
 import (
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/middleware"
 )
 
 // handlerWithGlobalMiddlewares wraps the handler function for a request with

daemon/server/middleware/debug.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httpstatus"
-	"github.com/docker/docker/api/server/httputils"
+	"github.com/docker/docker/daemon/server/httpstatus"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/sirupsen/logrus"
 )

daemon/server/middleware/version.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 )
 
 // VersionMiddleware is a middleware that

daemon/server/middleware/version_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/server/httputils"
+	"github.com/docker/docker/daemon/server/httputils"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/server/router/build/build.go

@@ -3,8 +3,8 @@ package build
 import (
 	"runtime"
 
-	"github.com/docker/docker/api/server/router"
 	"github.com/docker/docker/api/types/build"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // buildRouter is a router to talk with the build controller

daemon/server/router/build/build_routes.go

@@ -16,13 +16,13 @@ import (
 	"syscall"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/build"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"

daemon/server/router/checkpoint/checkpoint.go

@@ -1,8 +1,8 @@
 package checkpoint
 
 import (
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // checkpointRouter is a router to talk with the checkpoint controller

daemon/server/router/checkpoint/checkpoint_routes.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/checkpoint"
+	"github.com/docker/docker/daemon/server/httputils"
 )
 
 func (cr *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

daemon/server/router/container/container.go

@@ -1,8 +1,8 @@
 package container
 
 import (
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // containerRouter is a router to talk with the container controller

daemon/server/router/container/container_routes.go

@@ -12,8 +12,6 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
-	"github.com/docker/docker/api/server/httpstatus"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"
@@ -22,6 +20,8 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/versions"
 	networkSettings "github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/server/httpstatus"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/libnetwork/netlabel"
 	"github.com/docker/docker/pkg/ioutils"

daemon/server/router/container/copy.go

@@ -9,8 +9,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/daemon/server/httputils"
 	gddohttputil "github.com/golang/gddo/httputil"
 )
 

daemon/server/router/container/exec.go

@@ -7,11 +7,11 @@ import (
 	"net/http"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/pkg/errors"

daemon/server/router/container/inspect.go

@@ -7,10 +7,10 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/internal/sliceutil"
 	"github.com/docker/docker/pkg/stringid"
 )

daemon/server/router/debug/debug.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"net/http/pprof"
 
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // NewRouter creates a new debug router

daemon/server/router/distribution/distribution.go

@@ -1,6 +1,6 @@
 package distribution
 
-import "github.com/docker/docker/api/server/router"
+import "github.com/docker/docker/daemon/server/router"
 
 // distributionRouter is a router to talk with the registry
 type distributionRouter struct {

daemon/server/router/distribution/distribution_routes.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/distribution/manifest/manifestlist"
 	"github.com/docker/distribution/manifest/schema1"
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/docker/daemon/server/httputils"
 	distributionpkg "github.com/docker/docker/distribution"
 	"github.com/docker/docker/errdefs"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/server/router/experimental.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
+	"github.com/docker/docker/daemon/server/httputils"
 )
 
 // ExperimentalRoute defines an experimental API route that can be enabled or disabled.

daemon/server/router/grpc/grpc.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/router"
 	"github.com/docker/docker/internal/otelutil"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/stack"

daemon/server/router/image/image.go

@@ -1,7 +1,7 @@
 package image
 
 import (
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // imageRouter is a router to talk with the image controller

daemon/server/router/image/image_routes.go

@@ -13,13 +13,13 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/filters"
 	imagetypes "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/builder/remotecontext"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"

daemon/server/router/local.go

@@ -3,7 +3,7 @@ package router
 import (
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
+	"github.com/docker/docker/daemon/server/httputils"
 )
 
 // RouteWrapper wraps a route with extra functionality.

daemon/server/router/network/network.go

@@ -1,7 +1,7 @@
 package network
 
 import (
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/router"
 )
 
 // networkRouter is a router to talk with the network controller

daemon/server/router/network/network_routes.go

@@ -6,11 +6,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/libnetwork"
 	"github.com/docker/docker/libnetwork/scope"

daemon/server/router/plugin/plugin.go

@@ -1,6 +1,6 @@
 package plugin
 
-import "github.com/docker/docker/api/server/router"
+import "github.com/docker/docker/daemon/server/router"
 
 // pluginRouter is a router to talk with the plugin controller
 type pluginRouter struct {

daemon/server/router/plugin/plugin_routes.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/pkg/errors"

daemon/server/router/router.go

@@ -1,6 +1,6 @@
 package router
 
-import "github.com/docker/docker/api/server/httputils"
+import "github.com/docker/docker/daemon/server/httputils"
 
 // Router defines an interface to specify a group of routes to add to the docker server.
 type Router interface {

daemon/server/router/session/session.go

@@ -1,6 +1,6 @@
 package session
 
-import "github.com/docker/docker/api/server/router"
+import "github.com/docker/docker/daemon/server/router"
 
 // sessionRouter is a router to talk with the session controller
 type sessionRouter struct {

daemon/server/router/swarm/cluster.go

@@ -1,6 +1,6 @@
 package swarm
 
-import "github.com/docker/docker/api/server/router"
+import "github.com/docker/docker/daemon/server/router"
 
 // swarmRouter is a router to talk with the build controller
 type swarmRouter struct {

daemon/server/router/swarm/cluster_routes.go

@@ -7,12 +7,12 @@ import (
 	"strconv"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/registry"
 	types "github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 	"github.com/docker/docker/errdefs"
 	"github.com/pkg/errors"
 )

daemon/server/router/swarm/helpers.go

@@ -5,12 +5,12 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/docker/docker/api/server/httputils"
 	basictypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
 )
 
 // swarmLogs takes an http response, request, and selector, and writes the logs

daemon/server/router/system/system.go

@@ -4,7 +4,7 @@
 package system
 
 import (
-	"github.com/docker/docker/api/server/router"
+	"github.com/docker/docker/daemon/server/router"
 	"resenje.org/singleflight"
 )
 

daemon/server/router/system/system_routes.go

@@ -11,8 +11,6 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router/build"
 	"github.com/docker/docker/api/types"
 	buildtypes "github.com/docker/docker/api/types/build"
 	"github.com/docker/docker/api/types/events"
@@ -22,6 +20,8 @@ import (
 	"github.com/docker/docker/api/types/system"
 	timetypes "github.com/docker/docker/api/types/time"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/router/build"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"

daemon/server/router/volume/volume.go

@@ -1,6 +1,6 @@
 package volume
 
-import "github.com/docker/docker/api/server/router"
+import "github.com/docker/docker/daemon/server/router"
 
 // volumeRouter is a router to talk with the volumes controller
 type volumeRouter struct {

daemon/server/router/volume/volume_routes.go

@@ -8,10 +8,10 @@ import (
 
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types/filters"
 	"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/errdefs"
 	"github.com/docker/docker/volume/service/opts"
 	"github.com/pkg/errors"

daemon/server/router/volume/volume_routes_test.go

@@ -13,9 +13,9 @@ import (
 	"gotest.tools/v3/assert"
 
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/api/server/httputils"
 	"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/errdefs"
 	"github.com/docker/docker/volume/service/opts"
 )

daemon/server/server.go

@@ -5,12 +5,12 @@ import (
 	"net/http"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/api/server/httpstatus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
-	"github.com/docker/docker/api/server/router"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/versions"
+	"github.com/docker/docker/daemon/server/httpstatus"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/middleware"
+	"github.com/docker/docker/daemon/server/router"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/internal/otelutil"
 	"github.com/gorilla/mux"

daemon/server/server_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
+	"github.com/docker/docker/daemon/server/httputils"
+	"github.com/docker/docker/daemon/server/middleware"
 )
 
 func TestMiddlewares(t *testing.T) {