Move api/server/router to daemon/server/router

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

api/server/server.go

@@ -8,9 +8,9 @@ import (
 	"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/router"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/internal/otelutil"
 	"github.com/gorilla/mux"

daemon/command/daemon.go

@@ -22,7 +22,6 @@ import (
 	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"
 	buildkit "github.com/docker/docker/builder/builder-next"
 	"github.com/docker/docker/builder/builder-next/exporter"
 	"github.com/docker/docker/builder/dockerfile"
@@ -32,6 +31,7 @@ import (
 	"github.com/docker/docker/daemon/command/trap"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/listeners"
+	"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"

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/checkpoint/checkpoint.go

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

daemon/server/router/container/container.go

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

daemon/server/router/debug/debug.go

@@ -7,7 +7,7 @@ import (
 	"net/http/pprof"
 
 	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
+	"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/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/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/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/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/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/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 {