migrate to moby/moby/v2

Signed-off-by: Swapnanil Gupta <swpnlg@amazon.com>

Author: Swapnanil-Gupta

.github/dependabot.yaml

@@ -11,11 +11,13 @@ updates:
       docker:
         patterns:
           - "github.com/docker/docker"
+          - "github.com/moby/moby"
           - "github.com/docker/cli"
       project-dependency:
         exclude-patterns:
           - "github.com/containerd/nerdctl/v2"
           - "github.com/docker/docker"
+          - "github.com/moby/moby"
           - "github.com/docker/cli"
   - package-ecosystem: "github-actions"
     directory: "/"

api/handlers/container/attach.go

@@ -14,8 +14,8 @@ import (
 	"syscall"
 
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/server/httputils"
-	"github.com/moby/moby/api/types/versions"
+	"github.com/moby/moby/client/pkg/versions"
+	"github.com/moby/moby/v2/daemon/server/httputils"
 
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/api/types"

api/handlers/container/attach_test.go

@@ -16,7 +16,7 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/server/httputils"
+	"github.com/moby/moby/v2/daemon/server/httputils"
 
 	"github.com/runfinch/finch-daemon/api/types"
 

api/handlers/container/logs.go

@@ -12,7 +12,7 @@ import (
 	"syscall"
 
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/server/httputils"
+	"github.com/moby/moby/v2/daemon/server/httputils"
 
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/api/types"

api/handlers/container/put_archive.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/server/httputils"
+	"github.com/moby/moby/v2/daemon/server/httputils"
 
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/api/types"

api/handlers/container/stats_test.go

@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/containerd/nerdctl/v2/pkg/config"
-	dockertypes "github.com/docker/docker/api/types/container"
-	"go.uber.org/mock/gomock"
 	"github.com/gorilla/mux"
+	dockertypes "github.com/moby/moby/api/types/container"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"go.uber.org/mock/gomock"
 
 	"github.com/runfinch/finch-daemon/api/types"
 	"github.com/runfinch/finch-daemon/mocks/mocks_container"

api/handlers/distribution/distribution.go

@@ -11,8 +11,8 @@ import (
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/nerdctl/v2/pkg/config"
 	dockertypes "github.com/docker/cli/cli/config/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/gorilla/mux"
+	registrytypes "github.com/moby/moby/api/types/registry"
 	"github.com/runfinch/finch-daemon/api/auth"
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/api/types"

api/handlers/distribution/distribution_test.go

@@ -11,12 +11,12 @@ import (
 	"testing"
 
 	"github.com/containerd/nerdctl/v2/pkg/config"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"go.uber.org/mock/gomock"
 	"github.com/gorilla/mux"
+	registrytypes "github.com/moby/moby/api/types/registry"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"go.uber.org/mock/gomock"
 
 	"github.com/runfinch/finch-daemon/mocks/mocks_distribution"
 	"github.com/runfinch/finch-daemon/mocks/mocks_logger"

api/handlers/exec/start.go

@@ -12,13 +12,14 @@ import (
 
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/server/httputils"
-	"github.com/moby/moby/api/types/versions"
-	"github.com/moby/moby/pkg/stdcopy"
+	"github.com/moby/moby/api/pkg/stdcopy"
+	"github.com/moby/moby/client/pkg/versions"
+	"github.com/moby/moby/v2/daemon/server/httputils"
 
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/api/types"
 	"github.com/runfinch/finch-daemon/pkg/errdefs"
+	"github.com/runfinch/finch-daemon/pkg/stdcopymux"
 )
 
 func (h *handler) start(w http.ResponseWriter, r *http.Request) {
@@ -85,8 +86,8 @@ func (h *handler) start(w http.ResponseWriter, r *http.Request) {
 		}
 
 		stdin = conn
-		stdout = stdcopy.NewStdWriter(conn, stdcopy.Stdout)
-		stderr = stdcopy.NewStdWriter(conn, stdcopy.Stderr)
+		stdout = stdcopymux.NewStdWriter(conn, stdcopy.Stdout)
+		stderr = stdcopymux.NewStdWriter(conn, stdcopy.Stderr)
 	}
 
 	startOptions := &types.ExecStartOptions{

api/handlers/image/pull_test.go

@@ -15,10 +15,10 @@ import (
 
 	"github.com/containerd/nerdctl/v2/pkg/config"
 	dockertypes "github.com/docker/cli/cli/config/types"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"go.uber.org/mock/gomock"
+	"github.com/moby/moby/api/types/jsonstream"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"go.uber.org/mock/gomock"
 
 	"github.com/runfinch/finch-daemon/api/response"
 	"github.com/runfinch/finch-daemon/mocks/mocks_image"
@@ -317,7 +317,7 @@ var _ = Describe("Image Pull API", func() {
 			Expect(outputs[0]).Should(Equal(response.StreamResponse{Stream: "resolved image\n"}))
 			Expect(outputs[1]).Should(Equal(response.StreamResponse{Stream: "pulling image\n"}))
 			Expect(outputs[2]).Should(Equal(response.StreamResponse{
-				Error:        &jsonmessage.JSONError{Code: http.StatusInternalServerError, Message: "error pulling"},
+				Error:        &jsonstream.Error{Code: http.StatusInternalServerError, Message: "error pulling"},
 				ErrorMessage: "error pulling",
 			}))
 		})