From e77ed7191e730ea0e41442f07bcb089737ce849f Mon Sep 17 00:00:00 2001 From: David Son Date: Tue, 12 Nov 2024 22:42:30 +0000 Subject: [PATCH 1/4] chore: update to nerdctl v2.0.0 Signed-off-by: David Son --- Makefile | 2 +- api/handlers/builder/build.go | 2 +- api/handlers/builder/build_test.go | 2 +- api/handlers/builder/builder.go | 4 +- api/handlers/builder/builder_test.go | 2 +- api/handlers/container/attach_test.go | 2 +- api/handlers/container/container.go | 4 +- api/handlers/container/container_test.go | 2 +- api/handlers/container/create.go | 4 +- api/handlers/container/create_test.go | 6 +- api/handlers/container/exec_test.go | 2 +- api/handlers/container/get_archive_test.go | 2 +- api/handlers/container/inspect_test.go | 2 +- api/handlers/container/list.go | 2 +- api/handlers/container/list_test.go | 4 +- api/handlers/container/logs_test.go | 2 +- api/handlers/container/put_archive_test.go | 2 +- api/handlers/container/remove_test.go | 2 +- api/handlers/container/rename.go | 2 +- api/handlers/container/rename_test.go | 2 +- api/handlers/container/restart_test.go | 2 +- api/handlers/container/start_test.go | 2 +- api/handlers/container/stats_test.go | 2 +- api/handlers/container/stop_test.go | 2 +- api/handlers/exec/exec.go | 2 +- api/handlers/exec/exec_test.go | 2 +- api/handlers/exec/inspect_test.go | 2 +- api/handlers/exec/resize_test.go | 2 +- api/handlers/exec/start_test.go | 2 +- api/handlers/image/image.go | 4 +- api/handlers/image/image_test.go | 2 +- api/handlers/image/inspect_test.go | 4 +- api/handlers/image/load_test.go | 2 +- api/handlers/image/pull_test.go | 2 +- api/handlers/image/push_test.go | 2 +- api/handlers/image/remove_test.go | 2 +- api/handlers/network/create_test.go | 2 +- api/handlers/network/inspect_test.go | 4 +- api/handlers/network/list_test.go | 2 +- api/handlers/network/network.go | 2 +- api/handlers/network/network_test.go | 2 +- api/handlers/network/remove_test.go | 2 +- api/handlers/system/events_test.go | 2 +- api/handlers/system/info_test.go | 4 +- api/handlers/system/ping_test.go | 2 +- api/handlers/system/system.go | 4 +- api/handlers/system/version_test.go | 2 +- api/handlers/volume/create_test.go | 4 +- api/handlers/volume/inspect_test.go | 4 +- api/handlers/volume/list_test.go | 4 +- api/handlers/volume/remove_test.go | 2 +- api/handlers/volume/volume.go | 4 +- api/handlers/volume/volume_test.go | 2 +- api/router/router.go | 2 +- api/router/router_test.go | 2 +- api/types/container_types.go | 2 +- api/types/network_types.go | 2 +- api/types/volumes_types.go | 2 +- cmd/finch-daemon/router_utils.go | 4 +- cmd/finch-daemon/router_utils_test.go | 2 +- e2e/tests/container_create.go | 2 +- e2e/tests/volume_inspect.go | 2 +- go.mod | 98 +++---- go.sum | 257 +++++++++--------- internal/backend/builder.go | 6 +- internal/backend/container.go | 16 +- internal/backend/containerd.go | 6 +- internal/backend/image.go | 16 +- internal/backend/nerdctl.go | 4 +- internal/backend/network.go | 6 +- internal/backend/system.go | 4 +- internal/backend/volume.go | 6 +- internal/service/builder/build.go | 2 +- internal/service/builder/build_test.go | 2 +- internal/service/container/attach.go | 10 +- internal/service/container/attach_test.go | 4 +- internal/service/container/create.go | 10 +- internal/service/container/create_test.go | 4 +- internal/service/container/exec.go | 4 +- internal/service/container/inspect.go | 4 +- internal/service/container/inspect_test.go | 2 +- internal/service/container/list.go | 2 +- internal/service/container/list_test.go | 6 +- internal/service/container/logs.go | 2 +- internal/service/container/logs_test.go | 4 +- internal/service/container/remove.go | 2 +- internal/service/container/remove_test.go | 2 +- internal/service/container/rename.go | 2 +- internal/service/container/rename_test.go | 2 +- internal/service/container/stats.go | 2 +- internal/service/container/stats_test.go | 4 +- internal/service/distribution/distribution.go | 2 +- .../service/distribution/distribution_test.go | 2 +- internal/service/exec/start.go | 2 +- internal/service/image/image_test.go | 2 +- internal/service/image/inspect.go | 2 +- internal/service/image/inspect_test.go | 2 +- internal/service/image/pull.go | 2 +- internal/service/image/pull_test.go | 2 +- internal/service/image/push.go | 2 +- internal/service/image/push_test.go | 2 +- internal/service/image/tag.go | 4 +- internal/service/network/connect.go | 8 +- internal/service/network/create.go | 2 +- internal/service/network/create_test.go | 2 +- internal/service/network/driver/bridge.go | 4 +- .../service/network/driver/bridge_test.go | 2 +- internal/service/network/driver/driver.go | 2 +- internal/service/network/inspect_test.go | 4 +- internal/service/network/list.go | 2 +- internal/service/network/list_test.go | 2 +- internal/service/network/network.go | 2 +- internal/service/network/remove.go | 2 +- internal/service/network/remove_test.go | 2 +- internal/service/system/auth.go | 2 +- internal/service/system/info.go | 6 +- internal/service/system/version_test.go | 2 +- internal/service/volume/create.go | 2 +- internal/service/volume/create_test.go | 2 +- internal/service/volume/inspect.go | 2 +- internal/service/volume/inspect_test.go | 2 +- internal/service/volume/list.go | 2 +- internal/service/volume/list_test.go | 2 +- mocks/mocks_backend/nerdctlbuildersvc.go | 2 +- mocks/mocks_backend/nerdctlcontainersvc.go | 12 +- mocks/mocks_backend/nerdctlimagesvc.go | 6 +- mocks/mocks_backend/nerdctlnetworksvc.go | 4 +- mocks/mocks_backend/nerdctlsystemsvc.go | 2 +- mocks/mocks_backend/nerdctlvolumesvc.go | 2 +- mocks/mocks_builder/buildersvc.go | 2 +- mocks/mocks_container/containersvc.go | 2 +- mocks/mocks_container/network_manager.go | 2 +- mocks/mocks_image/imagesvc.go | 2 +- mocks/mocks_statsutil/statsutil.go | 2 +- mocks/mocks_system/systemsvc.go | 4 +- mocks/mocks_volume/volumesvc.go | 2 +- pkg/archive/archive.go | 2 +- pkg/statsutil/statsutil.go | 2 +- 138 files changed, 395 insertions(+), 378 deletions(-) diff --git a/Makefile b/Makefile index e6b14b2b..8cdc9701 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ endif PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/process.go -package=mocks_container github.com/containerd/containerd Process PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/task.go -package=mocks_container github.com/containerd/containerd Task PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_image/store.go -package=mocks_image github.com/containerd/containerd/images Store - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/network_manager.go -package=mocks_container github.com/containerd/nerdctl/pkg/containerutil NetworkOptionsManager + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/network_manager.go -package=mocks_container github.com/containerd/nerdctl/v2/pkg/containerutil NetworkOptionsManager PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_cio/io.go -package=mocks_cio github.com/containerd/containerd/cio IO PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/response_writer.go -package=mocks_http net/http ResponseWriter PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/conn.go -package=mocks_http net Conn diff --git a/api/handlers/builder/build.go b/api/handlers/builder/build.go index e624ec12..86188b42 100644 --- a/api/handlers/builder/build.go +++ b/api/handlers/builder/build.go @@ -11,7 +11,7 @@ import ( "strconv" "github.com/containerd/containerd/namespaces" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/response" "github.com/runfinch/finch-daemon/pkg/utility/maputility" diff --git a/api/handlers/builder/build_test.go b/api/handlers/builder/build_test.go index 2ab80003..41bb0072 100644 --- a/api/handlers/builder/build_test.go +++ b/api/handlers/builder/build_test.go @@ -11,7 +11,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/builder/builder.go b/api/handlers/builder/builder.go index 4851a022..67bd9ec0 100644 --- a/api/handlers/builder/builder.go +++ b/api/handlers/builder/builder.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/internal/backend" diff --git a/api/handlers/builder/builder_test.go b/api/handlers/builder/builder_test.go index 1a1211c8..f3eb80d3 100644 --- a/api/handlers/builder/builder_test.go +++ b/api/handlers/builder/builder_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/attach_test.go b/api/handlers/container/attach_test.go index 1ccf05d9..9999e244 100644 --- a/api/handlers/container/attach_test.go +++ b/api/handlers/container/attach_test.go @@ -20,7 +20,7 @@ import ( "github.com/runfinch/finch-daemon/api/types" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/container/container.go b/api/handlers/container/container.go index ee4b1aba..f4970eba 100644 --- a/api/handlers/container/container.go +++ b/api/handlers/container/container.go @@ -10,8 +10,8 @@ import ( "net/http" "time" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/pkg/flog" diff --git a/api/handlers/container/container_test.go b/api/handlers/container/container_test.go index cb952e80..ad9c95f9 100644 --- a/api/handlers/container/container_test.go +++ b/api/handlers/container/container_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/create.go b/api/handlers/container/create.go index 5e1b012f..e152589e 100644 --- a/api/handlers/container/create.go +++ b/api/handlers/container/create.go @@ -12,8 +12,8 @@ import ( "github.com/containerd/containerd/namespaces" gocni "github.com/containerd/go-cni" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/defaults" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/docker/go-connections/nat" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/create_test.go b/api/handlers/container/create_test.go index 34bd4b27..78320bb0 100644 --- a/api/handlers/container/create_test.go +++ b/api/handlers/container/create_test.go @@ -13,9 +13,9 @@ import ( "strings" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/docker/go-connections/nat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/exec_test.go b/api/handlers/container/exec_test.go index 9ffcead5..7ad8ae89 100644 --- a/api/handlers/container/exec_test.go +++ b/api/handlers/container/exec_test.go @@ -10,7 +10,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/get_archive_test.go b/api/handlers/container/get_archive_test.go index 98d8f0d7..46c5b303 100644 --- a/api/handlers/container/get_archive_test.go +++ b/api/handlers/container/get_archive_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/inspect_test.go b/api/handlers/container/inspect_test.go index 42dc4493..5d656e4d 100644 --- a/api/handlers/container/inspect_test.go +++ b/api/handlers/container/inspect_test.go @@ -9,7 +9,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/list.go b/api/handlers/container/list.go index b03106db..4ffdc062 100644 --- a/api/handlers/container/list.go +++ b/api/handlers/container/list.go @@ -11,7 +11,7 @@ import ( "strconv" "github.com/containerd/containerd/namespaces" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/response" ) diff --git a/api/handlers/container/list_test.go b/api/handlers/container/list_test.go index 7826e432..cfe1ce15 100644 --- a/api/handlers/container/list_test.go +++ b/api/handlers/container/list_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/container/logs_test.go b/api/handlers/container/logs_test.go index ec7ea3bb..98aadbeb 100644 --- a/api/handlers/container/logs_test.go +++ b/api/handlers/container/logs_test.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/put_archive_test.go b/api/handlers/container/put_archive_test.go index 3dedfc3e..3f9c7569 100644 --- a/api/handlers/container/put_archive_test.go +++ b/api/handlers/container/put_archive_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/remove_test.go b/api/handlers/container/remove_test.go index e833caff..779ec637 100644 --- a/api/handlers/container/remove_test.go +++ b/api/handlers/container/remove_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/container/rename.go b/api/handlers/container/rename.go index 10160920..7e3f14ed 100644 --- a/api/handlers/container/rename.go +++ b/api/handlers/container/rename.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/containerd/containerd/namespaces" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/rename_test.go b/api/handlers/container/rename_test.go index 287afbd2..d0e29272 100644 --- a/api/handlers/container/rename_test.go +++ b/api/handlers/container/rename_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/restart_test.go b/api/handlers/container/restart_test.go index 5ef00103..f29c19bc 100644 --- a/api/handlers/container/restart_test.go +++ b/api/handlers/container/restart_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/start_test.go b/api/handlers/container/start_test.go index f8636f19..ed886e71 100644 --- a/api/handlers/container/start_test.go +++ b/api/handlers/container/start_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/container/stats_test.go b/api/handlers/container/stats_test.go index 0cddd14b..52050a0a 100644 --- a/api/handlers/container/stats_test.go +++ b/api/handlers/container/stats_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "time" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" dockertypes "github.com/docker/docker/api/types/container" "github.com/golang/mock/gomock" "github.com/gorilla/mux" diff --git a/api/handlers/container/stop_test.go b/api/handlers/container/stop_test.go index 2e01a9fc..dd1bd562 100644 --- a/api/handlers/container/stop_test.go +++ b/api/handlers/container/stop_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/exec/exec.go b/api/handlers/exec/exec.go index 3b4bd671..bd652a2b 100644 --- a/api/handlers/exec/exec.go +++ b/api/handlers/exec/exec.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/pkg/flog" diff --git a/api/handlers/exec/exec_test.go b/api/handlers/exec/exec_test.go index cf6c1b2f..5f607b0b 100644 --- a/api/handlers/exec/exec_test.go +++ b/api/handlers/exec/exec_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/exec/inspect_test.go b/api/handlers/exec/inspect_test.go index 9d6a5d13..d6c6018b 100644 --- a/api/handlers/exec/inspect_test.go +++ b/api/handlers/exec/inspect_test.go @@ -9,7 +9,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/exec/resize_test.go b/api/handlers/exec/resize_test.go index 4d5e217f..33a8c581 100644 --- a/api/handlers/exec/resize_test.go +++ b/api/handlers/exec/resize_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/exec/start_test.go b/api/handlers/exec/start_test.go index a2ed4823..a4755270 100644 --- a/api/handlers/exec/start_test.go +++ b/api/handlers/exec/start_test.go @@ -14,7 +14,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" hj "github.com/getlantern/httptest" "github.com/golang/mock/gomock" "github.com/gorilla/mux" diff --git a/api/handlers/image/image.go b/api/handlers/image/image.go index e9fb5aff..35e92ed1 100644 --- a/api/handlers/image/image.go +++ b/api/handlers/image/image.go @@ -8,8 +8,8 @@ import ( "io" "net/http" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" dockertypes "github.com/docker/cli/cli/config/types" "github.com/runfinch/finch-daemon/api/types" diff --git a/api/handlers/image/image_test.go b/api/handlers/image/image_test.go index 418a473f..0a2f846c 100644 --- a/api/handlers/image/image_test.go +++ b/api/handlers/image/image_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/image/inspect_test.go b/api/handlers/image/inspect_test.go index cf25044b..c138a679 100644 --- a/api/handlers/image/inspect_test.go +++ b/api/handlers/image/inspect_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/image/load_test.go b/api/handlers/image/load_test.go index 96a4fdd5..166c0569 100644 --- a/api/handlers/image/load_test.go +++ b/api/handlers/image/load_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/image/pull_test.go b/api/handlers/image/pull_test.go index b813b696..4b73f38e 100644 --- a/api/handlers/image/pull_test.go +++ b/api/handlers/image/pull_test.go @@ -13,7 +13,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" dockertypes "github.com/docker/cli/cli/config/types" "github.com/docker/docker/pkg/jsonmessage" "github.com/golang/mock/gomock" diff --git a/api/handlers/image/push_test.go b/api/handlers/image/push_test.go index 06b5bdd2..06dd74e5 100644 --- a/api/handlers/image/push_test.go +++ b/api/handlers/image/push_test.go @@ -13,7 +13,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" "github.com/gorilla/mux" diff --git a/api/handlers/image/remove_test.go b/api/handlers/image/remove_test.go index b8fcd136..ee688ebe 100644 --- a/api/handlers/image/remove_test.go +++ b/api/handlers/image/remove_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/network/create_test.go b/api/handlers/network/create_test.go index e4a05fd3..aa8f185a 100644 --- a/api/handlers/network/create_test.go +++ b/api/handlers/network/create_test.go @@ -12,7 +12,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/network/inspect_test.go b/api/handlers/network/inspect_test.go index 608f9c54..50e27bf8 100644 --- a/api/handlers/network/inspect_test.go +++ b/api/handlers/network/inspect_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/network/list_test.go b/api/handlers/network/list_test.go index 4ebddfb7..902a643f 100644 --- a/api/handlers/network/list_test.go +++ b/api/handlers/network/list_test.go @@ -7,7 +7,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/network/network.go b/api/handlers/network/network.go index 38c0ac1c..2c945d50 100644 --- a/api/handlers/network/network.go +++ b/api/handlers/network/network.go @@ -7,7 +7,7 @@ import ( "context" "net/http" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/pkg/flog" diff --git a/api/handlers/network/network_test.go b/api/handlers/network/network_test.go index 8bdbe4ff..442d895c 100644 --- a/api/handlers/network/network_test.go +++ b/api/handlers/network/network_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/network/remove_test.go b/api/handlers/network/remove_test.go index 4b239703..97778369 100644 --- a/api/handlers/network/remove_test.go +++ b/api/handlers/network/remove_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/system/events_test.go b/api/handlers/system/events_test.go index f4faf2be..478be34f 100644 --- a/api/handlers/system/events_test.go +++ b/api/handlers/system/events_test.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/system/info_test.go b/api/handlers/system/info_test.go index 1a508b7c..fc2e4b92 100644 --- a/api/handlers/system/info_test.go +++ b/api/handlers/system/info_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/system/ping_test.go b/api/handlers/system/ping_test.go index 011840a4..bd8e89ee 100644 --- a/api/handlers/system/ping_test.go +++ b/api/handlers/system/ping_test.go @@ -7,7 +7,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/system/system.go b/api/handlers/system/system.go index bea507fb..b2bb12d3 100644 --- a/api/handlers/system/system.go +++ b/api/handlers/system/system.go @@ -8,8 +8,8 @@ import ( "context" "net/http" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" eventtype "github.com/runfinch/finch-daemon/api/events" "github.com/runfinch/finch-daemon/api/types" diff --git a/api/handlers/system/version_test.go b/api/handlers/system/version_test.go index 23c73a6b..15086a5e 100644 --- a/api/handlers/system/version_test.go +++ b/api/handlers/system/version_test.go @@ -9,7 +9,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/volume/create_test.go b/api/handlers/volume/create_test.go index 405665a5..8103f6c1 100644 --- a/api/handlers/volume/create_test.go +++ b/api/handlers/volume/create_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/volume/inspect_test.go b/api/handlers/volume/inspect_test.go index 987c519c..30369cc0 100644 --- a/api/handlers/volume/inspect_test.go +++ b/api/handlers/volume/inspect_test.go @@ -8,8 +8,8 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/handlers/volume/list_test.go b/api/handlers/volume/list_test.go index 402fcf55..6be42f96 100644 --- a/api/handlers/volume/list_test.go +++ b/api/handlers/volume/list_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "net/url" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/volume/remove_test.go b/api/handlers/volume/remove_test.go index 2a51e602..3a72bd93 100644 --- a/api/handlers/volume/remove_test.go +++ b/api/handlers/volume/remove_test.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/handlers/volume/volume.go b/api/handlers/volume/volume.go index a0b68d35..07a612f9 100644 --- a/api/handlers/volume/volume.go +++ b/api/handlers/volume/volume.go @@ -8,8 +8,8 @@ import ( "context" "net/http" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/pkg/flog" diff --git a/api/handlers/volume/volume_test.go b/api/handlers/volume/volume_test.go index 31d9fe23..276514e0 100644 --- a/api/handlers/volume/volume_test.go +++ b/api/handlers/volume/volume_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/router/router.go b/api/router/router.go index e149c317..65066929 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -9,7 +9,7 @@ import ( "net/http" "os" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" ghandlers "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/moby/moby/api/server/httputils" diff --git a/api/router/router_test.go b/api/router/router_test.go index 9e9beb39..df4f69f8 100644 --- a/api/router/router_test.go +++ b/api/router/router_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/types/container_types.go b/api/types/container_types.go index 44f44197..111f6b97 100644 --- a/api/types/container_types.go +++ b/api/types/container_types.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" dockertypes "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" "github.com/docker/go-units" diff --git a/api/types/network_types.go b/api/types/network_types.go index d9e63bd0..ed120f44 100644 --- a/api/types/network_types.go +++ b/api/types/network_types.go @@ -3,7 +3,7 @@ package types -import "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" +import "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" // NetworkCreateOption is a utility type for setting // create network configuration on requests via options. diff --git a/api/types/volumes_types.go b/api/types/volumes_types.go index 27eb6232..1bbde4da 100644 --- a/api/types/volumes_types.go +++ b/api/types/volumes_types.go @@ -3,7 +3,7 @@ package types -import "github.com/containerd/nerdctl/pkg/inspecttypes/native" +import "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" // VolumesListResponse is the response object expected by GET /volumes // https://docs.docker.com/engine/api/v1.40/#tag/Volume diff --git a/cmd/finch-daemon/router_utils.go b/cmd/finch-daemon/router_utils.go index fa7af479..71b52709 100644 --- a/cmd/finch-daemon/router_utils.go +++ b/cmd/finch-daemon/router_utils.go @@ -10,8 +10,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/namespaces" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" toml "github.com/pelletier/go-toml/v2" "github.com/runfinch/finch-daemon/api/router" "github.com/runfinch/finch-daemon/internal/backend" diff --git a/cmd/finch-daemon/router_utils_test.go b/cmd/finch-daemon/router_utils_test.go index c6fecb54..c5ee9537 100644 --- a/cmd/finch-daemon/router_utils_test.go +++ b/cmd/finch-daemon/router_utils_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e/tests/container_create.go b/e2e/tests/container_create.go index 8af83aec..1cf4681b 100644 --- a/e2e/tests/container_create.go +++ b/e2e/tests/container_create.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/docker/go-connections/nat" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/e2e/tests/volume_inspect.go b/e2e/tests/volume_inspect.go index 52e1d304..382fa639 100644 --- a/e2e/tests/volume_inspect.go +++ b/e2e/tests/volume_inspect.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/runfinch/common-tests/command" diff --git a/go.mod b/go.mod index 3de94cf9..d030fa76 100644 --- a/go.mod +++ b/go.mod @@ -2,17 +2,16 @@ module github.com/runfinch/finch-daemon go 1.22.0 -toolchain go1.22.7 - require ( github.com/containerd/cgroups/v3 v3.0.5 github.com/containerd/containerd v1.7.24 - github.com/containerd/containerd/api v1.7.19 + github.com/containerd/containerd/api v1.8.0 github.com/containerd/errdefs v1.0.0 github.com/containerd/fifo v1.1.0 github.com/containerd/go-cni v1.1.11 github.com/containerd/nerdctl v1.7.7 - github.com/containerd/platforms v0.2.1 + github.com/containerd/nerdctl/v2 v2.0.0 + github.com/containerd/platforms v1.0.0-rc.0 github.com/containerd/typeurl/v2 v2.2.3 github.com/containernetworking/cni v1.2.3 github.com/coreos/go-iptables v0.8.0 @@ -51,39 +50,42 @@ require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/Masterminds/semver/v3 v3.3.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/Microsoft/hcsshim v0.12.5 // indirect + github.com/Microsoft/hcsshim v0.12.9 // indirect github.com/awslabs/soci-snapshotter v0.5.0 // indirect github.com/cilium/ebpf v0.16.0 // indirect - github.com/containerd/accelerated-container-image v1.1.2 // indirect + github.com/containerd/accelerated-container-image v1.2.3 // indirect github.com/containerd/console v1.0.4 // indirect - github.com/containerd/continuity v0.4.3 // indirect + github.com/containerd/containerd/v2 v2.0.0 // indirect + github.com/containerd/continuity v0.4.4 // indirect + github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/go-runc v1.1.0 // indirect - github.com/containerd/imgcrypt v1.1.10 // indirect + github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/containerd/nydus-snapshotter v0.13.11 // indirect - github.com/containerd/stargz-snapshotter v0.15.1 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect - github.com/containerd/stargz-snapshotter/ipfs v0.15.1 // indirect - github.com/containerd/ttrpc v1.2.5 // indirect - github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect - github.com/containernetworking/plugins v1.4.1 // indirect - github.com/containers/ocicrypt v1.1.10 // indirect - github.com/cyphar/filepath-securejoin v0.3.1 // indirect + github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5 // indirect + github.com/containerd/plugin v1.0.0 // indirect + github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319 // indirect + github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319 // indirect + github.com/containerd/ttrpc v1.2.6 // indirect + github.com/containernetworking/plugins v1.5.1 // indirect + github.com/containers/ocicrypt v1.2.0 // indirect + github.com/cyphar/filepath-securejoin v0.3.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/djherbis/times v1.6.0 // indirect - github.com/docker/docker-credential-helpers v0.8.1 // indirect + github.com/docker/docker-credential-helpers v0.8.2 // indirect github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect - github.com/fahedouch/go-logrotate v0.2.0 // indirect - github.com/fatih/color v1.17.0 // indirect + github.com/fahedouch/go-logrotate v0.2.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fluent/fluent-logger-golang v1.9.0 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848 // indirect - github.com/go-jose/go-jose/v3 v3.0.3 // indirect + github.com/go-jose/go-jose/v4 v4.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -91,14 +93,10 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect - github.com/klauspost/compress v1.17.9 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.11 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/minio/sha256-simd v1.0.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -106,11 +104,11 @@ require ( github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect - github.com/moby/sys/mount v0.3.3 // indirect + github.com/moby/sys/mount v0.3.4 // indirect github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/signal v0.7.1 // indirect - github.com/moby/sys/symlink v0.2.0 // indirect + github.com/moby/sys/symlink v0.3.0 // indirect github.com/moby/sys/user v0.3.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect @@ -119,42 +117,46 @@ require ( github.com/muesli/cancelreader v0.2.2 // indirect github.com/multiformats/go-base32 v0.1.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect - github.com/multiformats/go-multiaddr v0.12.3 // indirect + github.com/multiformats/go-multiaddr v0.13.0 // indirect github.com/multiformats/go-multibase v0.2.0 // indirect github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-varint v0.0.7 // indirect - github.com/opencontainers/selinux v1.11.0 // indirect + github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect + github.com/opencontainers/selinux v1.11.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/philhofer/fwd v1.1.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rootless-containers/bypass4netns v0.4.0 // indirect + github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rootless-containers/bypass4netns v0.4.1 // indirect github.com/rootless-containers/rootlesskit v1.1.1 // indirect + github.com/rootless-containers/rootlesskit/v2 v2.3.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect - github.com/tidwall/gjson v1.17.1 // indirect - github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.1 // indirect - github.com/tinylib/msgp v1.1.9 // indirect + github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect + github.com/tinylib/msgp v1.2.0 // indirect github.com/vbatts/tar-split v0.11.5 // indirect github.com/yuchanns/srslog v1.1.0 // indirect - go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect + go.mozilla.org/pkcs7 v0.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect - go.opentelemetry.io/otel v1.30.0 // indirect - go.opentelemetry.io/otel/metric v1.30.0 // indirect - go.opentelemetry.io/otel/trace v1.30.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect + go.opentelemetry.io/otel v1.31.0 // indirect + go.opentelemetry.io/otel/metric v1.31.0 // indirect + go.opentelemetry.io/otel/trace v1.31.0 // indirect golang.org/x/crypto v0.32.0 // indirect golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect + golang.org/x/mod v0.22.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.28.0 // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect + google.golang.org/grpc v1.67.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cri-api v0.29.3 // indirect - lukechampine.com/blake3 v1.2.1 // indirect + lukechampine.com/blake3 v1.3.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect + tags.cncf.io/container-device-interface v0.8.0 // indirect + tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index 8540c90e..b42ed148 100644 --- a/go.sum +++ b/go.sum @@ -8,14 +8,16 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= -github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/Microsoft/hcsshim v0.12.5 h1:bpTInLlDy/nDRWFVcefDZZ1+U8tS+rz3MxjKgu9boo0= -github.com/Microsoft/hcsshim v0.12.5/go.mod h1:tIUGego4G1EN5Hb6KC90aDYiUI2dqLSTTOCjVNpOgZ8= +github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg= +github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y= github.com/awslabs/soci-snapshotter v0.5.0 h1:Ah8L6AWIqknz8wIVl7saHRpMeJSOWWC6pwZQ9qCG7Tw= github.com/awslabs/soci-snapshotter v0.5.0/go.mod h1:x3yL5YDlNdBfSZnGTccnV5eVITaHaQLkg9QVnql1HQQ= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -23,54 +25,67 @@ github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok= github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/containerd/accelerated-container-image v1.1.2 h1:Gk+1aqi6DpMVPCFAFWAUZgeKzSQ8fEu+GiBLnS42rc4= -github.com/containerd/accelerated-container-image v1.1.2/go.mod h1:NcMeDHjzY1cH5E96knLx0QaGYHeUxe0z3zA2/8qh1IE= +github.com/compose-spec/compose-go v1.20.2 h1:u/yfZHn4EaHGdidrZycWpxXgFffjYULlTbRfJ51ykjQ= +github.com/compose-spec/compose-go/v2 v2.4.3 h1:4+Nd9IqIGobbPles9ZuRS5uJfFfRgBo4Wdcv+8VNex8= +github.com/compose-spec/compose-go/v2 v2.4.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc= +github.com/containerd/accelerated-container-image v1.2.3 h1:tAIoP7Z7b2xGhb7QCM5Fa+2xqWfPqRmyi5lodbsGGRA= +github.com/containerd/accelerated-container-image v1.2.3/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q= github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA= github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= -github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA= -github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig= -github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8= -github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= +github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= +github.com/containerd/containerd/v2 v2.0.0 h1:qLDdFaAykQrIyLiqwQrNLLz95wiC36bAZVwioUwqShM= +github.com/containerd/containerd/v2 v2.0.0/go.mod h1:j25kDy9P48/ngb1sxWIFfK6GsnqOHoSqo1EpAod20VQ= +github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII= +github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= +github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= +github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= github.com/containerd/go-cni v1.1.11 h1:fWt1K15AmSLsEfa57N+qYw4NeGPiQKYq1pjNGJwV9mc= github.com/containerd/go-cni v1.1.11/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA= github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U= -github.com/containerd/imgcrypt v1.1.10 h1:vtyGzTna2wC5BSQcqHWgY4xsBLHWFWyecgK0+9Np8aE= -github.com/containerd/imgcrypt v1.1.10/go.mod h1:9eIPG34EQy+j00fr+4r0knul2MkYDKD2uzKkw8548aw= +github.com/containerd/imgcrypt v1.1.9 h1:AnXt0sMq1Z2uIdaLt/fIHcMgtfVlFx6XpuaZzoC2XV0= +github.com/containerd/imgcrypt v1.1.9/go.mod h1:zEN6Nz5d5XIKgq06Tzk82YRlPZULKGSJ8fxhXhMwrYY= +github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 h1:7OMu5otk5Z2GeQs24JBPOmYbTc50+q6jo02qWNJc0p8= +github.com/containerd/imgcrypt/v2 v2.0.0-rc.1/go.mod h1:3/Ab3iliBt/aBVNYOwecT1YagCqAiHidOmVsrjtHF1A= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/nerdctl v1.7.7 h1:NmtSMmpF4qbS4aVj1/wyj2HTD3synzGFLXc4RC74Hwg= github.com/containerd/nerdctl v1.7.7/go.mod h1:tOE0YIYIwr/IyY3buGUmoinQ65nCPXNpnQZWafLAfrM= -github.com/containerd/nydus-snapshotter v0.13.11 h1:0euz1viJ0/4sZ5P0GP28wKrd+m0YqKRQcM6GZjuSKZk= -github.com/containerd/nydus-snapshotter v0.13.11/go.mod h1:VPVKQ3jmHFIcUIV2yiQ1kImZuBFS3GXDohKs9mRABVE= -github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= -github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= -github.com/containerd/stargz-snapshotter v0.15.1 h1:fpsP4kf/Z4n2EYnU0WT8ZCE3eiKDwikDhL6VwxIlgeA= -github.com/containerd/stargz-snapshotter v0.15.1/go.mod h1:74D+J1m1RMXytLmWxegXWhtOSRHPWZKpKc2NdK3S+us= -github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU= -github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk= -github.com/containerd/stargz-snapshotter/ipfs v0.15.1 h1:MMWRYrTu2iVOn9eRJqEer7v0eg34xY2uFZxbrrm2iCY= -github.com/containerd/stargz-snapshotter/ipfs v0.15.1/go.mod h1:DvrczCWAJnbTOau8txguZXDZdA7r39O3/Aj2olx+Q90= -github.com/containerd/ttrpc v1.2.5 h1:IFckT1EFQoFBMG4c3sMdT8EP3/aKfumK1msY+Ze4oLU= -github.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= +github.com/containerd/nerdctl/v2 v2.0.0 h1:6b8cqP+Fkv4p9cDKf/hJUJox6m86ix7pzIr45GiJPeg= +github.com/containerd/nerdctl/v2 v2.0.0/go.mod h1:ofedoI6YydZSii3Yisz6HWhIzB9tVTywOlRWrWP8E3g= +github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5 h1:NpscnGdkmWwlb0o2Q+rDO/kfoLObfY2sHwB6M5uF58Q= +github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5/go.mod h1:t7X6QEMNSz69fl5e2pF56ibd4XJ6KH9dEBrLnSwyYQk= +github.com/containerd/platforms v1.0.0-rc.0 h1:GuHWSKgVVO3POn6nRBB4sH63uPOLa87yuuhsGLWaXAA= +github.com/containerd/platforms v1.0.0-rc.0/go.mod h1:T1XAzzOdYs3it7l073MNXyxRwQofJfqwi/8cRjufIk4= +github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y= +github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47bQ+KexvO8= +github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319 h1:Td/dlhRp/kIk9W1rjXHSL87zZZiBQaKPV18OnoEREUA= +github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:dgo5lVziOOnWX8SxxHqYuc8ShsQou54eKLdahxFlHVc= +github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319 h1:BRxgmkGWi5vAvajiCwEK+xit4FeFU3GRjbiX4DKTLtM= +github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:9WSor0wu2swhtYoFkrjy3GHt7aNgKR2A7FhnpP+CH5o= +github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319 h1:WdmIerlurjZSoLI2w8014yzJY+q4qdO/A3ZJBEK7LQA= +github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:L/J/O36DzcGxq3drHM45sJRr/pEQTG5u+tbffVhP6r8= +github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4= +github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 h1:rQvjv7gRi6Ki/NS/U9oLZFhqyk4dh/GH2M3o/4BRkMM= github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67/go.mod h1:HDkcKOXRnX6yKnXv3P0QrogFi0DoiauK/LpQi961f0A= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM= github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M= -github.com/containernetworking/plugins v1.4.1 h1:+sJRRv8PKhLkXIl6tH1D7RMi+CbbHutDGU+ErLBORWA= -github.com/containernetworking/plugins v1.4.1/go.mod h1:n6FFGKcaY4o2o5msgu/UImtoC+fpQXM3076VHfHbj60= -github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic= -github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8= +github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ= +github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM= +github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM= +github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U= github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= @@ -78,8 +93,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.3.1 h1:1V7cHiaW+C+39wEfpH6XlLBQo3j/PciWFrgfCLS8XrE= -github.com/cyphar/filepath-securejoin v0.3.1/go.mod h1:F7i41x/9cBF7lzCrVsYs9fuzwRZm4NQsGTBdpp6mETc= +github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= +github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -92,8 +107,8 @@ github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDf github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= -github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= +github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= +github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= @@ -104,20 +119,20 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fahedouch/go-logrotate v0.2.0 h1:UR9Fv8MDVfWwnkirmFHck+tRSWzqOwRjVRLMpQgSxaI= -github.com/fahedouch/go-logrotate v0.2.0/go.mod h1:1RL/yr7LntS4zadAC6FT6yB/C1CQt3V6eHAZzymfwzE= -github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= -github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fahedouch/go-logrotate v0.2.1 h1:Q0Hk9Kp/Y4iwy9uR9e/60fEoxGhvfk8MG7WwtL9aarM= +github.com/fahedouch/go-logrotate v0.2.1/go.mod h1:Mmyex1f9fGXBNnhS9uHsbnO9BGvADF4VGqVnqAJalgc= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fluent/fluent-logger-golang v1.9.0 h1:zUdY44CHX2oIUc7VTNZc+4m+ORuO/mldQDA7czhWXEg= github.com/fluent/fluent-logger-golang v1.9.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF3zzzAuy6Xlk6FCMV5eU= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590 h1:OhyiFx+yBN30O3IHrIq+9LAEhy6o7fin21wUQxF8NiE= github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590/go.mod h1:rE/jidqqHHG9sjSxC24Gd5YCfZ1AT91C2wjJ28TAOfA= github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848 h1:2MhMMVBTnaHrst6HyWFDhwQCaJ05PZuOv1bE2gN8WFY= github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848/go.mod h1:+F5GJ7qGpQ03DBtcOEyQpM30ix4BLswdaojecFtsdy8= -github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= -github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= +github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -127,6 +142,8 @@ github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= +github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -150,7 +167,6 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -159,13 +175,13 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= @@ -177,8 +193,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= -github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= @@ -193,18 +207,16 @@ github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCX github.com/jsimonetti/rtnetlink/v2 v2.0.1/go.mod h1:7MoNYNbb3UaDHtF8udiJo/RH6VsTKP1pqKLUTVCvToE= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= +github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= @@ -217,6 +229,7 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= @@ -225,17 +238,16 @@ github.com/moby/moby v27.4.1+incompatible h1:z6detzbcLRt7U+w4ovHV+8oYpJfpHKTmUbF github.com/moby/moby v27.4.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= -github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= -github.com/moby/sys/mount v0.3.3/go.mod h1:PBaEorSNTLG5t/+4EgukEQVlAvVEc6ZjTySwKdqp5K0= -github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww= +github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os= github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0= github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8= -github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc= -github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= +github.com/moby/sys/symlink v0.3.0 h1:GZX89mEZ9u53f97npBy4Rc3vJKj7JBDj/PN2I22GrNU= +github.com/moby/sys/symlink v0.3.0/go.mod h1:3eNdhduHmYPcgsJtZXW1W4XUJdZGBIkttZ8xKqPUJq0= github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= @@ -246,14 +258,15 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= -github.com/multiformats/go-multiaddr v0.12.3 h1:hVBXvPRcKG0w80VinQ23P5t7czWgg65BmIvQKjDydU8= -github.com/multiformats/go-multiaddr v0.12.3/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII= +github.com/multiformats/go-multiaddr v0.13.0 h1:BCBzs61E3AGHcYYTv8dqRH43ZfyrqM8RXVPT8t13tLQ= +github.com/multiformats/go-multiaddr v0.13.0/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII= github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U= @@ -268,32 +281,40 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= -github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= +github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0= +github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI= +github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8= +github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= -github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= -github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -github.com/rootless-containers/bypass4netns v0.4.0 h1:7pcI4XWnOMQkgCsPKMXxMzQKhZUjaQ8J1n+eIYiHS0Y= -github.com/rootless-containers/bypass4netns v0.4.0/go.mod h1:RPNWMSRT951DMtq9Xv72IZoJPWFeJL6Wg5pF79Lkano= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rootless-containers/bypass4netns v0.4.1 h1:zyYM1uSG7/prAphD2vlJvx/MEKK91EjD2XaefGx5PKA= +github.com/rootless-containers/bypass4netns v0.4.1/go.mod h1:slu3ygwy1x6ey78oBTNs7lpymyEimLBYoXOG76b+Q+Y= github.com/rootless-containers/rootlesskit v1.1.1 h1:F5psKWoWY9/VjZ3ifVcaosjvFZJOagX85U22M0/EQZE= github.com/rootless-containers/rootlesskit v1.1.1/go.mod h1:UD5GoA3dqKCJrnvnhVgQQnweMF2qZnf9KLw8EewcMZI= +github.com/rootless-containers/rootlesskit/v2 v2.3.1 h1:wdYtdKxWFvVLby9ThMP6O6/v2q/GmOXbkRi+4m9nPW0= +github.com/rootless-containers/rootlesskit/v2 v2.3.1/go.mod h1:tdtfS9ak4bGmwJRmcjsAzcHN5rJ3c5dB7yhSV10KTbk= github.com/runfinch/common-tests v0.9.1 h1:O5+M+ThFPYprXhqs0UR54lbph0mTgcVhIX533k79Xbg= github.com/runfinch/common-tests v0.9.1/go.mod h1:vkWvXw8vc4f9LQFTYT1Fc6Q4eJvrBvunx4yn5WUjpiE= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= @@ -311,21 +332,25 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU= -github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k= +github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= +github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= +github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= @@ -333,33 +358,37 @@ github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/yuchanns/srslog v1.1.0 h1:CEm97Xxxd8XpJThE0gc/XsqUGgPufh5u5MUjC27/KOk= github.com/yuchanns/srslog v1.1.0/go.mod h1:HsLjdv3XV02C3kgBW2bTyW6i88OQE+VYJZIxrPKPPak= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak= -go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= +go.mozilla.org/pkcs7 v0.9.0 h1:yM4/HS9dYv7ri2biPtxt8ikvB37a980dg69/pKmS+eI= +go.mozilla.org/pkcs7 v0.9.0/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= -go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= -go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= -go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= -go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= -go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -371,8 +400,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -382,11 +411,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -396,45 +421,31 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -448,8 +459,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -463,15 +472,15 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -498,7 +507,13 @@ gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/cri-api v0.29.3 h1:ppKSui+hhTJW774Mou6x+/ealmzt2jmTM0vsEQVWrjI= -k8s.io/cri-api v0.29.3/go.mod h1:3X7EnhsNaQnCweGhQCJwKNHlH7wHEYuKQ19bRvXMoJY= -lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= -lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +k8s.io/cri-api v0.31.2 h1:O/weUnSHvM59nTio0unxIUFyRHMRKkYn96YDILSQKmo= +k8s.io/cri-api v0.31.2/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +tags.cncf.io/container-device-interface v0.8.0 h1:8bCFo/g9WODjWx3m6EYl3GfUG31eKJbaggyBDxEldRc= +tags.cncf.io/container-device-interface v0.8.0/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y= +tags.cncf.io/container-device-interface/specs-go v0.8.0 h1:QYGFzGxvYK/ZLMrjhvY0RjpUavIn4KcmRmVP/JjdBTA= +tags.cncf.io/container-device-interface/specs-go v0.8.0/go.mod h1:BhJIkjjPh4qpys+qm4DAYtUyryaTDg9zris+AczXyws= diff --git a/internal/backend/builder.go b/internal/backend/builder.go index bac06fb7..f1213844 100644 --- a/internal/backend/builder.go +++ b/internal/backend/builder.go @@ -6,9 +6,9 @@ package backend import ( "context" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/cmd/builder" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/builder" ) //go:generate mockgen --destination=../../mocks/mocks_backend/nerdctlbuildersvc.go -package=mocks_backend github.com/runfinch/finch-daemon/internal/backend NerdctlBuilderSvc diff --git a/internal/backend/container.go b/internal/backend/container.go index e3aa5100..6ce59ea7 100644 --- a/internal/backend/container.go +++ b/internal/backend/container.go @@ -11,14 +11,14 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/containerinspector" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/containerinspector" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/logging" ) //go:generate mockgen --destination=../../mocks/mocks_backend/nerdctlcontainersvc.go -package=mocks_backend github.com/runfinch/finch-daemon/internal/backend NerdctlContainerSvc diff --git a/internal/backend/containerd.go b/internal/backend/containerd.go index 010f6836..31889981 100644 --- a/internal/backend/containerd.go +++ b/internal/backend/containerd.go @@ -19,9 +19,9 @@ import ( "github.com/containerd/containerd/pkg/cap" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" "github.com/containerd/platforms" "github.com/distribution/reference" "github.com/opencontainers/go-digest" diff --git a/internal/backend/image.go b/internal/backend/image.go index 37cadc01..7fb7400f 100644 --- a/internal/backend/image.go +++ b/internal/backend/image.go @@ -11,14 +11,14 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" dockerconfig "github.com/containerd/containerd/remotes/docker/config" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/imageinspector" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" - "github.com/containerd/nerdctl/pkg/imgutil/push" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/imageinspector" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/push" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/internal/backend/nerdctl.go b/internal/backend/nerdctl.go index 18e790e6..5aff1e32 100644 --- a/internal/backend/nerdctl.go +++ b/internal/backend/nerdctl.go @@ -6,8 +6,8 @@ package backend import ( "os" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/version" diff --git a/internal/backend/network.go b/internal/backend/network.go index 593fb622..f579bd0d 100644 --- a/internal/backend/network.go +++ b/internal/backend/network.go @@ -7,9 +7,9 @@ import ( "context" "encoding/json" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" cnitypes "github.com/containernetworking/cni/pkg/types" ) diff --git a/internal/backend/system.go b/internal/backend/system.go index 78adb91f..a8766291 100644 --- a/internal/backend/system.go +++ b/internal/backend/system.go @@ -6,8 +6,8 @@ package backend import ( "context" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" ) //go:generate mockgen --destination=../../mocks/mocks_backend/nerdctlsystemsvc.go -package=mocks_backend github.com/runfinch/finch-daemon/internal/backend NerdctlSystemSvc diff --git a/internal/backend/volume.go b/internal/backend/volume.go index 87377e35..6502087d 100644 --- a/internal/backend/volume.go +++ b/internal/backend/volume.go @@ -8,9 +8,9 @@ import ( "io" "os" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) //go:generate mockgen --destination=../../mocks/mocks_backend/nerdctlvolumesvc.go -package=mocks_backend github.com/runfinch/finch-daemon/internal/backend NerdctlVolumeSvc diff --git a/internal/service/builder/build.go b/internal/service/builder/build.go index e9179361..d3c1630f 100644 --- a/internal/service/builder/build.go +++ b/internal/service/builder/build.go @@ -11,7 +11,7 @@ import ( "io" "strings" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/events" "github.com/runfinch/finch-daemon/api/types" diff --git a/internal/service/builder/build_test.go b/internal/service/builder/build_test.go index e9a352ea..ba3218c4 100644 --- a/internal/service/builder/build_test.go +++ b/internal/service/builder/build_test.go @@ -11,7 +11,7 @@ import ( "net/http/httptest" "os" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/attach.go b/internal/service/container/attach.go index 4fad80fc..0b8e96cf 100644 --- a/internal/service/container/attach.go +++ b/internal/service/container/attach.go @@ -11,11 +11,11 @@ import ( "time" "github.com/containerd/containerd" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/api/types/cri" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" - "github.com/containerd/nerdctl/pkg/logging" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types/cri" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/logging" "github.com/moby/moby/pkg/stdcopy" "github.com/runfinch/finch-daemon/api/types" diff --git a/internal/service/container/attach_test.go b/internal/service/container/attach_test.go index 454c2ede..ed727de9 100644 --- a/internal/service/container/attach_test.go +++ b/internal/service/container/attach_test.go @@ -13,8 +13,8 @@ import ( "syscall" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" "github.com/containerd/typeurl/v2" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/create.go b/internal/service/container/create.go index 8ca6b399..35381ae5 100644 --- a/internal/service/container/create.go +++ b/internal/service/container/create.go @@ -10,11 +10,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/logging" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/sirupsen/logrus" "github.com/runfinch/finch-daemon/pkg/errdefs" diff --git a/internal/service/container/create_test.go b/internal/service/container/create_test.go index b8cd4957..eb0ed0d9 100644 --- a/internal/service/container/create_test.go +++ b/internal/service/container/create_test.go @@ -8,8 +8,8 @@ import ( "errors" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/exec.go b/internal/service/container/exec.go index 7baa421a..d42968ba 100644 --- a/internal/service/container/exec.go +++ b/internal/service/container/exec.go @@ -13,8 +13,8 @@ import ( "github.com/containerd/containerd/defaults" "github.com/containerd/containerd/oci" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/flagutil" - "github.com/containerd/nerdctl/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/flagutil" + "github.com/containerd/nerdctl/v2/pkg/idgen" "github.com/opencontainers/runtime-spec/specs-go" "github.com/runfinch/finch-daemon/api/types" diff --git a/internal/service/container/inspect.go b/internal/service/container/inspect.go index b2f7eef9..d1124588 100644 --- a/internal/service/container/inspect.go +++ b/internal/service/container/inspect.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/container/inspect_test.go b/internal/service/container/inspect_test.go index 21bb37c4..f666896f 100644 --- a/internal/service/container/inspect_test.go +++ b/internal/service/container/inspect_test.go @@ -8,7 +8,7 @@ import ( "errors" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/list.go b/internal/service/container/list.go index da36b524..00e4f4c7 100644 --- a/internal/service/container/list.go +++ b/internal/service/container/list.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/container/list_test.go b/internal/service/container/list_test.go index e6babb23..4e499b6b 100644 --- a/internal/service/container/list_test.go +++ b/internal/service/container/list_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/containerd/containerd" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - ncContainer "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + ncContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/logs.go b/internal/service/container/logs.go index 86f31471..8d294824 100644 --- a/internal/service/container/logs.go +++ b/internal/service/container/logs.go @@ -8,7 +8,7 @@ import ( "io" "strconv" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/moby/moby/pkg/stdcopy" "github.com/runfinch/finch-daemon/api/types" diff --git a/internal/service/container/logs_test.go b/internal/service/container/logs_test.go index 6311488a..5b7a97e8 100644 --- a/internal/service/container/logs_test.go +++ b/internal/service/container/logs_test.go @@ -16,8 +16,8 @@ import ( "github.com/runfinch/finch-daemon/mocks/mocks_archive" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" "github.com/containerd/typeurl/v2" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/remove.go b/internal/service/container/remove.go index 46c20f63..579173b7 100644 --- a/internal/service/container/remove.go +++ b/internal/service/container/remove.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/container/remove_test.go b/internal/service/container/remove_test.go index a8b89a74..c4ce0c39 100644 --- a/internal/service/container/remove_test.go +++ b/internal/service/container/remove_test.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/containerd/containerd" - ncContainer "github.com/containerd/nerdctl/pkg/cmd/container" + ncContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/rename.go b/internal/service/container/rename.go index 821c39b1..c89365fb 100644 --- a/internal/service/container/rename.go +++ b/internal/service/container/rename.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/container/rename_test.go b/internal/service/container/rename_test.go index 06ebdd4e..c13aa1bc 100644 --- a/internal/service/container/rename_test.go +++ b/internal/service/container/rename_test.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/containerd/containerd" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/stats.go b/internal/service/container/stats.go index be36885b..c409eb12 100644 --- a/internal/service/container/stats.go +++ b/internal/service/container/stats.go @@ -12,7 +12,7 @@ import ( v2 "github.com/containerd/cgroups/v3/cgroup2/stats" "github.com/containerd/containerd" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/containerd/typeurl/v2" dockertypes "github.com/docker/docker/api/types/container" diff --git a/internal/service/container/stats_test.go b/internal/service/container/stats_test.go index 243e9b12..4a64ef99 100644 --- a/internal/service/container/stats_test.go +++ b/internal/service/container/stats_test.go @@ -14,8 +14,8 @@ import ( cTypes "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/events" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/containerd/typeurl/v2" dockertypes "github.com/docker/docker/api/types/container" "github.com/golang/mock/gomock" diff --git a/internal/service/distribution/distribution.go b/internal/service/distribution/distribution.go index 26c967e3..9243afcc 100644 --- a/internal/service/distribution/distribution.go +++ b/internal/service/distribution/distribution.go @@ -14,7 +14,7 @@ import ( dockerresolver "github.com/containerd/containerd/remotes/docker" cremoteerrors "github.com/containerd/containerd/remotes/errors" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" registrytypes "github.com/docker/docker/api/types/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/internal/service/distribution/distribution_test.go b/internal/service/distribution/distribution_test.go index 72e2f837..c5e54567 100644 --- a/internal/service/distribution/distribution_test.go +++ b/internal/service/distribution/distribution_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/exec/start.go b/internal/service/exec/start.go index 9686e7f9..3256b169 100644 --- a/internal/service/exec/start.go +++ b/internal/service/exec/start.go @@ -14,7 +14,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/signalutil" + "github.com/containerd/nerdctl/v2/pkg/signalutil" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/pkg/errdefs" diff --git a/internal/service/image/image_test.go b/internal/service/image/image_test.go index c851f7bc..de4a5873 100644 --- a/internal/service/image/image_test.go +++ b/internal/service/image/image_test.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/remotes" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/image/inspect.go b/internal/service/image/inspect.go index 0ad90604..d1ea6c2b 100644 --- a/internal/service/image/inspect.go +++ b/internal/service/image/inspect.go @@ -6,7 +6,7 @@ package image import ( "context" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" ) func (s *service) Inspect(ctx context.Context, name string) (*dockercompat.Image, error) { diff --git a/internal/service/image/inspect_test.go b/internal/service/image/inspect_test.go index cd4ecb46..c9d79898 100644 --- a/internal/service/image/inspect_test.go +++ b/internal/service/image/inspect_test.go @@ -8,7 +8,7 @@ import ( "errors" "github.com/containerd/containerd/images" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/image/pull.go b/internal/service/image/pull.go index 8649f680..f0862c31 100644 --- a/internal/service/image/pull.go +++ b/internal/service/image/pull.go @@ -13,7 +13,7 @@ import ( "github.com/containerd/containerd/remotes/docker" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/internal/service/image/pull_test.go b/internal/service/image/pull_test.go index 94e03ffc..4ae33cbb 100644 --- a/internal/service/image/pull_test.go +++ b/internal/service/image/pull_test.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/image/push.go b/internal/service/image/push.go index 5b7f9b22..38220312 100644 --- a/internal/service/image/push.go +++ b/internal/service/image/push.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/containerd/containerd/images/converter" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" "github.com/runfinch/finch-daemon/api/types" diff --git a/internal/service/image/push_test.go b/internal/service/image/push_test.go index 5003c883..9d25434a 100644 --- a/internal/service/image/push_test.go +++ b/internal/service/image/push_test.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" "github.com/containerd/platforms" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" diff --git a/internal/service/image/tag.go b/internal/service/image/tag.go index 06dd26fa..06cd4984 100644 --- a/internal/service/image/tag.go +++ b/internal/service/image/tag.go @@ -8,8 +8,8 @@ import ( "fmt" cerrdefs "github.com/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" eventtype "github.com/runfinch/finch-daemon/api/events" "github.com/runfinch/finch-daemon/pkg/errdefs" diff --git a/internal/service/network/connect.go b/internal/service/network/connect.go index 02fe98cf..f5931c76 100644 --- a/internal/service/network/connect.go +++ b/internal/service/network/connect.go @@ -12,10 +12,10 @@ import ( "github.com/containerd/containerd" cerrdefs "github.com/containerd/errdefs" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/netutil/nettype" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil/nettype" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/containernetworking/cni/libcni" "github.com/sirupsen/logrus" ) diff --git a/internal/service/network/create.go b/internal/service/network/create.go index 0c7f1493..05706612 100644 --- a/internal/service/network/create.go +++ b/internal/service/network/create.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/internal/service/network/driver" diff --git a/internal/service/network/create_test.go b/internal/service/network/create_test.go index f93fe505..2514f898 100644 --- a/internal/service/network/create_test.go +++ b/internal/service/network/create_test.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/network/driver/bridge.go b/internal/service/network/driver/bridge.go index 2b0ce26a..32658b45 100644 --- a/internal/service/network/driver/bridge.go +++ b/internal/service/network/driver/bridge.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strconv" - "github.com/containerd/nerdctl/pkg/lockutil" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/lockutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/internal/backend" "github.com/runfinch/finch-daemon/pkg/flog" diff --git a/internal/service/network/driver/bridge_test.go b/internal/service/network/driver/bridge_test.go index dfc4270b..bc38af48 100644 --- a/internal/service/network/driver/bridge_test.go +++ b/internal/service/network/driver/bridge_test.go @@ -6,7 +6,7 @@ package driver import ( "fmt" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/coreos/go-iptables/iptables" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/network/driver/driver.go b/internal/service/network/driver/driver.go index d55f22b9..71fd41a9 100644 --- a/internal/service/network/driver/driver.go +++ b/internal/service/network/driver/driver.go @@ -4,7 +4,7 @@ package driver import ( - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/network/inspect_test.go b/internal/service/network/inspect_test.go index dfd19702..f2719124 100644 --- a/internal/service/network/inspect_test.go +++ b/internal/service/network/inspect_test.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/network/list.go b/internal/service/network/list.go index 18ab72ce..767c31f1 100644 --- a/internal/service/network/list.go +++ b/internal/service/network/list.go @@ -6,7 +6,7 @@ package network import ( "context" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/network/list_test.go b/internal/service/network/list_test.go index 15b2e95d..9b9689f0 100644 --- a/internal/service/network/list_test.go +++ b/internal/service/network/list_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/network/network.go b/internal/service/network/network.go index c4c0fd68..8b992cbc 100644 --- a/internal/service/network/network.go +++ b/internal/service/network/network.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/handlers/network" "github.com/runfinch/finch-daemon/internal/backend" diff --git a/internal/service/network/remove.go b/internal/service/network/remove.go index a2a6692a..0cceb1cc 100644 --- a/internal/service/network/remove.go +++ b/internal/service/network/remove.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/internal/service/network/driver" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/network/remove_test.go b/internal/service/network/remove_test.go index 03b1b0f9..c0f1b10a 100644 --- a/internal/service/network/remove_test.go +++ b/internal/service/network/remove_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/containernetworking/cni/libcni" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/system/auth.go b/internal/service/system/auth.go index 484829de..f3bb9fcb 100644 --- a/internal/service/system/auth.go +++ b/internal/service/system/auth.go @@ -14,7 +14,7 @@ import ( "github.com/containerd/containerd/remotes/docker" dockerconfig "github.com/containerd/containerd/remotes/docker/config" remoteerrs "github.com/containerd/containerd/remotes/errors" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" "golang.org/x/net/context/ctxhttp" "github.com/runfinch/finch-daemon/pkg/errdefs" diff --git a/internal/service/system/info.go b/internal/service/system/info.go index 043bdff9..45902113 100644 --- a/internal/service/system/info.go +++ b/internal/service/system/info.go @@ -6,9 +6,9 @@ package system import ( "context" - "github.com/containerd/nerdctl/pkg/config" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" ) func (s *service) GetInfo(ctx context.Context, config *config.Config) (*dockercompat.Info, error) { diff --git a/internal/service/system/version_test.go b/internal/service/system/version_test.go index 0729794d..26c84485 100644 --- a/internal/service/system/version_test.go +++ b/internal/service/system/version_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/volume/create.go b/internal/service/volume/create.go index d94ac9f9..0258bd98 100644 --- a/internal/service/volume/create.go +++ b/internal/service/volume/create.go @@ -6,7 +6,7 @@ package volume import ( "context" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) // Create a new volume and return the pointer to that volume. diff --git a/internal/service/volume/create_test.go b/internal/service/volume/create_test.go index a11518ad..32f35328 100644 --- a/internal/service/volume/create_test.go +++ b/internal/service/volume/create_test.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/volume/inspect.go b/internal/service/volume/inspect.go index a12c9888..ad8ea443 100644 --- a/internal/service/volume/inspect.go +++ b/internal/service/volume/inspect.go @@ -6,7 +6,7 @@ package volume import ( "strings" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/volume/inspect_test.go b/internal/service/volume/inspect_test.go index c3e90285..288ff284 100644 --- a/internal/service/volume/inspect_test.go +++ b/internal/service/volume/inspect_test.go @@ -6,7 +6,7 @@ package volume import ( "fmt" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/volume/list.go b/internal/service/volume/list.go index 8cb38e02..a06fa3ff 100644 --- a/internal/service/volume/list.go +++ b/internal/service/volume/list.go @@ -6,7 +6,7 @@ package volume import ( "context" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/volume/list_test.go b/internal/service/volume/list_test.go index 9c546aa6..7d708bd5 100644 --- a/internal/service/volume/list_test.go +++ b/internal/service/volume/list_test.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/mocks/mocks_backend/nerdctlbuildersvc.go b/mocks/mocks_backend/nerdctlbuildersvc.go index b22da623..2a844c37 100644 --- a/mocks/mocks_backend/nerdctlbuildersvc.go +++ b/mocks/mocks_backend/nerdctlbuildersvc.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - types "github.com/containerd/nerdctl/pkg/api/types" + types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" backend "github.com/runfinch/finch-daemon/internal/backend" ) diff --git a/mocks/mocks_backend/nerdctlcontainersvc.go b/mocks/mocks_backend/nerdctlcontainersvc.go index 09bc4aa0..6f5fc422 100644 --- a/mocks/mocks_backend/nerdctlcontainersvc.go +++ b/mocks/mocks_backend/nerdctlcontainersvc.go @@ -12,12 +12,12 @@ import ( time "time" containerd "github.com/containerd/containerd" - types "github.com/containerd/nerdctl/pkg/api/types" - container "github.com/containerd/nerdctl/pkg/cmd/container" - containerutil "github.com/containerd/nerdctl/pkg/containerutil" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - native "github.com/containerd/nerdctl/pkg/inspecttypes/native" - logging "github.com/containerd/nerdctl/pkg/logging" + types "github.com/containerd/nerdctl/v2/pkg/api/types" + container "github.com/containerd/nerdctl/v2/pkg/cmd/container" + containerutil "github.com/containerd/nerdctl/v2/pkg/containerutil" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + native "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + logging "github.com/containerd/nerdctl/v2/pkg/logging" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_backend/nerdctlimagesvc.go b/mocks/mocks_backend/nerdctlimagesvc.go index e4121ae2..990c8055 100644 --- a/mocks/mocks_backend/nerdctlimagesvc.go +++ b/mocks/mocks_backend/nerdctlimagesvc.go @@ -12,9 +12,9 @@ import ( images "github.com/containerd/containerd/images" remotes "github.com/containerd/containerd/remotes" docker "github.com/containerd/containerd/remotes/docker" - imgutil "github.com/containerd/nerdctl/pkg/imgutil" - dockerconfigresolver "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + imgutil "github.com/containerd/nerdctl/v2/pkg/imgutil" + dockerconfigresolver "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" platforms "github.com/containerd/platforms" gomock "github.com/golang/mock/gomock" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/mocks/mocks_backend/nerdctlnetworksvc.go b/mocks/mocks_backend/nerdctlnetworksvc.go index 66933cd6..9d6b4a41 100644 --- a/mocks/mocks_backend/nerdctlnetworksvc.go +++ b/mocks/mocks_backend/nerdctlnetworksvc.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - netutil "github.com/containerd/nerdctl/pkg/netutil" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + netutil "github.com/containerd/nerdctl/v2/pkg/netutil" libcni "github.com/containernetworking/cni/libcni" types "github.com/containernetworking/cni/pkg/types" gomock "github.com/golang/mock/gomock" diff --git a/mocks/mocks_backend/nerdctlsystemsvc.go b/mocks/mocks_backend/nerdctlsystemsvc.go index 79bff08f..8a351113 100644 --- a/mocks/mocks_backend/nerdctlsystemsvc.go +++ b/mocks/mocks_backend/nerdctlsystemsvc.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_backend/nerdctlvolumesvc.go b/mocks/mocks_backend/nerdctlvolumesvc.go index b5c5cf00..f51d4aab 100644 --- a/mocks/mocks_backend/nerdctlvolumesvc.go +++ b/mocks/mocks_backend/nerdctlvolumesvc.go @@ -9,7 +9,7 @@ import ( io "io" reflect "reflect" - native "github.com/containerd/nerdctl/pkg/inspecttypes/native" + native "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_builder/buildersvc.go b/mocks/mocks_builder/buildersvc.go index 91590d4c..25a1a69a 100644 --- a/mocks/mocks_builder/buildersvc.go +++ b/mocks/mocks_builder/buildersvc.go @@ -9,7 +9,7 @@ import ( io "io" reflect "reflect" - types "github.com/containerd/nerdctl/pkg/api/types" + types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" types0 "github.com/runfinch/finch-daemon/api/types" ) diff --git a/mocks/mocks_container/containersvc.go b/mocks/mocks_container/containersvc.go index 8158c26c..ac358667 100644 --- a/mocks/mocks_container/containersvc.go +++ b/mocks/mocks_container/containersvc.go @@ -10,7 +10,7 @@ import ( reflect "reflect" time "time" - types "github.com/containerd/nerdctl/pkg/api/types" + types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" types0 "github.com/runfinch/finch-daemon/api/types" ) diff --git a/mocks/mocks_container/network_manager.go b/mocks/mocks_container/network_manager.go index 1d1abee5..95f97794 100644 --- a/mocks/mocks_container/network_manager.go +++ b/mocks/mocks_container/network_manager.go @@ -10,7 +10,7 @@ import ( containerd "github.com/containerd/containerd" oci "github.com/containerd/containerd/oci" - types "github.com/containerd/nerdctl/pkg/api/types" + types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_image/imagesvc.go b/mocks/mocks_image/imagesvc.go index 3be06c7e..3809c5f8 100644 --- a/mocks/mocks_image/imagesvc.go +++ b/mocks/mocks_image/imagesvc.go @@ -9,7 +9,7 @@ import ( io "io" reflect "reflect" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" types "github.com/docker/cli/cli/config/types" gomock "github.com/golang/mock/gomock" types0 "github.com/runfinch/finch-daemon/api/types" diff --git a/mocks/mocks_statsutil/statsutil.go b/mocks/mocks_statsutil/statsutil.go index 792076ae..dbb941f8 100644 --- a/mocks/mocks_statsutil/statsutil.go +++ b/mocks/mocks_statsutil/statsutil.go @@ -7,7 +7,7 @@ package mocks_statsutil import ( reflect "reflect" - native "github.com/containerd/nerdctl/pkg/inspecttypes/native" + native "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" container "github.com/docker/docker/api/types/container" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_system/systemsvc.go b/mocks/mocks_system/systemsvc.go index 9385d265..1b64ad2a 100644 --- a/mocks/mocks_system/systemsvc.go +++ b/mocks/mocks_system/systemsvc.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - config "github.com/containerd/nerdctl/pkg/config" - dockercompat "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + config "github.com/containerd/nerdctl/v2/pkg/config" + dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" gomock "github.com/golang/mock/gomock" events "github.com/runfinch/finch-daemon/api/events" types "github.com/runfinch/finch-daemon/api/types" diff --git a/mocks/mocks_volume/volumesvc.go b/mocks/mocks_volume/volumesvc.go index 6d35a81a..567e5623 100644 --- a/mocks/mocks_volume/volumesvc.go +++ b/mocks/mocks_volume/volumesvc.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - native "github.com/containerd/nerdctl/pkg/inspecttypes/native" + native "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" gomock "github.com/golang/mock/gomock" types "github.com/runfinch/finch-daemon/api/types" ) diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 11b556b7..42632bb2 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/containerd/nerdctl/pkg/tarutil" + "github.com/containerd/nerdctl/v2/pkg/tarutil" "github.com/docker/docker/pkg/archive" "github.com/runfinch/finch-daemon/pkg/ecc" diff --git a/pkg/statsutil/statsutil.go b/pkg/statsutil/statsutil.go index e7294e78..f37c1b56 100644 --- a/pkg/statsutil/statsutil.go +++ b/pkg/statsutil/statsutil.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" dockertypes "github.com/docker/docker/api/types/container" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" From 26b5e3af083bc00ddffbcf76b3d366fd5eac5275 Mon Sep 17 00:00:00 2001 From: David Son Date: Tue, 12 Nov 2024 23:06:19 +0000 Subject: [PATCH 2/4] chore: update containerd to v2.0.0 Signed-off-by: David Son --- api/handlers/builder/build.go | 2 +- api/handlers/container/create.go | 2 +- api/handlers/container/exec.go | 2 +- api/handlers/container/inspect.go | 2 +- api/handlers/container/list.go | 2 +- api/handlers/container/remove.go | 2 +- api/handlers/container/rename.go | 2 +- api/handlers/container/restart.go | 2 +- api/handlers/container/start.go | 2 +- api/handlers/container/stats.go | 2 +- api/handlers/container/stop.go | 2 +- api/handlers/container/wait.go | 2 +- api/handlers/exec/inspect.go | 2 +- api/handlers/exec/resize.go | 2 +- api/handlers/exec/start.go | 2 +- api/handlers/image/inspect.go | 2 +- api/handlers/image/load.go | 2 +- api/handlers/image/pull.go | 2 +- api/handlers/image/push.go | 2 +- api/handlers/network/connect.go | 2 +- api/handlers/network/create.go | 2 +- api/handlers/network/remove.go | 2 +- cmd/finch-daemon/router_utils.go | 4 ++-- go.mod | 8 ++++---- go.sum | 12 ++++++------ internal/backend/container.go | 2 +- internal/backend/containerd.go | 18 +++++++++--------- internal/backend/image.go | 8 ++++---- internal/service/container/attach.go | 2 +- internal/service/container/attach_test.go | 2 +- internal/service/container/container.go | 2 +- internal/service/container/container_test.go | 2 +- internal/service/container/create.go | 4 ++-- internal/service/container/exec.go | 10 +++++----- internal/service/container/exec_test.go | 10 +++++----- internal/service/container/get_archive.go | 2 +- internal/service/container/get_archive_test.go | 6 +++--- internal/service/container/inspect_test.go | 2 +- internal/service/container/list_test.go | 2 +- internal/service/container/logs_test.go | 2 +- internal/service/container/put_archive.go | 2 +- internal/service/container/put_archive_test.go | 6 +++--- internal/service/container/remove_test.go | 2 +- internal/service/container/rename_test.go | 2 +- internal/service/container/restart_test.go | 2 +- internal/service/container/start.go | 2 +- internal/service/container/start_test.go | 2 +- internal/service/container/stats.go | 2 +- internal/service/container/stats_test.go | 4 ++-- internal/service/container/stop.go | 2 +- internal/service/container/stop_test.go | 2 +- internal/service/container/wait.go | 2 +- internal/service/exec/exec.go | 4 ++-- internal/service/exec/exec_test.go | 4 ++-- internal/service/exec/inspect.go | 2 +- internal/service/exec/inspect_test.go | 4 ++-- internal/service/exec/resize_test.go | 2 +- internal/service/exec/start.go | 4 ++-- internal/service/exec/start_test.go | 2 +- internal/service/image/image.go | 2 +- internal/service/image/image_test.go | 4 ++-- internal/service/image/inspect_test.go | 2 +- internal/service/image/pull.go | 2 +- internal/service/image/pull_test.go | 4 ++-- internal/service/image/push.go | 2 +- internal/service/image/push_test.go | 10 +++++----- internal/service/image/remove_test.go | 2 +- internal/service/network/connect.go | 2 +- internal/service/network/network.go | 2 +- internal/service/system/auth.go | 6 +++--- internal/service/system/events.go | 2 +- internal/service/system/events_test.go | 2 +- mocks/mocks_backend/containerdclient.go | 14 +++++++------- mocks/mocks_backend/nerdctlcontainersvc.go | 2 +- mocks/mocks_backend/nerdctlimagesvc.go | 6 +++--- mocks/mocks_cio/io.go | 2 +- mocks/mocks_container/container.go | 6 +++--- mocks/mocks_container/network_manager.go | 4 ++-- mocks/mocks_container/process.go | 4 ++-- mocks/mocks_container/task.go | 4 ++-- mocks/mocks_image/store.go | 2 +- 81 files changed, 140 insertions(+), 140 deletions(-) diff --git a/api/handlers/builder/build.go b/api/handlers/builder/build.go index 86188b42..6d45da58 100644 --- a/api/handlers/builder/build.go +++ b/api/handlers/builder/build.go @@ -10,7 +10,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/container/create.go b/api/handlers/container/create.go index e152589e..3820e78b 100644 --- a/api/handlers/container/create.go +++ b/api/handlers/container/create.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" gocni "github.com/containerd/go-cni" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/defaults" diff --git a/api/handlers/container/exec.go b/api/handlers/container/exec.go index 8350213e..45d543ee 100644 --- a/api/handlers/container/exec.go +++ b/api/handlers/container/exec.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/container/inspect.go b/api/handlers/container/inspect.go index 57dd4033..73d51e6e 100644 --- a/api/handlers/container/inspect.go +++ b/api/handlers/container/inspect.go @@ -6,7 +6,7 @@ package container import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/list.go b/api/handlers/container/list.go index 4ffdc062..7fb102a9 100644 --- a/api/handlers/container/list.go +++ b/api/handlers/container/list.go @@ -10,7 +10,7 @@ import ( "net/url" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/container/remove.go b/api/handlers/container/remove.go index 31edfbbf..feca0cab 100644 --- a/api/handlers/container/remove.go +++ b/api/handlers/container/remove.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/rename.go b/api/handlers/container/rename.go index 7e3f14ed..abdf5a3f 100644 --- a/api/handlers/container/rename.go +++ b/api/handlers/container/rename.go @@ -6,7 +6,7 @@ package container import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/restart.go b/api/handlers/container/restart.go index 1d16b2e6..f0f79277 100644 --- a/api/handlers/container/restart.go +++ b/api/handlers/container/restart.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" "github.com/runfinch/finch-daemon/pkg/errdefs" diff --git a/api/handlers/container/start.go b/api/handlers/container/start.go index 3f16a297..49cecc84 100644 --- a/api/handlers/container/start.go +++ b/api/handlers/container/start.go @@ -6,7 +6,7 @@ package container import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/stats.go b/api/handlers/container/stats.go index 9dd38bb3..74ff1de7 100644 --- a/api/handlers/container/stats.go +++ b/api/handlers/container/stats.go @@ -9,7 +9,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/container/stop.go b/api/handlers/container/stop.go index ccfa4d75..9d28c69b 100644 --- a/api/handlers/container/stop.go +++ b/api/handlers/container/stop.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/container/wait.go b/api/handlers/container/wait.go index a6a567d5..fedf7b52 100644 --- a/api/handlers/container/wait.go +++ b/api/handlers/container/wait.go @@ -6,7 +6,7 @@ package container import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/api/handlers/exec/inspect.go b/api/handlers/exec/inspect.go index 2977bb3b..62cd23fd 100644 --- a/api/handlers/exec/inspect.go +++ b/api/handlers/exec/inspect.go @@ -6,7 +6,7 @@ package exec import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/exec/resize.go b/api/handlers/exec/resize.go index 3cdd15a3..5e1d4b95 100644 --- a/api/handlers/exec/resize.go +++ b/api/handlers/exec/resize.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/exec/start.go b/api/handlers/exec/start.go index 1883d1a4..ccf27f6d 100644 --- a/api/handlers/exec/start.go +++ b/api/handlers/exec/start.go @@ -10,7 +10,7 @@ import ( "io" "net/http" - "github.com/containerd/containerd/namespaces" + "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" diff --git a/api/handlers/image/inspect.go b/api/handlers/image/inspect.go index de4071ec..af176857 100644 --- a/api/handlers/image/inspect.go +++ b/api/handlers/image/inspect.go @@ -6,7 +6,7 @@ package image import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/image/load.go b/api/handlers/image/load.go index f7f71766..b9cff796 100644 --- a/api/handlers/image/load.go +++ b/api/handlers/image/load.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/runfinch/finch-daemon/api/response" ) diff --git a/api/handlers/image/pull.go b/api/handlers/image/pull.go index e994ed86..9d458750 100644 --- a/api/handlers/image/pull.go +++ b/api/handlers/image/pull.go @@ -8,7 +8,7 @@ import ( "net/http" "regexp" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/runfinch/finch-daemon/api/auth" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/image/push.go b/api/handlers/image/push.go index e83890ea..50af938d 100644 --- a/api/handlers/image/push.go +++ b/api/handlers/image/push.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/auth" diff --git a/api/handlers/network/connect.go b/api/handlers/network/connect.go index efaeed01..7e06af32 100644 --- a/api/handlers/network/connect.go +++ b/api/handlers/network/connect.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/network/create.go b/api/handlers/network/create.go index 1607d37a..41f936d7 100644 --- a/api/handlers/network/create.go +++ b/api/handlers/network/create.go @@ -8,7 +8,7 @@ import ( "errors" "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" respond "github.com/runfinch/finch-daemon/api/response" "github.com/runfinch/finch-daemon/api/types" diff --git a/api/handlers/network/remove.go b/api/handlers/network/remove.go index a9e8c63d..9338e7ab 100644 --- a/api/handlers/network/remove.go +++ b/api/handlers/network/remove.go @@ -6,7 +6,7 @@ package network import ( "net/http" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/gorilla/mux" "github.com/sirupsen/logrus" diff --git a/cmd/finch-daemon/router_utils.go b/cmd/finch-daemon/router_utils.go index 71b52709..0261f4c4 100644 --- a/cmd/finch-daemon/router_utils.go +++ b/cmd/finch-daemon/router_utils.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd" - "github.com/containerd/containerd/namespaces" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/config" toml "github.com/pelletier/go-toml/v2" diff --git a/go.mod b/go.mod index d030fa76..4dee6b05 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module github.com/runfinch/finch-daemon go 1.22.0 require ( - github.com/containerd/cgroups/v3 v3.0.5 - github.com/containerd/containerd v1.7.24 + github.com/containerd/cgroups/v3 v3.0.3 + github.com/containerd/containerd v1.7.23 github.com/containerd/containerd/api v1.8.0 + github.com/containerd/containerd/v2 v2.0.0 github.com/containerd/errdefs v1.0.0 github.com/containerd/fifo v1.1.0 github.com/containerd/go-cni v1.1.11 @@ -57,7 +58,6 @@ require ( github.com/cilium/ebpf v0.16.0 // indirect github.com/containerd/accelerated-container-image v1.2.3 // indirect github.com/containerd/console v1.0.4 // indirect - github.com/containerd/containerd/v2 v2.0.0 // indirect github.com/containerd/continuity v0.4.4 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/go-runc v1.1.0 // indirect @@ -151,7 +151,7 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.28.0 // indirect - google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/grpc v1.67.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index b42ed148..52054ded 100644 --- a/go.sum +++ b/go.sum @@ -30,12 +30,12 @@ github.com/compose-spec/compose-go/v2 v2.4.3 h1:4+Nd9IqIGobbPles9ZuRS5uJfFfRgBo4 github.com/compose-spec/compose-go/v2 v2.4.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc= github.com/containerd/accelerated-container-image v1.2.3 h1:tAIoP7Z7b2xGhb7QCM5Fa+2xqWfPqRmyi5lodbsGGRA= github.com/containerd/accelerated-container-image v1.2.3/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q= -github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= -github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= +github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= +github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= -github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA= -github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= +github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ= +github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= github.com/containerd/containerd/v2 v2.0.0 h1:qLDdFaAykQrIyLiqwQrNLLz95wiC36bAZVwioUwqShM= @@ -470,8 +470,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= -google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= diff --git a/internal/backend/container.go b/internal/backend/container.go index 6ce59ea7..a2744281 100644 --- a/internal/backend/container.go +++ b/internal/backend/container.go @@ -10,7 +10,7 @@ import ( "os/exec" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/clientutil" "github.com/containerd/nerdctl/v2/pkg/cmd/container" diff --git a/internal/backend/containerd.go b/internal/backend/containerd.go index 31889981..3bea946b 100644 --- a/internal/backend/containerd.go +++ b/internal/backend/containerd.go @@ -9,15 +9,15 @@ import ( "regexp" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/converter" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cap" - "github.com/containerd/containerd/remotes/docker" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/core/events" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/converter" + "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/cap" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/containerutil" "github.com/containerd/nerdctl/v2/pkg/labels" diff --git a/internal/backend/image.go b/internal/backend/image.go index 7fb7400f..1ac8a29c 100644 --- a/internal/backend/image.go +++ b/internal/backend/image.go @@ -7,10 +7,10 @@ import ( "context" "io" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" - dockerconfig "github.com/containerd/containerd/remotes/docker/config" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" + dockerconfig "github.com/containerd/containerd/v2/core/remotes/docker/config" "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" diff --git a/internal/service/container/attach.go b/internal/service/container/attach.go index 0b8e96cf..8ddaaae2 100644 --- a/internal/service/container/attach.go +++ b/internal/service/container/attach.go @@ -10,7 +10,7 @@ import ( "os" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/api/types/cri" "github.com/containerd/nerdctl/v2/pkg/labels" diff --git a/internal/service/container/attach_test.go b/internal/service/container/attach_test.go index ed727de9..ece32082 100644 --- a/internal/service/container/attach_test.go +++ b/internal/service/container/attach_test.go @@ -12,7 +12,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" "github.com/containerd/typeurl/v2" diff --git a/internal/service/container/container.go b/internal/service/container/container.go index 13e335b8..6ef551a3 100644 --- a/internal/service/container/container.go +++ b/internal/service/container/container.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/spf13/afero" "github.com/runfinch/finch-daemon/api/handlers/container" diff --git a/internal/service/container/container_test.go b/internal/service/container/container_test.go index 594741a2..7985c825 100644 --- a/internal/service/container/container_test.go +++ b/internal/service/container/container_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/create.go b/internal/service/container/create.go index 35381ae5..531f142f 100644 --- a/internal/service/container/create.go +++ b/internal/service/container/create.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/clientutil" diff --git a/internal/service/container/exec.go b/internal/service/container/exec.go index d42968ba..fc7531b3 100644 --- a/internal/service/container/exec.go +++ b/internal/service/container/exec.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/oci" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/pkg/oci" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/flagutil" "github.com/containerd/nerdctl/v2/pkg/idgen" diff --git a/internal/service/container/exec_test.go b/internal/service/container/exec_test.go index ff710f3b..d3e0dcb6 100644 --- a/internal/service/container/exec_test.go +++ b/internal/service/container/exec_test.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/oci" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/pkg/oci" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/get_archive.go b/internal/service/container/get_archive.go index 9d45f223..43ce2de2 100644 --- a/internal/service/container/get_archive.go +++ b/internal/service/container/get_archive.go @@ -10,7 +10,7 @@ import ( "os" "path" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" "github.com/spf13/afero" diff --git a/internal/service/container/get_archive_test.go b/internal/service/container/get_archive_test.go index 3e01d4f2..350dbd75 100644 --- a/internal/service/container/get_archive_test.go +++ b/internal/service/container/get_archive_test.go @@ -10,9 +10,9 @@ import ( "os" pathutil "path" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/mount" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/mount" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/inspect_test.go b/internal/service/container/inspect_test.go index f666896f..a2bc6a4a 100644 --- a/internal/service/container/inspect_test.go +++ b/internal/service/container/inspect_test.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/list_test.go b/internal/service/container/list_test.go index 4e499b6b..1ba3ccf4 100644 --- a/internal/service/container/list_test.go +++ b/internal/service/container/list_test.go @@ -8,7 +8,7 @@ import ( "errors" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" ncContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" diff --git a/internal/service/container/logs_test.go b/internal/service/container/logs_test.go index 5b7a97e8..782f9bb8 100644 --- a/internal/service/container/logs_test.go +++ b/internal/service/container/logs_test.go @@ -15,7 +15,7 @@ import ( "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/mocks/mocks_archive" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" "github.com/containerd/typeurl/v2" diff --git a/internal/service/container/put_archive.go b/internal/service/container/put_archive.go index 4772ac07..560f4f33 100644 --- a/internal/service/container/put_archive.go +++ b/internal/service/container/put_archive.go @@ -11,7 +11,7 @@ import ( "path" "path/filepath" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" diff --git a/internal/service/container/put_archive_test.go b/internal/service/container/put_archive_test.go index 4b26bdea..8d534666 100644 --- a/internal/service/container/put_archive_test.go +++ b/internal/service/container/put_archive_test.go @@ -12,9 +12,9 @@ import ( pathutil "path" "strings" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/mount" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/mount" cerrdefs "github.com/containerd/errdefs" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" diff --git a/internal/service/container/remove_test.go b/internal/service/container/remove_test.go index c4ce0c39..c5b415bd 100644 --- a/internal/service/container/remove_test.go +++ b/internal/service/container/remove_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" ncContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/rename_test.go b/internal/service/container/rename_test.go index c13aa1bc..c46c8b45 100644 --- a/internal/service/container/rename_test.go +++ b/internal/service/container/rename_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/container/restart_test.go b/internal/service/container/restart_test.go index e9281fd2..0bae4f45 100644 --- a/internal/service/container/restart_test.go +++ b/internal/service/container/restart_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/start.go b/internal/service/container/start.go index f341d14a..2ff9459d 100644 --- a/internal/service/container/start.go +++ b/internal/service/container/start.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/container/start_test.go b/internal/service/container/start_test.go index c04f7f7f..09e192e6 100644 --- a/internal/service/container/start_test.go +++ b/internal/service/container/start_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/stats.go b/internal/service/container/stats.go index c409eb12..5154ea90 100644 --- a/internal/service/container/stats.go +++ b/internal/service/container/stats.go @@ -10,7 +10,7 @@ import ( v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/containerd/typeurl/v2" diff --git a/internal/service/container/stats_test.go b/internal/service/container/stats_test.go index 4a64ef99..cd6a2e9f 100644 --- a/internal/service/container/stats_test.go +++ b/internal/service/container/stats_test.go @@ -10,9 +10,9 @@ import ( v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd" cTypes "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/events" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/events" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/containerd/nerdctl/v2/pkg/labels" diff --git a/internal/service/container/stop.go b/internal/service/container/stop.go index b7f9db8f..0800ed18 100644 --- a/internal/service/container/stop.go +++ b/internal/service/container/stop.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/container/stop_test.go b/internal/service/container/stop_test.go index 3c117644..34ccc434 100644 --- a/internal/service/container/stop_test.go +++ b/internal/service/container/stop_test.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/container/wait.go b/internal/service/container/wait.go index 5d9b5139..d468c734 100644 --- a/internal/service/container/wait.go +++ b/internal/service/container/wait.go @@ -6,7 +6,7 @@ package container import ( "context" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" ) func (s *service) Wait(ctx context.Context, cid string, condition string) (code int64, err error) { diff --git a/internal/service/exec/exec.go b/internal/service/exec/exec.go index 135ae1ba..1d449b68 100644 --- a/internal/service/exec/exec.go +++ b/internal/service/exec/exec.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cerrdefs "github.com/containerd/errdefs" "github.com/runfinch/finch-daemon/api/handlers/exec" diff --git a/internal/service/exec/exec_test.go b/internal/service/exec/exec_test.go index 94bd9566..1c1b71f7 100644 --- a/internal/service/exec/exec_test.go +++ b/internal/service/exec/exec_test.go @@ -8,8 +8,8 @@ import ( "errors" "testing" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/exec/inspect.go b/internal/service/exec/inspect.go index 52965f36..47695505 100644 --- a/internal/service/exec/inspect.go +++ b/internal/service/exec/inspect.go @@ -6,7 +6,7 @@ package exec import ( "context" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/exec/inspect_test.go b/internal/service/exec/inspect_test.go index aec5dfac..6a47c62c 100644 --- a/internal/service/exec/inspect_test.go +++ b/internal/service/exec/inspect_test.go @@ -8,8 +8,8 @@ import ( "errors" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/exec/resize_test.go b/internal/service/exec/resize_test.go index dbae8d82..9b3232ac 100644 --- a/internal/service/exec/resize_test.go +++ b/internal/service/exec/resize_test.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/exec/start.go b/internal/service/exec/start.go index 3256b169..926eb71d 100644 --- a/internal/service/exec/start.go +++ b/internal/service/exec/start.go @@ -11,8 +11,8 @@ import ( "sync" "syscall" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/signalutil" diff --git a/internal/service/exec/start_test.go b/internal/service/exec/start_test.go index 5bb0cd4b..4ed06633 100644 --- a/internal/service/exec/start_test.go +++ b/internal/service/exec/start_test.go @@ -10,7 +10,7 @@ import ( "io" "time" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/image/image.go b/internal/service/image/image.go index cb0fd00c..2648fbf5 100644 --- a/internal/service/image/image.go +++ b/internal/service/image/image.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/core/images" "github.com/runfinch/finch-daemon/api/handlers/image" "github.com/runfinch/finch-daemon/internal/backend" diff --git a/internal/service/image/image_test.go b/internal/service/image/image_test.go index de4a5873..fc1e9015 100644 --- a/internal/service/image/image_test.go +++ b/internal/service/image/image_test.go @@ -8,8 +8,8 @@ import ( "errors" "testing" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" "github.com/golang/mock/gomock" diff --git a/internal/service/image/inspect_test.go b/internal/service/image/inspect_test.go index c9d79898..d6ede072 100644 --- a/internal/service/image/inspect_test.go +++ b/internal/service/image/inspect_test.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/service/image/pull.go b/internal/service/image/pull.go index f0862c31..d338b99e 100644 --- a/internal/service/image/pull.go +++ b/internal/service/image/pull.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2/core/remotes/docker" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/pull_test.go b/internal/service/image/pull_test.go index 4ae33cbb..da943761 100644 --- a/internal/service/image/pull_test.go +++ b/internal/service/image/pull_test.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/push.go b/internal/service/image/push.go index 38220312..5ae73958 100644 --- a/internal/service/image/push.go +++ b/internal/service/image/push.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/containerd/containerd/images/converter" + "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/push_test.go b/internal/service/image/push_test.go index 9d25434a..6c643599 100644 --- a/internal/service/image/push_test.go +++ b/internal/service/image/push_test.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" + containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" "github.com/containerd/platforms" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/remove_test.go b/internal/service/image/remove_test.go index 2b81beb6..bec09be8 100644 --- a/internal/service/image/remove_test.go +++ b/internal/service/image/remove_test.go @@ -6,7 +6,7 @@ package image import ( "context" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/core/images" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/service/network/connect.go b/internal/service/network/connect.go index f5931c76..2e0eef32 100644 --- a/internal/service/network/connect.go +++ b/internal/service/network/connect.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" gocni "github.com/containerd/go-cni" "github.com/containerd/nerdctl/v2/pkg/labels" diff --git a/internal/service/network/network.go b/internal/service/network/network.go index 8b992cbc..d8bdddfe 100644 --- a/internal/service/network/network.go +++ b/internal/service/network/network.go @@ -10,7 +10,7 @@ import ( "regexp" "sync" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/handlers/network" diff --git a/internal/service/system/auth.go b/internal/service/system/auth.go index f3bb9fcb..99628485 100644 --- a/internal/service/system/auth.go +++ b/internal/service/system/auth.go @@ -11,9 +11,9 @@ import ( "net/http" "net/url" - "github.com/containerd/containerd/remotes/docker" - dockerconfig "github.com/containerd/containerd/remotes/docker/config" - remoteerrs "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/containerd/v2/core/remotes/docker" + dockerconfig "github.com/containerd/containerd/v2/core/remotes/docker/config" + remoteerrs "github.com/containerd/containerd/v2/core/remotes/errors" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" "golang.org/x/net/context/ctxhttp" diff --git a/internal/service/system/events.go b/internal/service/system/events.go index e6109364..c7899e72 100644 --- a/internal/service/system/events.go +++ b/internal/service/system/events.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" diff --git a/internal/service/system/events_test.go b/internal/service/system/events_test.go index caf989d6..aa62f1e3 100644 --- a/internal/service/system/events_test.go +++ b/internal/service/system/events_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/typeurl/v2" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" diff --git a/mocks/mocks_backend/containerdclient.go b/mocks/mocks_backend/containerdclient.go index 9d4301a2..e219aa92 100644 --- a/mocks/mocks_backend/containerdclient.go +++ b/mocks/mocks_backend/containerdclient.go @@ -8,13 +8,13 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd" - cio "github.com/containerd/containerd/cio" - events "github.com/containerd/containerd/events" - images "github.com/containerd/containerd/images" - converter "github.com/containerd/containerd/images/converter" - mount "github.com/containerd/containerd/mount" - oci "github.com/containerd/containerd/oci" + containerd "github.com/containerd/containerd/v2/client" + cio "github.com/containerd/containerd/v2/pkg/cio" + events "github.com/containerd/containerd/v2/core/events" + images "github.com/containerd/containerd/v2/core/images" + converter "github.com/containerd/containerd/v2/core/images/converter" + mount "github.com/containerd/containerd/v2/core/mount" + oci "github.com/containerd/containerd/v2/pkg/oci" platforms "github.com/containerd/platforms" gomock "github.com/golang/mock/gomock" digest "github.com/opencontainers/go-digest" diff --git a/mocks/mocks_backend/nerdctlcontainersvc.go b/mocks/mocks_backend/nerdctlcontainersvc.go index 6f5fc422..57be8005 100644 --- a/mocks/mocks_backend/nerdctlcontainersvc.go +++ b/mocks/mocks_backend/nerdctlcontainersvc.go @@ -11,7 +11,7 @@ import ( reflect "reflect" time "time" - containerd "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" types "github.com/containerd/nerdctl/v2/pkg/api/types" container "github.com/containerd/nerdctl/v2/pkg/cmd/container" containerutil "github.com/containerd/nerdctl/v2/pkg/containerutil" diff --git a/mocks/mocks_backend/nerdctlimagesvc.go b/mocks/mocks_backend/nerdctlimagesvc.go index 990c8055..eac920bb 100644 --- a/mocks/mocks_backend/nerdctlimagesvc.go +++ b/mocks/mocks_backend/nerdctlimagesvc.go @@ -9,9 +9,9 @@ import ( io "io" reflect "reflect" - images "github.com/containerd/containerd/images" - remotes "github.com/containerd/containerd/remotes" - docker "github.com/containerd/containerd/remotes/docker" + images "github.com/containerd/containerd/v2/core/images" + remotes "github.com/containerd/containerd/v2/core/remotes" + docker "github.com/containerd/containerd/v2/core/remotes/docker" imgutil "github.com/containerd/nerdctl/v2/pkg/imgutil" dockerconfigresolver "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" diff --git a/mocks/mocks_cio/io.go b/mocks/mocks_cio/io.go index 1c5b7f9e..44f2da73 100644 --- a/mocks/mocks_cio/io.go +++ b/mocks/mocks_cio/io.go @@ -7,7 +7,7 @@ package mocks_cio import ( reflect "reflect" - cio "github.com/containerd/containerd/cio" + cio "github.com/containerd/containerd/v2/pkg/cio" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_container/container.go b/mocks/mocks_container/container.go index 4ea14543..f5b860b2 100644 --- a/mocks/mocks_container/container.go +++ b/mocks/mocks_container/container.go @@ -8,9 +8,9 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd" - cio "github.com/containerd/containerd/cio" - containers "github.com/containerd/containerd/containers" + containerd "github.com/containerd/containerd/v2/client" + cio "github.com/containerd/containerd/v2/pkg/cio" + containers "github.com/containerd/containerd/v2/core/containers" typeurl "github.com/containerd/typeurl/v2" gomock "github.com/golang/mock/gomock" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/mocks/mocks_container/network_manager.go b/mocks/mocks_container/network_manager.go index 95f97794..67b43ad0 100644 --- a/mocks/mocks_container/network_manager.go +++ b/mocks/mocks_container/network_manager.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd" - oci "github.com/containerd/containerd/oci" + containerd "github.com/containerd/containerd/v2/client" + oci "github.com/containerd/containerd/v2/pkg/oci" types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_container/process.go b/mocks/mocks_container/process.go index 099bc104..436fdac3 100644 --- a/mocks/mocks_container/process.go +++ b/mocks/mocks_container/process.go @@ -9,8 +9,8 @@ import ( reflect "reflect" syscall "syscall" - containerd "github.com/containerd/containerd" - cio "github.com/containerd/containerd/cio" + containerd "github.com/containerd/containerd/v2/client" + cio "github.com/containerd/containerd/v2/pkg/cio" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mocks_container/task.go b/mocks/mocks_container/task.go index 7f8e67ff..aa609769 100644 --- a/mocks/mocks_container/task.go +++ b/mocks/mocks_container/task.go @@ -9,9 +9,9 @@ import ( reflect "reflect" syscall "syscall" - containerd "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" types "github.com/containerd/containerd/api/types" - cio "github.com/containerd/containerd/cio" + cio "github.com/containerd/containerd/v2/pkg/cio" gomock "github.com/golang/mock/gomock" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/mocks/mocks_image/store.go b/mocks/mocks_image/store.go index 7895c3f4..34e1745c 100644 --- a/mocks/mocks_image/store.go +++ b/mocks/mocks_image/store.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - images "github.com/containerd/containerd/images" + images "github.com/containerd/containerd/v2/core/images" gomock "github.com/golang/mock/gomock" ) From 18256d0d07de3f07e956a9ac862033d3c5877692 Mon Sep 17 00:00:00 2001 From: David Son Date: Wed, 13 Nov 2024 00:18:14 +0000 Subject: [PATCH 3/4] refactor: code changes for nerdctl + containerd 2.0 Signed-off-by: David Son --- Makefile | 10 ++--- api/handlers/distribution/distribution.go | 4 +- .../distribution/distribution_test.go | 2 +- api/handlers/volume/remove.go | 2 + e2e/tests/network_create.go | 2 +- e2e/tests/network_list.go | 2 +- e2e/tests/volume_remove.go | 2 +- go.mod | 10 +---- go.sum | 37 +----------------- internal/backend/containerd.go | 8 ++-- internal/backend/image.go | 30 ++++++++++----- internal/backend/nerdctl.go | 1 + internal/backend/network.go | 22 +++++++++-- internal/service/container/exec.go | 2 +- internal/service/container/exec_test.go | 2 +- internal/service/container/list.go | 2 +- internal/service/container/list_test.go | 4 +- internal/service/distribution/distribution.go | 4 +- internal/service/image/pull.go | 2 + internal/service/image/tag.go | 2 +- internal/service/network/create.go | 6 +-- internal/service/network/create_test.go | 21 +++++----- internal/service/network/driver/bridge.go | 19 +++++++--- .../service/network/driver/bridge_test.go | 6 +-- internal/service/network/driver/driver.go | 3 +- internal/service/system/auth.go | 13 ++++--- internal/service/volume/remove.go | 2 + mocks/mocks_backend/containerdclient.go | 28 +++++++------- mocks/mocks_backend/nerdctlcontainersvc.go | 16 ++++---- mocks/mocks_backend/nerdctlimagesvc.go | 14 +++++++ mocks/mocks_backend/nerdctlnetworksvc.go | 23 +++++++++-- mocks/mocks_cio/io.go | 2 +- mocks/mocks_container/container.go | 28 +++++++------- mocks/mocks_container/network_manager.go | 10 ++--- mocks/mocks_container/process.go | 20 +++++----- mocks/mocks_container/task.go | 38 +++++++++---------- mocks/mocks_image/store.go | 2 +- mocks/mocks_network/driver.go | 9 +++-- mocks/mocks_remotes/resolver.go | 4 +- pkg/utility/authutility/utility.go | 6 ++- setup-test-env.sh | 2 +- 41 files changed, 230 insertions(+), 192 deletions(-) diff --git a/Makefile b/Makefile index 8cdc9701..7a1dbf22 100644 --- a/Makefile +++ b/Makefile @@ -80,12 +80,12 @@ endif GOBIN=$(BIN) go install github.com/golang/mock/mockgen GOBIN=$(BIN) go install golang.org/x/tools/cmd/stringer PATH=$(BIN):$(PATH) go generate ./... - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/container.go -package=mocks_container github.com/containerd/containerd Container - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/process.go -package=mocks_container github.com/containerd/containerd Process - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/task.go -package=mocks_container github.com/containerd/containerd Task - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_image/store.go -package=mocks_image github.com/containerd/containerd/images Store + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/container.go -package=mocks_container github.com/containerd/containerd/v2/client Container + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/process.go -package=mocks_container github.com/containerd/containerd/v2/client Process + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/task.go -package=mocks_container github.com/containerd/containerd/v2/client Task + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_image/store.go -package=mocks_image github.com/containerd/containerd/v2/core/images Store PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_container/network_manager.go -package=mocks_container github.com/containerd/nerdctl/v2/pkg/containerutil NetworkOptionsManager - PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_cio/io.go -package=mocks_cio github.com/containerd/containerd/cio IO + PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_cio/io.go -package=mocks_cio github.com/containerd/containerd/v2/pkg/cio IO PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/response_writer.go -package=mocks_http net/http ResponseWriter PATH=$(BIN):$(PATH) mockgen --destination=./mocks/mocks_http/conn.go -package=mocks_http net Conn diff --git a/api/handlers/distribution/distribution.go b/api/handlers/distribution/distribution.go index 4296b0d0..5fe641cf 100644 --- a/api/handlers/distribution/distribution.go +++ b/api/handlers/distribution/distribution.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/nerdctl/pkg/config" + "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" diff --git a/api/handlers/distribution/distribution_test.go b/api/handlers/distribution/distribution_test.go index 527cc8e3..91f6b7d6 100644 --- a/api/handlers/distribution/distribution_test.go +++ b/api/handlers/distribution/distribution_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/nerdctl/pkg/config" + "github.com/containerd/nerdctl/v2/pkg/config" registrytypes "github.com/docker/docker/api/types/registry" "github.com/golang/mock/gomock" "github.com/gorilla/mux" diff --git a/api/handlers/volume/remove.go b/api/handlers/volume/remove.go index 57385a7c..55afaa92 100644 --- a/api/handlers/volume/remove.go +++ b/api/handlers/volume/remove.go @@ -29,6 +29,8 @@ func (h *handler) remove(w http.ResponseWriter, r *http.Request) { code = http.StatusNotFound case errdefs.IsConflict(err): code = http.StatusConflict + case errdefs.IsInvalidFormat(err): + code = http.StatusBadRequest default: code = http.StatusInternalServerError } diff --git a/e2e/tests/network_create.go b/e2e/tests/network_create.go index ce173051..8fe508cb 100644 --- a/e2e/tests/network_create.go +++ b/e2e/tests/network_create.go @@ -289,7 +289,7 @@ func withUnsupportedNetworkOptions() []types.NetworkCreateOption { Driver: "default", Config: []map[string]string{ { - "Subnet": "240.10.0.0/24", + "Subnet": "240.10.4.0/24", }, }, }), diff --git a/e2e/tests/network_list.go b/e2e/tests/network_list.go index 239cdebd..d918a062 100644 --- a/e2e/tests/network_list.go +++ b/e2e/tests/network_list.go @@ -61,7 +61,7 @@ func NetworkList(opt *option.Option) { Expect(err).Should(BeNil()) err = json.Unmarshal(body, ls) Expect(err).Should(BeNil()) - Expect((*ls)[1].Name).Should(Equal(expName)) + Expect((*ls)[0].Name).Should(Equal(expName)) }) }) } diff --git a/e2e/tests/volume_remove.go b/e2e/tests/volume_remove.go index c8f42eb0..9a7d8f89 100644 --- a/e2e/tests/volume_remove.go +++ b/e2e/tests/volume_remove.go @@ -60,7 +60,7 @@ func VolumeRemove(opt *option.Option) { Expect(err).Should(BeNil()) res, err := uClient.Do(req) Expect(err).Should(BeNil()) - Expect(res.StatusCode).Should(Equal(http.StatusConflict)) + Expect(res.StatusCode).Should(Equal(http.StatusBadRequest)) volumeShouldExist(opt, testVolumeName) }) }) diff --git a/go.mod b/go.mod index 4dee6b05..2813d788 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,7 @@ require ( github.com/containerd/containerd/v2 v2.0.0 github.com/containerd/errdefs v1.0.0 github.com/containerd/fifo v1.1.0 - github.com/containerd/go-cni v1.1.11 - github.com/containerd/nerdctl v1.7.7 + github.com/containerd/go-cni v1.1.10 github.com/containerd/nerdctl/v2 v2.0.0 github.com/containerd/platforms v1.0.0-rc.0 github.com/containerd/typeurl/v2 v2.2.3 @@ -54,7 +53,6 @@ require ( github.com/Masterminds/semver/v3 v3.3.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/hcsshim v0.12.9 // indirect - github.com/awslabs/soci-snapshotter v0.5.0 // indirect github.com/cilium/ebpf v0.16.0 // indirect github.com/containerd/accelerated-container-image v1.2.3 // indirect github.com/containerd/console v1.0.4 // indirect @@ -75,7 +73,6 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/djherbis/times v1.6.0 // indirect github.com/docker/docker-credential-helpers v0.8.2 // indirect - github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect github.com/fahedouch/go-logrotate v0.2.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fluent/fluent-logger-golang v1.9.0 // indirect @@ -92,7 +89,6 @@ require ( github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect - github.com/google/uuid v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/klauspost/compress v1.17.11 // indirect @@ -100,7 +96,6 @@ require ( github.com/miekg/pkcs11 v1.1.1 // indirect github.com/minio/sha256-simd v1.0.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -123,12 +118,10 @@ require ( github.com/multiformats/go-varint v0.0.7 // indirect github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect github.com/opencontainers/selinux v1.11.1 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rootless-containers/bypass4netns v0.4.1 // indirect - github.com/rootless-containers/rootlesskit v1.1.1 // indirect github.com/rootless-containers/rootlesskit/v2 v2.3.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -151,7 +144,6 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.28.0 // indirect - google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/grpc v1.67.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 52054ded..e16ccbd3 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg= github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y= -github.com/awslabs/soci-snapshotter v0.5.0 h1:Ah8L6AWIqknz8wIVl7saHRpMeJSOWWC6pwZQ9qCG7Tw= -github.com/awslabs/soci-snapshotter v0.5.0/go.mod h1:x3yL5YDlNdBfSZnGTccnV5eVITaHaQLkg9QVnql1HQQ= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -25,7 +23,6 @@ github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok= github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/compose-spec/compose-go v1.20.2 h1:u/yfZHn4EaHGdidrZycWpxXgFffjYULlTbRfJ51ykjQ= github.com/compose-spec/compose-go/v2 v2.4.3 h1:4+Nd9IqIGobbPles9ZuRS5uJfFfRgBo4Wdcv+8VNex8= github.com/compose-spec/compose-go/v2 v2.4.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc= github.com/containerd/accelerated-container-image v1.2.3 h1:tAIoP7Z7b2xGhb7QCM5Fa+2xqWfPqRmyi5lodbsGGRA= @@ -48,18 +45,14 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/go-cni v1.1.11 h1:fWt1K15AmSLsEfa57N+qYw4NeGPiQKYq1pjNGJwV9mc= -github.com/containerd/go-cni v1.1.11/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= +github.com/containerd/go-cni v1.1.10 h1:c2U73nld7spSWfiJwSh/8W9DK+/qQwYM2rngIhCyhyg= +github.com/containerd/go-cni v1.1.10/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA= github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U= -github.com/containerd/imgcrypt v1.1.9 h1:AnXt0sMq1Z2uIdaLt/fIHcMgtfVlFx6XpuaZzoC2XV0= -github.com/containerd/imgcrypt v1.1.9/go.mod h1:zEN6Nz5d5XIKgq06Tzk82YRlPZULKGSJ8fxhXhMwrYY= github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 h1:7OMu5otk5Z2GeQs24JBPOmYbTc50+q6jo02qWNJc0p8= github.com/containerd/imgcrypt/v2 v2.0.0-rc.1/go.mod h1:3/Ab3iliBt/aBVNYOwecT1YagCqAiHidOmVsrjtHF1A= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= -github.com/containerd/nerdctl v1.7.7 h1:NmtSMmpF4qbS4aVj1/wyj2HTD3synzGFLXc4RC74Hwg= -github.com/containerd/nerdctl v1.7.7/go.mod h1:tOE0YIYIwr/IyY3buGUmoinQ65nCPXNpnQZWafLAfrM= github.com/containerd/nerdctl/v2 v2.0.0 h1:6b8cqP+Fkv4p9cDKf/hJUJox6m86ix7pzIr45GiJPeg= github.com/containerd/nerdctl/v2 v2.0.0/go.mod h1:ofedoI6YydZSii3Yisz6HWhIzB9tVTywOlRWrWP8E3g= github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5 h1:NpscnGdkmWwlb0o2Q+rDO/kfoLObfY2sHwB6M5uF58Q= @@ -76,8 +69,6 @@ github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89 github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:L/J/O36DzcGxq3drHM45sJRr/pEQTG5u+tbffVhP6r8= github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4= github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= -github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 h1:rQvjv7gRi6Ki/NS/U9oLZFhqyk4dh/GH2M3o/4BRkMM= -github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67/go.mod h1:HDkcKOXRnX6yKnXv3P0QrogFi0DoiauK/LpQi961f0A= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM= @@ -111,8 +102,6 @@ github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZ github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -182,8 +171,6 @@ github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/Z github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -191,12 +178,8 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= @@ -227,8 +210,6 @@ github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dz github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= @@ -289,8 +270,6 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go. github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8= github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= @@ -307,8 +286,6 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rootless-containers/bypass4netns v0.4.1 h1:zyYM1uSG7/prAphD2vlJvx/MEKK91EjD2XaefGx5PKA= github.com/rootless-containers/bypass4netns v0.4.1/go.mod h1:slu3ygwy1x6ey78oBTNs7lpymyEimLBYoXOG76b+Q+Y= -github.com/rootless-containers/rootlesskit v1.1.1 h1:F5psKWoWY9/VjZ3ifVcaosjvFZJOagX85U22M0/EQZE= -github.com/rootless-containers/rootlesskit v1.1.1/go.mod h1:UD5GoA3dqKCJrnvnhVgQQnweMF2qZnf9KLw8EewcMZI= github.com/rootless-containers/rootlesskit/v2 v2.3.1 h1:wdYtdKxWFvVLby9ThMP6O6/v2q/GmOXbkRi+4m9nPW0= github.com/rootless-containers/rootlesskit/v2 v2.3.1/go.mod h1:tdtfS9ak4bGmwJRmcjsAzcHN5rJ3c5dB7yhSV10KTbk= github.com/runfinch/common-tests v0.9.1 h1:O5+M+ThFPYprXhqs0UR54lbph0mTgcVhIX533k79Xbg= @@ -342,12 +319,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= -github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= -github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -470,8 +441,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -507,8 +476,6 @@ gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/cri-api v0.31.2 h1:O/weUnSHvM59nTio0unxIUFyRHMRKkYn96YDILSQKmo= -k8s.io/cri-api v0.31.2/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/internal/backend/containerd.go b/internal/backend/containerd.go index 3bea946b..ef08c6fd 100644 --- a/internal/backend/containerd.go +++ b/internal/backend/containerd.go @@ -10,14 +10,14 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/pkg/cap" "github.com/containerd/containerd/v2/core/remotes/docker" + "github.com/containerd/containerd/v2/pkg/cap" + "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/containerutil" "github.com/containerd/nerdctl/v2/pkg/labels" @@ -118,7 +118,7 @@ func (w *ContainerdClientWrapper) GetImage(ctx context.Context, ref string) (con // SearchImage returns a list of images that match the search prefix. func (w *ContainerdClientWrapper) SearchImage(ctx context.Context, searchText string) ([]images.Image, error) { var filters []string - if canonicalRef, err := referenceutil.ParseAny(searchText); err == nil { + if canonicalRef, err := referenceutil.Parse(searchText); err == nil { filters = append(filters, fmt.Sprintf("name==%s", canonicalRef.String())) } filters = append(filters, diff --git a/internal/backend/image.go b/internal/backend/image.go index 1ac8a29c..43eafe60 100644 --- a/internal/backend/image.go +++ b/internal/backend/image.go @@ -12,11 +12,12 @@ import ( "github.com/containerd/containerd/v2/core/remotes/docker" dockerconfig "github.com/containerd/containerd/v2/core/remotes/docker/config" "github.com/containerd/nerdctl/v2/pkg/api/types" - "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/containerdutil" "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" "github.com/containerd/nerdctl/v2/pkg/imageinspector" "github.com/containerd/nerdctl/v2/pkg/imgutil" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/load" "github.com/containerd/nerdctl/v2/pkg/imgutil/push" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/containerd/platforms" @@ -32,10 +33,12 @@ type NerdctlImageSvc interface { SearchImage(ctx context.Context, name string) (int, int, []*images.Image, error) LoadImage(ctx context.Context, img string, stdout io.Writer, quiet bool) error GetDataStore() (string, error) + Namespace() string } func (w *NerdctlWrapper) InspectImage(ctx context.Context, image images.Image) (*dockercompat.Image, error) { - n, err := imageinspector.Inspect(ctx, w.clientWrapper.client, image, w.globalOptions.Snapshotter) + snapshotter := containerdutil.SnapshotService(w.clientWrapper.client, w.globalOptions.Snapshotter) + n, err := imageinspector.Inspect(ctx, w.clientWrapper.client, image, snapshotter) if err != nil { return nil, err } @@ -65,17 +68,22 @@ func (w *NerdctlWrapper) GetDockerResolver(ctx context.Context, refDomain string // PullImage pulls an image from nerdctl's imgutil library. func (w *NerdctlWrapper) PullImage(ctx context.Context, stdout, stderr io.Writer, resolver remotes.Resolver, ref string, platforms []ocispec.Platform) (*imgutil.EnsuredImage, error) { + opts := types.ImagePullOptions{ + Stdout: stdout, + Stderr: stderr, + GOptions: *w.globalOptions, + Unpack: nil, + OCISpecPlatform: platforms, + Mode: "always", + Quiet: false, + } + return imgutil.PullImage( ctx, w.clientWrapper.client, - stdout, stderr, - w.globalOptions.Snapshotter, resolver, ref, - platforms, - nil, - false, - imgutil.RemoteSnapshotterFlags{}, + opts, ) } @@ -109,14 +117,16 @@ func (w *NerdctlWrapper) SearchImage(ctx context.Context, name string) (int, int return n, uniqueCount, imgs, err } -func (w *NerdctlWrapper) LoadImage(ctx context.Context, img string, stdout io.Writer, _ /*quiet*/ bool) error { +func (w *NerdctlWrapper) LoadImage(ctx context.Context, img string, stdout io.Writer, q bool) error { // TODO currently the "quiet" flag in nerdctl is hardcoded as "false". // Ideally this flag should be part of the ImageLoadOptions, we can // contribute this enhancement at upstream - return image.Load(ctx, w.clientWrapper.client, types.ImageLoadOptions{ + _, err := load.FromArchive(ctx, w.clientWrapper.client, types.ImageLoadOptions{ Stdout: stdout, GOptions: *w.globalOptions, Input: img, AllPlatforms: true, + Quiet: q, }) + return err } diff --git a/internal/backend/nerdctl.go b/internal/backend/nerdctl.go index 5aff1e32..fe63bdf5 100644 --- a/internal/backend/nerdctl.go +++ b/internal/backend/nerdctl.go @@ -28,6 +28,7 @@ func NewNerdctlWrapper(clientWrapper *ContainerdClientWrapper, options *types.Gl netClient: &netutil.CNIEnv{ Path: options.CNIPath, NetconfPath: options.CNINetConfPath, + Namespace: options.Namespace, }, CNI: libcni.NewCNIConfig( []string{ diff --git a/internal/backend/network.go b/internal/backend/network.go index f579bd0d..86ffaafa 100644 --- a/internal/backend/network.go +++ b/internal/backend/network.go @@ -7,6 +7,7 @@ import ( "context" "encoding/json" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/containerd/nerdctl/v2/pkg/netutil" @@ -18,22 +19,33 @@ import ( type NerdctlNetworkSvc interface { FilterNetworks(filterf func(networkConfig *netutil.NetworkConfig) bool) ([]*netutil.NetworkConfig, error) AddNetworkList(ctx context.Context, netconflist *libcni.NetworkConfigList, conf *libcni.RuntimeConf) (cnitypes.Result, error) - CreateNetwork(opts netutil.CreateOptions) (*netutil.NetworkConfig, error) + CreateNetwork(opts types.NetworkCreateOptions) (*netutil.NetworkConfig, error) RemoveNetwork(networkConfig *netutil.NetworkConfig) error InspectNetwork(ctx context.Context, networkConfig *netutil.NetworkConfig) (*dockercompat.Network, error) UsedNetworkInfo(ctx context.Context) (map[string][]string, error) NetconfPath() string + Namespace() string } func (w *NerdctlWrapper) FilterNetworks(filterf func(networkConfig *netutil.NetworkConfig) bool) ([]*netutil.NetworkConfig, error) { - return w.netClient.FilterNetworks(filterf) + networkConfigs, err := w.netClient.NetworkList() + if err != nil { + return nil, err + } + result := []*netutil.NetworkConfig{} + for _, networkConfig := range networkConfigs { + if filterf(networkConfig) { + result = append(result, networkConfig) + } + } + return result, nil } func (w *NerdctlWrapper) AddNetworkList(ctx context.Context, netconflist *libcni.NetworkConfigList, conf *libcni.RuntimeConf) (cnitypes.Result, error) { return w.CNI.AddNetworkList(ctx, netconflist, conf) } -func (w *NerdctlWrapper) CreateNetwork(opts netutil.CreateOptions) (*netutil.NetworkConfig, error) { +func (w *NerdctlWrapper) CreateNetwork(opts types.NetworkCreateOptions) (*netutil.NetworkConfig, error) { return w.netClient.CreateNetwork(opts) } @@ -58,3 +70,7 @@ func (w *NerdctlWrapper) UsedNetworkInfo(ctx context.Context) (map[string][]stri func (w *NerdctlWrapper) NetconfPath() string { return w.netClient.NetconfPath } + +func (w *NerdctlWrapper) Namespace() string { + return w.netClient.Namespace +} diff --git a/internal/service/container/exec.go b/internal/service/container/exec.go index fc7531b3..7918e65b 100644 --- a/internal/service/container/exec.go +++ b/internal/service/container/exec.go @@ -8,9 +8,9 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/oci" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/flagutil" diff --git a/internal/service/container/exec_test.go b/internal/service/container/exec_test.go index d3e0dcb6..b7af57ee 100644 --- a/internal/service/container/exec_test.go +++ b/internal/service/container/exec_test.go @@ -9,9 +9,9 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/oci" cerrdefs "github.com/containerd/errdefs" "github.com/golang/mock/gomock" diff --git a/internal/service/container/list.go b/internal/service/container/list.go index 00e4f4c7..6f67cc9f 100644 --- a/internal/service/container/list.go +++ b/internal/service/container/list.go @@ -37,7 +37,7 @@ func (s *service) List(ctx context.Context, listOpts ncTypes.ContainerListOption Image: ncc.Image, CreatedAt: ncc.CreatedAt.Unix(), State: ci.State.Status, - Labels: ncc.Labels, + Labels: ncc.LabelsMap, NetworkSettings: ci.NetworkSettings, Mounts: ci.Mounts, } diff --git a/internal/service/container/list_test.go b/internal/service/container/list_test.go index 1ba3ccf4..ed634325 100644 --- a/internal/service/container/list_test.go +++ b/internal/service/container/list_test.go @@ -49,8 +49,8 @@ var _ = Describe("Container List API ", func() { listOpts = ncTypes.ContainerListOptions{} created = time.Now() containers = []ncContainer.ListItem{ - {ID: "id1", Names: "name1", Image: "img1", CreatedAt: created, Labels: nil}, - {ID: "id2", Names: "name2", Image: "img2", CreatedAt: created, Labels: nil}, + {ID: "id1", Names: "name1", Image: "img1", CreatedAt: created, LabelsMap: nil}, + {ID: "id2", Names: "name2", Image: "img2", CreatedAt: created, LabelsMap: nil}, } tarExtractor = mocks_archive.NewMockTarExtractor(mockCtrl) con = mocks_container.NewMockContainer(mockCtrl) diff --git a/internal/service/distribution/distribution.go b/internal/service/distribution/distribution.go index 9243afcc..ad863a68 100644 --- a/internal/service/distribution/distribution.go +++ b/internal/service/distribution/distribution.go @@ -10,9 +10,9 @@ import ( "fmt" "io" - containerdimages "github.com/containerd/containerd/images" - dockerresolver "github.com/containerd/containerd/remotes/docker" cremoteerrors "github.com/containerd/containerd/remotes/errors" + containerdimages "github.com/containerd/containerd/v2/core/images" + dockerresolver "github.com/containerd/containerd/v2/core/remotes/docker" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/pull.go b/internal/service/image/pull.go index d338b99e..a51fdff4 100644 --- a/internal/service/image/pull.go +++ b/internal/service/image/pull.go @@ -20,6 +20,8 @@ import ( "github.com/runfinch/finch-daemon/pkg/errdefs" ) +const IndexServer = "https://index.docker.io/v1/" + func (s *service) Pull(ctx context.Context, name, tag, platformStr string, ac *dockertypes.AuthConfig, outStream io.Writer) error { // get host platform's default spec if unspecified var platform ocispec.Platform diff --git a/internal/service/image/tag.go b/internal/service/image/tag.go index 06cd4984..ddc4986f 100644 --- a/internal/service/image/tag.go +++ b/internal/service/image/tag.go @@ -28,7 +28,7 @@ func (s *service) Tag(ctx context.Context, srcImg string, repo, tag string) erro return err } rawRef := fmt.Sprintf("%s:%s", repo, tag) - target, err := referenceutil.ParseDockerRef(rawRef) + target, err := referenceutil.Parse(rawRef) if err != nil { return fmt.Errorf("target parse error: %w", err) } diff --git a/internal/service/network/create.go b/internal/service/network/create.go index 05706612..c8a25eb3 100644 --- a/internal/service/network/create.go +++ b/internal/service/network/create.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/v2/pkg/netutil" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/api/types" "github.com/runfinch/finch-daemon/internal/service/network/driver" @@ -21,14 +21,14 @@ func (s *service) Create(ctx context.Context, request types.NetworkCreateRequest var bridgeDriver driver.DriverHandler var err error - createOptionsFrom := func(request types.NetworkCreateRequest) (netutil.CreateOptions, error) { + createOptionsFrom := func(request types.NetworkCreateRequest) (ncTypes.NetworkCreateOptions, error) { // Default to "bridge" driver if request does not specify a driver networkDriver := request.Driver if networkDriver == "" { networkDriver = "bridge" } - options := netutil.CreateOptions{ + options := ncTypes.NetworkCreateOptions{ Name: request.Name, Driver: networkDriver, IPAMDriver: "default", diff --git a/internal/service/network/create_test.go b/internal/service/network/create_test.go index 2514f898..2f80c1a9 100644 --- a/internal/service/network/create_test.go +++ b/internal/service/network/create_test.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" @@ -180,7 +181,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Driver).Should(Equal(defaultExpectedDriver)) Expect(actual.IPAMDriver).Should(Equal(defaultExpectedIPAMDriver)) return &netutil.NetworkConfig{NerdctlID: &nid}, nil @@ -202,7 +203,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Driver).Should(Equal(overrideExpectedDriver)) Expect(actual.IPAMDriver).Should(Equal(overrideExpectedIPAMDriver)) return &netutil.NetworkConfig{NerdctlID: &nid}, nil @@ -243,7 +244,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Subnets).Should(Equal(expectedSubnets)) Expect(actual.IPRange).Should(Equal(expectedIPRange)) Expect(actual.Gateway).Should(Equal(expectedGateway)) @@ -273,7 +274,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Subnets).Should(Equal(expectedSubnets)) Expect(actual.IPRange).Should(BeEmpty()) Expect(actual.Gateway).Should(BeEmpty()) @@ -302,7 +303,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Subnets).Should(BeEmpty()) Expect(actual.IPRange).Should(Equal(expectedIPRange)) Expect(actual.Gateway).Should(BeEmpty()) @@ -331,7 +332,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { Expect(actual.Subnets).Should(BeEmpty()) Expect(actual.IPRange).Should(BeEmpty()) Expect(actual.Gateway).Should(Equal(expectedGateway)) @@ -358,7 +359,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { // Check if the label exists checkLabel := driver.BridgeICCOption + "=true" labelExists := false @@ -388,7 +389,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { // Check if the label exists expectedLabel := driver.BridgeICCOption + "=true" labelExists := false @@ -423,7 +424,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { logger.EXPECT().Debugf(gomock.Any(), gomock.Any()) nid := networkID - ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual netutil.CreateOptions) (*netutil.NetworkConfig, error) { + ncNetClient.EXPECT().CreateNetwork(gomock.Any()).DoAndReturn(func(actual ncTypes.NetworkCreateOptions) (*netutil.NetworkConfig, error) { // Check if the label exists expectedLabel := driver.FinchICCLabelIPv4 + "=false" labelExists := false @@ -447,7 +448,7 @@ var _ = Describe("Network Service Create Network Implementation", func() { // Set up expectations for mockBridgeDriver mockBridgeDriver.EXPECT().HandleCreateOptions(gomock.Any(), gomock.Any()).DoAndReturn( - func(request types.NetworkCreateRequest, options netutil.CreateOptions) (netutil.CreateOptions, error) { + func(request types.NetworkCreateRequest, options ncTypes.NetworkCreateOptions) (ncTypes.NetworkCreateOptions, error) { // Mock the behavior for BridgeICCOption set to false // Remove the option from the options map diff --git a/internal/service/network/driver/bridge.go b/internal/service/network/driver/bridge.go index 32658b45..4e0141b2 100644 --- a/internal/service/network/driver/bridge.go +++ b/internal/service/network/driver/bridge.go @@ -10,6 +10,7 @@ import ( "path/filepath" "strconv" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/lockutil" "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" @@ -44,7 +45,7 @@ var NewBridgeDriver = func(netClient backend.NerdctlNetworkSvc, logger flog.Logg } // HandleCreateOptions processes finch specific options for the bridge driver. -func (bd *bridgeDriver) HandleCreateOptions(request types.NetworkCreateRequest, options netutil.CreateOptions) (netutil.CreateOptions, error) { +func (bd *bridgeDriver) HandleCreateOptions(request types.NetworkCreateRequest, options ncTypes.NetworkCreateOptions) (ncTypes.NetworkCreateOptions, error) { // enable_icc, host_binding_ipv4, and bridge name network options are not supported by nerdctl. // So we process these options here and filter them out from the network create request to nerdctl. processUnsupportedOptions := func(original map[string]string) map[string]string { @@ -132,7 +133,8 @@ func (bd *bridgeDriver) HandleRemove(net *netutil.NetworkConfig) error { // setBridgeName will override the bridge name in an existing CNI config file for a network. func (bd *bridgeDriver) setBridgeName(net *netutil.NetworkConfig, bridgeName string) error { - return lockutil.WithDirLock(bd.netClient.NetconfPath(), func() error { + networkDir := bd.getDirForNetworkName("") + return lockutil.WithDirLock(networkDir, func() error { // first, make sure that the bridge name is not used by any of the existing bridge networks bridgeNet, err := bd.getNetworkByBridgeName(bridgeName) if err != nil { @@ -177,7 +179,7 @@ func (bd *bridgeDriver) setBridgeName(net *netutil.NetworkConfig, bridgeName str func (bd *bridgeDriver) getBridgeName(net *netutil.NetworkConfig) (string, error) { var bridgeName string - err := lockutil.WithDirLock(bd.netClient.NetconfPath(), func() error { + err := lockutil.WithDirLock(bd.getDirForNetworkName(""), func() error { configFilename := bd.getConfigPathForNetworkName(net.Name) _, bridgePlugin, err := bd.parseBridgeConfig(configFilename) if err != nil { @@ -301,7 +303,14 @@ func (bd *bridgeDriver) removeICCDropRule(bridgeIface string) error { return nil } -// From https://github.com/containerd/nerdctl/blob/v1.5.0/pkg/netutil/netutil.go#L186-L188 +func (bd *bridgeDriver) getDirForNetworkName(netName string) string { + if netName == netutil.DefaultNetworkName || bd.netClient.Namespace() == "" { + return bd.netClient.NetconfPath() + } + return filepath.Join(bd.netClient.NetconfPath(), bd.netClient.Namespace()) +} + +// From https://github.com/containerd/nerdctl/blob/v2.0.0/pkg/netutil/netutil.go#L277C18-L283 func (bd *bridgeDriver) getConfigPathForNetworkName(netName string) string { - return filepath.Join(bd.netClient.NetconfPath(), "nerdctl-"+netName+".conflist") + return filepath.Join(bd.getDirForNetworkName(netName), "nerdctl-"+netName+".conflist") } diff --git a/internal/service/network/driver/bridge_test.go b/internal/service/network/driver/bridge_test.go index bc38af48..643c7cd5 100644 --- a/internal/service/network/driver/bridge_test.go +++ b/internal/service/network/driver/bridge_test.go @@ -6,7 +6,7 @@ package driver import ( "fmt" - "github.com/containerd/nerdctl/v2/pkg/netutil" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/coreos/go-iptables/iptables" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" @@ -22,7 +22,7 @@ var _ = Describe("bridgeDriver HandleCreateOptions", func() { logger *mocks_logger.Logger driver *bridgeDriver request types.NetworkCreateRequest - options netutil.CreateOptions + options ncTypes.NetworkCreateOptions ) BeforeEach(func() { @@ -32,7 +32,7 @@ var _ = Describe("bridgeDriver HandleCreateOptions", func() { request = types.NetworkCreateRequest{ Options: make(map[string]string), } - options = netutil.CreateOptions{ + options = ncTypes.NetworkCreateOptions{ Options: make(map[string]string), Labels: []string{}, } diff --git a/internal/service/network/driver/driver.go b/internal/service/network/driver/driver.go index 71fd41a9..41c80337 100644 --- a/internal/service/network/driver/driver.go +++ b/internal/service/network/driver/driver.go @@ -4,13 +4,14 @@ package driver import ( + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/runfinch/finch-daemon/api/types" ) //go:generate mockgen --destination=../../../../mocks/mocks_network/driver.go -package=mocks_network -mock_names DriverHandler=DriverHandler . DriverHandler type DriverHandler interface { - HandleCreateOptions(request types.NetworkCreateRequest, options netutil.CreateOptions) (netutil.CreateOptions, error) + HandleCreateOptions(request types.NetworkCreateRequest, options ncTypes.NetworkCreateOptions) (ncTypes.NetworkCreateOptions, error) HandlePostCreate(net *netutil.NetworkConfig) (string, error) HandleRemove(net *netutil.NetworkConfig) error } diff --git a/internal/service/system/auth.go b/internal/service/system/auth.go index 99628485..fe91e95f 100644 --- a/internal/service/system/auth.go +++ b/internal/service/system/auth.go @@ -21,20 +21,23 @@ import ( ) // To be consistent with nerdctl: https://github.com/containerd/nerdctl/blob/2b06050d782c27571c98947ac9fa790d5f2d0bde/cmd/nerdctl/login.go#L90 -const defaultRegHost = dockerconfigresolver.IndexServer +const defaultRegHost = "https://index.docker.io/v1/" func (s *service) Auth(ctx context.Context, username, password, serverAddr string) (string, error) { if serverAddr == "" { serverAddr = defaultRegHost } - host := dockerconfigresolver.ConvertToHostname(serverAddr) + host, err := dockerconfigresolver.Parse(serverAddr) + if err != nil { + return "", fmt.Errorf("failed to parse server address: %v", err) + } // TODO: Support server addr that starts with "http://" (probably useful when testing) // Currently TLS is enforced. // Check dockerconfigresolver.WithSkipVerifyCerts and dockerconfigresolver.WithPlainHTTP. - ho, err := dockerconfigresolver.NewHostOptions(ctx, host, dockerconfigresolver.WithAuthCreds( + ho, err := dockerconfigresolver.NewHostOptions(ctx, host.CanonicalIdentifier(), dockerconfigresolver.WithAuthCreds( func(acArg string) (string, string, error) { - if acArg == host { + if acArg == host.CanonicalIdentifier() { return username, password, nil } return "", "", fmt.Errorf("expected acArg to be %q, got %q", host, acArg) @@ -55,7 +58,7 @@ func (s *service) Auth(ctx context.Context, username, password, serverAddr strin fetchedRefreshTokens[req.URL.Host] = token }, )) - regHosts, err := dockerconfig.ConfigureHosts(ctx, *ho)(host) + regHosts, err := dockerconfig.ConfigureHosts(ctx, *ho)(host.CanonicalIdentifier()) if err != nil { return "", fmt.Errorf("failed to configure registry host: %w", err) } diff --git a/internal/service/volume/remove.go b/internal/service/volume/remove.go index dcc809ec..8f015d0b 100644 --- a/internal/service/volume/remove.go +++ b/internal/service/volume/remove.go @@ -26,6 +26,8 @@ func (s *service) Remove(ctx context.Context, volName string, force bool) error err = errdefs.NewNotFound(err) case strings.Contains(err.Error(), "in use"): err = errdefs.NewConflict(err) + case strings.Contains(err.Error(), "could not be removed"): + err = errdefs.NewInvalidFormat(err) } return err } diff --git a/mocks/mocks_backend/containerdclient.go b/mocks/mocks_backend/containerdclient.go index e219aa92..c23122a2 100644 --- a/mocks/mocks_backend/containerdclient.go +++ b/mocks/mocks_backend/containerdclient.go @@ -8,12 +8,12 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd/v2/client" - cio "github.com/containerd/containerd/v2/pkg/cio" + client "github.com/containerd/containerd/v2/client" events "github.com/containerd/containerd/v2/core/events" images "github.com/containerd/containerd/v2/core/images" converter "github.com/containerd/containerd/v2/core/images/converter" mount "github.com/containerd/containerd/v2/core/mount" + cio "github.com/containerd/containerd/v2/pkg/cio" oci "github.com/containerd/containerd/v2/pkg/oci" platforms "github.com/containerd/platforms" gomock "github.com/golang/mock/gomock" @@ -122,10 +122,10 @@ func (mr *MockContainerdClientMockRecorder) DeleteImage(arg0, arg1 interface{}) } // GetClient mocks base method. -func (m *MockContainerdClient) GetClient() *containerd.Client { +func (m *MockContainerdClient) GetClient() *client.Client { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetClient") - ret0, _ := ret[0].(*containerd.Client) + ret0, _ := ret[0].(*client.Client) return ret0 } @@ -136,7 +136,7 @@ func (mr *MockContainerdClientMockRecorder) GetClient() *gomock.Call { } // GetContainerRemoveEvent mocks base method. -func (m *MockContainerdClient) GetContainerRemoveEvent(arg0 context.Context, arg1 containerd.Container) (<-chan *events.Envelope, <-chan error) { +func (m *MockContainerdClient) GetContainerRemoveEvent(arg0 context.Context, arg1 client.Container) (<-chan *events.Envelope, <-chan error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetContainerRemoveEvent", arg0, arg1) ret0, _ := ret[0].(<-chan *events.Envelope) @@ -151,10 +151,10 @@ func (mr *MockContainerdClientMockRecorder) GetContainerRemoveEvent(arg0, arg1 i } // GetContainerStatus mocks base method. -func (m *MockContainerdClient) GetContainerStatus(arg0 context.Context, arg1 containerd.Container) containerd.ProcessStatus { +func (m *MockContainerdClient) GetContainerStatus(arg0 context.Context, arg1 client.Container) client.ProcessStatus { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetContainerStatus", arg0, arg1) - ret0, _ := ret[0].(containerd.ProcessStatus) + ret0, _ := ret[0].(client.ProcessStatus) return ret0 } @@ -165,11 +165,11 @@ func (mr *MockContainerdClientMockRecorder) GetContainerStatus(arg0, arg1 interf } // GetContainerTaskWait mocks base method. -func (m *MockContainerdClient) GetContainerTaskWait(arg0 context.Context, arg1 cio.Attach, arg2 containerd.Container) (containerd.Task, <-chan containerd.ExitStatus, error) { +func (m *MockContainerdClient) GetContainerTaskWait(arg0 context.Context, arg1 cio.Attach, arg2 client.Container) (client.Task, <-chan client.ExitStatus, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetContainerTaskWait", arg0, arg1, arg2) - ret0, _ := ret[0].(containerd.Task) - ret1, _ := ret[1].(<-chan containerd.ExitStatus) + ret0, _ := ret[0].(client.Task) + ret1, _ := ret[1].(<-chan client.ExitStatus) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -196,10 +196,10 @@ func (mr *MockContainerdClientMockRecorder) GetCurrentCapabilities() *gomock.Cal } // GetImage mocks base method. -func (m *MockContainerdClient) GetImage(arg0 context.Context, arg1 string) (containerd.Image, error) { +func (m *MockContainerdClient) GetImage(arg0 context.Context, arg1 string) (client.Image, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetImage", arg0, arg1) - ret0, _ := ret[0].(containerd.Image) + ret0, _ := ret[0].(client.Image) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -388,10 +388,10 @@ func (mr *MockContainerdClientMockRecorder) PublishEvent(arg0, arg1, arg2 interf } // SearchContainer mocks base method. -func (m *MockContainerdClient) SearchContainer(arg0 context.Context, arg1 string) ([]containerd.Container, error) { +func (m *MockContainerdClient) SearchContainer(arg0 context.Context, arg1 string) ([]client.Container, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchContainer", arg0, arg1) - ret0, _ := ret[0].([]containerd.Container) + ret0, _ := ret[0].([]client.Container) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/mocks/mocks_backend/nerdctlcontainersvc.go b/mocks/mocks_backend/nerdctlcontainersvc.go index 57be8005..26b9cb08 100644 --- a/mocks/mocks_backend/nerdctlcontainersvc.go +++ b/mocks/mocks_backend/nerdctlcontainersvc.go @@ -11,7 +11,7 @@ import ( reflect "reflect" time "time" - containerd "github.com/containerd/containerd/v2/client" + client "github.com/containerd/containerd/v2/client" types "github.com/containerd/nerdctl/v2/pkg/api/types" container "github.com/containerd/nerdctl/v2/pkg/cmd/container" containerutil "github.com/containerd/nerdctl/v2/pkg/containerutil" @@ -45,10 +45,10 @@ func (m *MockNerdctlContainerSvc) EXPECT() *MockNerdctlContainerSvcMockRecorder } // CreateContainer mocks base method. -func (m *MockNerdctlContainerSvc) CreateContainer(arg0 context.Context, arg1 []string, arg2 containerutil.NetworkOptionsManager, arg3 types.ContainerCreateOptions) (containerd.Container, func(), error) { +func (m *MockNerdctlContainerSvc) CreateContainer(arg0 context.Context, arg1 []string, arg2 containerutil.NetworkOptionsManager, arg3 types.ContainerCreateOptions) (client.Container, func(), error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateContainer", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(containerd.Container) + ret0, _ := ret[0].(client.Container) ret1, _ := ret[1].(func()) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -91,7 +91,7 @@ func (mr *MockNerdctlContainerSvcMockRecorder) GetNerdctlExe() *gomock.Call { } // InspectContainer mocks base method. -func (m *MockNerdctlContainerSvc) InspectContainer(arg0 context.Context, arg1 containerd.Container) (*dockercompat.Container, error) { +func (m *MockNerdctlContainerSvc) InspectContainer(arg0 context.Context, arg1 client.Container) (*dockercompat.Container, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InspectContainer", arg0, arg1) ret0, _ := ret[0].(*dockercompat.Container) @@ -194,7 +194,7 @@ func (mr *MockNerdctlContainerSvcMockRecorder) NewNetworkingOptionsManager(arg0 } // RemoveContainer mocks base method. -func (m *MockNerdctlContainerSvc) RemoveContainer(arg0 context.Context, arg1 containerd.Container, arg2, arg3 bool) error { +func (m *MockNerdctlContainerSvc) RemoveContainer(arg0 context.Context, arg1 client.Container, arg2, arg3 bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveContainer", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) @@ -208,7 +208,7 @@ func (mr *MockNerdctlContainerSvcMockRecorder) RemoveContainer(arg0, arg1, arg2, } // RenameContainer mocks base method. -func (m *MockNerdctlContainerSvc) RenameContainer(arg0 context.Context, arg1 containerd.Container, arg2 string, arg3 types.ContainerRenameOptions) error { +func (m *MockNerdctlContainerSvc) RenameContainer(arg0 context.Context, arg1 client.Container, arg2 string, arg3 types.ContainerRenameOptions) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RenameContainer", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) @@ -222,7 +222,7 @@ func (mr *MockNerdctlContainerSvcMockRecorder) RenameContainer(arg0, arg1, arg2, } // StartContainer mocks base method. -func (m *MockNerdctlContainerSvc) StartContainer(arg0 context.Context, arg1 containerd.Container) error { +func (m *MockNerdctlContainerSvc) StartContainer(arg0 context.Context, arg1 client.Container) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StartContainer", arg0, arg1) ret0, _ := ret[0].(error) @@ -236,7 +236,7 @@ func (mr *MockNerdctlContainerSvcMockRecorder) StartContainer(arg0, arg1 interfa } // StopContainer mocks base method. -func (m *MockNerdctlContainerSvc) StopContainer(arg0 context.Context, arg1 containerd.Container, arg2 *time.Duration) error { +func (m *MockNerdctlContainerSvc) StopContainer(arg0 context.Context, arg1 client.Container, arg2 *time.Duration) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StopContainer", arg0, arg1, arg2) ret0, _ := ret[0].(error) diff --git a/mocks/mocks_backend/nerdctlimagesvc.go b/mocks/mocks_backend/nerdctlimagesvc.go index eac920bb..f0e3a95c 100644 --- a/mocks/mocks_backend/nerdctlimagesvc.go +++ b/mocks/mocks_backend/nerdctlimagesvc.go @@ -103,6 +103,20 @@ func (mr *MockNerdctlImageSvcMockRecorder) LoadImage(arg0, arg1, arg2, arg3 inte return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadImage", reflect.TypeOf((*MockNerdctlImageSvc)(nil).LoadImage), arg0, arg1, arg2, arg3) } +// Namespace mocks base method. +func (m *MockNerdctlImageSvc) Namespace() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Namespace") + ret0, _ := ret[0].(string) + return ret0 +} + +// Namespace indicates an expected call of Namespace. +func (mr *MockNerdctlImageSvcMockRecorder) Namespace() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Namespace", reflect.TypeOf((*MockNerdctlImageSvc)(nil).Namespace)) +} + // PullImage mocks base method. func (m *MockNerdctlImageSvc) PullImage(arg0 context.Context, arg1, arg2 io.Writer, arg3 remotes.Resolver, arg4 string, arg5 []v1.Platform) (*imgutil.EnsuredImage, error) { m.ctrl.T.Helper() diff --git a/mocks/mocks_backend/nerdctlnetworksvc.go b/mocks/mocks_backend/nerdctlnetworksvc.go index 9d6b4a41..20e939b8 100644 --- a/mocks/mocks_backend/nerdctlnetworksvc.go +++ b/mocks/mocks_backend/nerdctlnetworksvc.go @@ -8,10 +8,11 @@ import ( context "context" reflect "reflect" + types "github.com/containerd/nerdctl/v2/pkg/api/types" dockercompat "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" netutil "github.com/containerd/nerdctl/v2/pkg/netutil" libcni "github.com/containernetworking/cni/libcni" - types "github.com/containernetworking/cni/pkg/types" + types0 "github.com/containernetworking/cni/pkg/types" gomock "github.com/golang/mock/gomock" ) @@ -39,10 +40,10 @@ func (m *MockNerdctlNetworkSvc) EXPECT() *MockNerdctlNetworkSvcMockRecorder { } // AddNetworkList mocks base method. -func (m *MockNerdctlNetworkSvc) AddNetworkList(arg0 context.Context, arg1 *libcni.NetworkConfigList, arg2 *libcni.RuntimeConf) (types.Result, error) { +func (m *MockNerdctlNetworkSvc) AddNetworkList(arg0 context.Context, arg1 *libcni.NetworkConfigList, arg2 *libcni.RuntimeConf) (types0.Result, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddNetworkList", arg0, arg1, arg2) - ret0, _ := ret[0].(types.Result) + ret0, _ := ret[0].(types0.Result) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -54,7 +55,7 @@ func (mr *MockNerdctlNetworkSvcMockRecorder) AddNetworkList(arg0, arg1, arg2 int } // CreateNetwork mocks base method. -func (m *MockNerdctlNetworkSvc) CreateNetwork(arg0 netutil.CreateOptions) (*netutil.NetworkConfig, error) { +func (m *MockNerdctlNetworkSvc) CreateNetwork(arg0 types.NetworkCreateOptions) (*netutil.NetworkConfig, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateNetwork", arg0) ret0, _ := ret[0].(*netutil.NetworkConfig) @@ -98,6 +99,20 @@ func (mr *MockNerdctlNetworkSvcMockRecorder) InspectNetwork(arg0, arg1 interface return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InspectNetwork", reflect.TypeOf((*MockNerdctlNetworkSvc)(nil).InspectNetwork), arg0, arg1) } +// Namespace mocks base method. +func (m *MockNerdctlNetworkSvc) Namespace() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Namespace") + ret0, _ := ret[0].(string) + return ret0 +} + +// Namespace indicates an expected call of Namespace. +func (mr *MockNerdctlNetworkSvcMockRecorder) Namespace() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Namespace", reflect.TypeOf((*MockNerdctlNetworkSvc)(nil).Namespace)) +} + // NetconfPath mocks base method. func (m *MockNerdctlNetworkSvc) NetconfPath() string { m.ctrl.T.Helper() diff --git a/mocks/mocks_cio/io.go b/mocks/mocks_cio/io.go index 44f2da73..1cd2424e 100644 --- a/mocks/mocks_cio/io.go +++ b/mocks/mocks_cio/io.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/containerd/cio (interfaces: IO) +// Source: github.com/containerd/containerd/v2/pkg/cio (interfaces: IO) // Package mocks_cio is a generated GoMock package. package mocks_cio diff --git a/mocks/mocks_container/container.go b/mocks/mocks_container/container.go index f5b860b2..62bbf05d 100644 --- a/mocks/mocks_container/container.go +++ b/mocks/mocks_container/container.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/containerd (interfaces: Container) +// Source: github.com/containerd/containerd/v2/client (interfaces: Container) // Package mocks_container is a generated GoMock package. package mocks_container @@ -8,9 +8,9 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd/v2/client" - cio "github.com/containerd/containerd/v2/pkg/cio" + client "github.com/containerd/containerd/v2/client" containers "github.com/containerd/containerd/v2/core/containers" + cio "github.com/containerd/containerd/v2/pkg/cio" typeurl "github.com/containerd/typeurl/v2" gomock "github.com/golang/mock/gomock" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -40,14 +40,14 @@ func (m *MockContainer) EXPECT() *MockContainerMockRecorder { } // Checkpoint mocks base method. -func (m *MockContainer) Checkpoint(arg0 context.Context, arg1 string, arg2 ...containerd.CheckpointOpts) (containerd.Image, error) { +func (m *MockContainer) Checkpoint(arg0 context.Context, arg1 string, arg2 ...client.CheckpointOpts) (client.Image, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Checkpoint", varargs...) - ret0, _ := ret[0].(containerd.Image) + ret0, _ := ret[0].(client.Image) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -60,7 +60,7 @@ func (mr *MockContainerMockRecorder) Checkpoint(arg0, arg1 interface{}, arg2 ... } // Delete mocks base method. -func (m *MockContainer) Delete(arg0 context.Context, arg1 ...containerd.DeleteOpts) error { +func (m *MockContainer) Delete(arg0 context.Context, arg1 ...client.DeleteOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { @@ -108,10 +108,10 @@ func (mr *MockContainerMockRecorder) ID() *gomock.Call { } // Image mocks base method. -func (m *MockContainer) Image(arg0 context.Context) (containerd.Image, error) { +func (m *MockContainer) Image(arg0 context.Context) (client.Image, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Image", arg0) - ret0, _ := ret[0].(containerd.Image) + ret0, _ := ret[0].(client.Image) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -123,7 +123,7 @@ func (mr *MockContainerMockRecorder) Image(arg0 interface{}) *gomock.Call { } // Info mocks base method. -func (m *MockContainer) Info(arg0 context.Context, arg1 ...containerd.InfoOpts) (containers.Container, error) { +func (m *MockContainer) Info(arg0 context.Context, arg1 ...client.InfoOpts) (containers.Container, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { @@ -158,14 +158,14 @@ func (mr *MockContainerMockRecorder) Labels(arg0 interface{}) *gomock.Call { } // NewTask mocks base method. -func (m *MockContainer) NewTask(arg0 context.Context, arg1 cio.Creator, arg2 ...containerd.NewTaskOpts) (containerd.Task, error) { +func (m *MockContainer) NewTask(arg0 context.Context, arg1 cio.Creator, arg2 ...client.NewTaskOpts) (client.Task, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "NewTask", varargs...) - ret0, _ := ret[0].(containerd.Task) + ret0, _ := ret[0].(client.Task) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -208,10 +208,10 @@ func (mr *MockContainerMockRecorder) Spec(arg0 interface{}) *gomock.Call { } // Task mocks base method. -func (m *MockContainer) Task(arg0 context.Context, arg1 cio.Attach) (containerd.Task, error) { +func (m *MockContainer) Task(arg0 context.Context, arg1 cio.Attach) (client.Task, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Task", arg0, arg1) - ret0, _ := ret[0].(containerd.Task) + ret0, _ := ret[0].(client.Task) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -223,7 +223,7 @@ func (mr *MockContainerMockRecorder) Task(arg0, arg1 interface{}) *gomock.Call { } // Update mocks base method. -func (m *MockContainer) Update(arg0 context.Context, arg1 ...containerd.UpdateContainerOpts) error { +func (m *MockContainer) Update(arg0 context.Context, arg1 ...client.UpdateContainerOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { diff --git a/mocks/mocks_container/network_manager.go b/mocks/mocks_container/network_manager.go index 67b43ad0..f69c17c6 100644 --- a/mocks/mocks_container/network_manager.go +++ b/mocks/mocks_container/network_manager.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/nerdctl/pkg/containerutil (interfaces: NetworkOptionsManager) +// Source: github.com/containerd/nerdctl/v2/pkg/containerutil (interfaces: NetworkOptionsManager) // Package mocks_container is a generated GoMock package. package mocks_container @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - containerd "github.com/containerd/containerd/v2/client" + client "github.com/containerd/containerd/v2/client" oci "github.com/containerd/containerd/v2/pkg/oci" types "github.com/containerd/nerdctl/v2/pkg/api/types" gomock "github.com/golang/mock/gomock" @@ -38,7 +38,7 @@ func (m *MockNetworkOptionsManager) EXPECT() *MockNetworkOptionsManagerMockRecor } // CleanupNetworking mocks base method. -func (m *MockNetworkOptionsManager) CleanupNetworking(arg0 context.Context, arg1 containerd.Container) error { +func (m *MockNetworkOptionsManager) CleanupNetworking(arg0 context.Context, arg1 client.Container) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CleanupNetworking", arg0, arg1) ret0, _ := ret[0].(error) @@ -52,11 +52,11 @@ func (mr *MockNetworkOptionsManagerMockRecorder) CleanupNetworking(arg0, arg1 in } // ContainerNetworkingOpts mocks base method. -func (m *MockNetworkOptionsManager) ContainerNetworkingOpts(arg0 context.Context, arg1 string) ([]oci.SpecOpts, []containerd.NewContainerOpts, error) { +func (m *MockNetworkOptionsManager) ContainerNetworkingOpts(arg0 context.Context, arg1 string) ([]oci.SpecOpts, []client.NewContainerOpts, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ContainerNetworkingOpts", arg0, arg1) ret0, _ := ret[0].([]oci.SpecOpts) - ret1, _ := ret[1].([]containerd.NewContainerOpts) + ret1, _ := ret[1].([]client.NewContainerOpts) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } diff --git a/mocks/mocks_container/process.go b/mocks/mocks_container/process.go index 436fdac3..f7aeb875 100644 --- a/mocks/mocks_container/process.go +++ b/mocks/mocks_container/process.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/containerd (interfaces: Process) +// Source: github.com/containerd/containerd/v2/client (interfaces: Process) // Package mocks_container is a generated GoMock package. package mocks_container @@ -9,7 +9,7 @@ import ( reflect "reflect" syscall "syscall" - containerd "github.com/containerd/containerd/v2/client" + client "github.com/containerd/containerd/v2/client" cio "github.com/containerd/containerd/v2/pkg/cio" gomock "github.com/golang/mock/gomock" ) @@ -38,7 +38,7 @@ func (m *MockProcess) EXPECT() *MockProcessMockRecorder { } // CloseIO mocks base method. -func (m *MockProcess) CloseIO(arg0 context.Context, arg1 ...containerd.IOCloserOpts) error { +func (m *MockProcess) CloseIO(arg0 context.Context, arg1 ...client.IOCloserOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { @@ -57,14 +57,14 @@ func (mr *MockProcessMockRecorder) CloseIO(arg0 interface{}, arg1 ...interface{} } // Delete mocks base method. -func (m *MockProcess) Delete(arg0 context.Context, arg1 ...containerd.ProcessDeleteOpts) (*containerd.ExitStatus, error) { +func (m *MockProcess) Delete(arg0 context.Context, arg1 ...client.ProcessDeleteOpts) (*client.ExitStatus, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) - ret0, _ := ret[0].(*containerd.ExitStatus) + ret0, _ := ret[0].(*client.ExitStatus) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -105,7 +105,7 @@ func (mr *MockProcessMockRecorder) IO() *gomock.Call { } // Kill mocks base method. -func (m *MockProcess) Kill(arg0 context.Context, arg1 syscall.Signal, arg2 ...containerd.KillOpts) error { +func (m *MockProcess) Kill(arg0 context.Context, arg1 syscall.Signal, arg2 ...client.KillOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { @@ -166,10 +166,10 @@ func (mr *MockProcessMockRecorder) Start(arg0 interface{}) *gomock.Call { } // Status mocks base method. -func (m *MockProcess) Status(arg0 context.Context) (containerd.Status, error) { +func (m *MockProcess) Status(arg0 context.Context) (client.Status, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Status", arg0) - ret0, _ := ret[0].(containerd.Status) + ret0, _ := ret[0].(client.Status) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -181,10 +181,10 @@ func (mr *MockProcessMockRecorder) Status(arg0 interface{}) *gomock.Call { } // Wait mocks base method. -func (m *MockProcess) Wait(arg0 context.Context) (<-chan containerd.ExitStatus, error) { +func (m *MockProcess) Wait(arg0 context.Context) (<-chan client.ExitStatus, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Wait", arg0) - ret0, _ := ret[0].(<-chan containerd.ExitStatus) + ret0, _ := ret[0].(<-chan client.ExitStatus) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/mocks/mocks_container/task.go b/mocks/mocks_container/task.go index aa609769..740362c4 100644 --- a/mocks/mocks_container/task.go +++ b/mocks/mocks_container/task.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/containerd (interfaces: Task) +// Source: github.com/containerd/containerd/v2/client (interfaces: Task) // Package mocks_container is a generated GoMock package. package mocks_container @@ -9,8 +9,8 @@ import ( reflect "reflect" syscall "syscall" - containerd "github.com/containerd/containerd/v2/client" types "github.com/containerd/containerd/api/types" + client "github.com/containerd/containerd/v2/client" cio "github.com/containerd/containerd/v2/pkg/cio" gomock "github.com/golang/mock/gomock" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -40,14 +40,14 @@ func (m *MockTask) EXPECT() *MockTaskMockRecorder { } // Checkpoint mocks base method. -func (m *MockTask) Checkpoint(arg0 context.Context, arg1 ...containerd.CheckpointTaskOpts) (containerd.Image, error) { +func (m *MockTask) Checkpoint(arg0 context.Context, arg1 ...client.CheckpointTaskOpts) (client.Image, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Checkpoint", varargs...) - ret0, _ := ret[0].(containerd.Image) + ret0, _ := ret[0].(client.Image) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -60,7 +60,7 @@ func (mr *MockTaskMockRecorder) Checkpoint(arg0 interface{}, arg1 ...interface{} } // CloseIO mocks base method. -func (m *MockTask) CloseIO(arg0 context.Context, arg1 ...containerd.IOCloserOpts) error { +func (m *MockTask) CloseIO(arg0 context.Context, arg1 ...client.IOCloserOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { @@ -79,14 +79,14 @@ func (mr *MockTaskMockRecorder) CloseIO(arg0 interface{}, arg1 ...interface{}) * } // Delete mocks base method. -func (m *MockTask) Delete(arg0 context.Context, arg1 ...containerd.ProcessDeleteOpts) (*containerd.ExitStatus, error) { +func (m *MockTask) Delete(arg0 context.Context, arg1 ...client.ProcessDeleteOpts) (*client.ExitStatus, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) - ret0, _ := ret[0].(*containerd.ExitStatus) + ret0, _ := ret[0].(*client.ExitStatus) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -99,10 +99,10 @@ func (mr *MockTaskMockRecorder) Delete(arg0 interface{}, arg1 ...interface{}) *g } // Exec mocks base method. -func (m *MockTask) Exec(arg0 context.Context, arg1 string, arg2 *specs.Process, arg3 cio.Creator) (containerd.Process, error) { +func (m *MockTask) Exec(arg0 context.Context, arg1 string, arg2 *specs.Process, arg3 cio.Creator) (client.Process, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Exec", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(containerd.Process) + ret0, _ := ret[0].(client.Process) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -142,7 +142,7 @@ func (mr *MockTaskMockRecorder) IO() *gomock.Call { } // Kill mocks base method. -func (m *MockTask) Kill(arg0 context.Context, arg1 syscall.Signal, arg2 ...containerd.KillOpts) error { +func (m *MockTask) Kill(arg0 context.Context, arg1 syscall.Signal, arg2 ...client.KillOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { @@ -161,10 +161,10 @@ func (mr *MockTaskMockRecorder) Kill(arg0, arg1 interface{}, arg2 ...interface{} } // LoadProcess mocks base method. -func (m *MockTask) LoadProcess(arg0 context.Context, arg1 string, arg2 cio.Attach) (containerd.Process, error) { +func (m *MockTask) LoadProcess(arg0 context.Context, arg1 string, arg2 cio.Attach) (client.Process, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoadProcess", arg0, arg1, arg2) - ret0, _ := ret[0].(containerd.Process) + ret0, _ := ret[0].(client.Process) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -219,10 +219,10 @@ func (mr *MockTaskMockRecorder) Pid() *gomock.Call { } // Pids mocks base method. -func (m *MockTask) Pids(arg0 context.Context) ([]containerd.ProcessInfo, error) { +func (m *MockTask) Pids(arg0 context.Context) ([]client.ProcessInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Pids", arg0) - ret0, _ := ret[0].([]containerd.ProcessInfo) + ret0, _ := ret[0].([]client.ProcessInfo) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -291,10 +291,10 @@ func (mr *MockTaskMockRecorder) Start(arg0 interface{}) *gomock.Call { } // Status mocks base method. -func (m *MockTask) Status(arg0 context.Context) (containerd.Status, error) { +func (m *MockTask) Status(arg0 context.Context) (client.Status, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Status", arg0) - ret0, _ := ret[0].(containerd.Status) + ret0, _ := ret[0].(client.Status) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -306,7 +306,7 @@ func (mr *MockTaskMockRecorder) Status(arg0 interface{}) *gomock.Call { } // Update mocks base method. -func (m *MockTask) Update(arg0 context.Context, arg1 ...containerd.UpdateTaskOpts) error { +func (m *MockTask) Update(arg0 context.Context, arg1 ...client.UpdateTaskOpts) error { m.ctrl.T.Helper() varargs := []interface{}{arg0} for _, a := range arg1 { @@ -325,10 +325,10 @@ func (mr *MockTaskMockRecorder) Update(arg0 interface{}, arg1 ...interface{}) *g } // Wait mocks base method. -func (m *MockTask) Wait(arg0 context.Context) (<-chan containerd.ExitStatus, error) { +func (m *MockTask) Wait(arg0 context.Context) (<-chan client.ExitStatus, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Wait", arg0) - ret0, _ := ret[0].(<-chan containerd.ExitStatus) + ret0, _ := ret[0].(<-chan client.ExitStatus) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/mocks/mocks_image/store.go b/mocks/mocks_image/store.go index 34e1745c..c6a3ba38 100644 --- a/mocks/mocks_image/store.go +++ b/mocks/mocks_image/store.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/containerd/containerd/images (interfaces: Store) +// Source: github.com/containerd/containerd/v2/core/images (interfaces: Store) // Package mocks_image is a generated GoMock package. package mocks_image diff --git a/mocks/mocks_network/driver.go b/mocks/mocks_network/driver.go index 21d6846f..47148a13 100644 --- a/mocks/mocks_network/driver.go +++ b/mocks/mocks_network/driver.go @@ -7,9 +7,10 @@ package mocks_network import ( reflect "reflect" - netutil "github.com/containerd/nerdctl/pkg/netutil" + types "github.com/containerd/nerdctl/v2/pkg/api/types" + netutil "github.com/containerd/nerdctl/v2/pkg/netutil" gomock "github.com/golang/mock/gomock" - types "github.com/runfinch/finch-daemon/api/types" + types0 "github.com/runfinch/finch-daemon/api/types" ) // DriverHandler is a mock of DriverHandler interface. @@ -36,10 +37,10 @@ func (m *DriverHandler) EXPECT() *DriverHandlerMockRecorder { } // HandleCreateOptions mocks base method. -func (m *DriverHandler) HandleCreateOptions(arg0 types.NetworkCreateRequest, arg1 netutil.CreateOptions) (netutil.CreateOptions, error) { +func (m *DriverHandler) HandleCreateOptions(arg0 types0.NetworkCreateRequest, arg1 types.NetworkCreateOptions) (types.NetworkCreateOptions, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HandleCreateOptions", arg0, arg1) - ret0, _ := ret[0].(netutil.CreateOptions) + ret0, _ := ret[0].(types.NetworkCreateOptions) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/mocks/mocks_remotes/resolver.go b/mocks/mocks_remotes/resolver.go index 8b5b28ea..03defdbd 100644 --- a/mocks/mocks_remotes/resolver.go +++ b/mocks/mocks_remotes/resolver.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - remotes "github.com/containerd/containerd/remotes" + remotes "github.com/containerd/containerd/v2/core/remotes" gomock "github.com/golang/mock/gomock" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) @@ -33,7 +33,7 @@ func NewMockResolver(ctrl *gomock.Controller) *MockResolver { // EXPECT returns an object that allows the caller to indicate expected use. func (m *MockResolver) EXPECT() *MockResolverMockRecorder { - return m.recorder + return m.recorder } // Fetcher mocks base method. diff --git a/pkg/utility/authutility/utility.go b/pkg/utility/authutility/utility.go index b6e67a16..05cc10f0 100644 --- a/pkg/utility/authutility/utility.go +++ b/pkg/utility/authutility/utility.go @@ -9,10 +9,12 @@ import ( dockertypes "github.com/docker/cli/cli/config/types" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" "github.com/runfinch/finch-daemon/internal/backend" ) +const IndexServer = "https://index.docker.io/v1/" + // GetAuthCreds returns authentication credentials resolver function from image reference domain and auth config. func GetAuthCreds(refDomain string, containerdClient backend.ContainerdClient, ac dockertypes.AuthConfig) (dockerconfigresolver.AuthCreds, error) { // return nil if no credentials specified @@ -33,7 +35,7 @@ func GetAuthCreds(refDomain string, containerdClient backend.ContainerdClient, a saHostname := convertToHostname(sa) // "registry-1.docker.io" can show up as "https://index.docker.io/v1/" in ServerAddress if expectedDomain == "registry-1.docker.io" { - if saHostname != refDomain && sa != dockerconfigresolver.IndexServer { + if saHostname != refDomain && sa != IndexServer { return nil, fmt.Errorf("specified server address %s does not match the image reference domain %s", sa, refDomain) } } else if saHostname != refDomain { diff --git a/setup-test-env.sh b/setup-test-env.sh index 14a1273e..f9136ff8 100755 --- a/setup-test-env.sh +++ b/setup-test-env.sh @@ -1,7 +1,7 @@ #!/bin/bash # Set versions RUNC_VERSION=1.1.14 -NERDCTL_VERSION=1.7.6 +NERDCTL_VERSION=2.0.0 BUILDKIT_VERSION=0.15.2 CNI_VERSION=1.5.1 From 79a6602436aa7f2f1619b591e06f2afb6d89ccd9 Mon Sep 17 00:00:00 2001 From: Swagat Bora Date: Fri, 24 Jan 2025 00:02:31 +0000 Subject: [PATCH 4/4] chore: Rebase changes and update go.mod to latest containerd and nerdctl versions Signed-off-by: Swagat Bora --- api/handlers/container/kill.go | 4 +- api/handlers/container/kill_test.go | 4 +- e2e/tests/distribution_inspect.go | 6 +- e2e/tests/network_create.go | 2 +- go.mod | 47 +++--- go.sum | 141 ++++++++++++------ internal/service/container/kill.go | 4 +- internal/service/container/kill_test.go | 4 +- internal/service/distribution/distribution.go | 2 +- internal/service/image/pull.go | 2 - 10 files changed, 130 insertions(+), 86 deletions(-) diff --git a/api/handlers/container/kill.go b/api/handlers/container/kill.go index e45817ce..cc745347 100644 --- a/api/handlers/container/kill.go +++ b/api/handlers/container/kill.go @@ -7,8 +7,8 @@ import ( "net/http" "os" - "github.com/containerd/containerd/namespaces" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/containerd/v2/pkg/namespaces" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/gorilla/mux" "github.com/runfinch/finch-daemon/api/response" diff --git a/api/handlers/container/kill_test.go b/api/handlers/container/kill_test.go index 18cd6507..38cec1f1 100644 --- a/api/handlers/container/kill_test.go +++ b/api/handlers/container/kill_test.go @@ -9,8 +9,8 @@ import ( "net/http" "net/http/httptest" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/config" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/config" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/e2e/tests/distribution_inspect.go b/e2e/tests/distribution_inspect.go index 27a98ef5..ea35ec90 100644 --- a/e2e/tests/distribution_inspect.go +++ b/e2e/tests/distribution_inspect.go @@ -194,8 +194,10 @@ func DistributionInspect(opt *option.Option) { var message response.Error err = json.NewDecoder(res.Body).Decode(&message) Expect(err).Should(BeNil()) - Expect(message.Message).Should(Equal(fmt.Sprintf("unexpected status from HEAD request "+ - "to http://%s/v2/test-login/manifests/tag: 401 Unauthorized", registry))) + Expect(message.Message).Should(And( + ContainSubstring("pull access denied, repository does not exist or may require authorization"), + ContainSubstring("no basic auth credentials"), + )) }) }) } diff --git a/e2e/tests/network_create.go b/e2e/tests/network_create.go index 8fe508cb..ce173051 100644 --- a/e2e/tests/network_create.go +++ b/e2e/tests/network_create.go @@ -289,7 +289,7 @@ func withUnsupportedNetworkOptions() []types.NetworkCreateOption { Driver: "default", Config: []map[string]string{ { - "Subnet": "240.10.4.0/24", + "Subnet": "240.10.0.0/24", }, }, }), diff --git a/go.mod b/go.mod index 2813d788..394368fb 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,23 @@ module github.com/runfinch/finch-daemon -go 1.22.0 +go 1.22.7 require ( - github.com/containerd/cgroups/v3 v3.0.3 - github.com/containerd/containerd v1.7.23 + github.com/containerd/cgroups/v3 v3.0.5 github.com/containerd/containerd/api v1.8.0 - github.com/containerd/containerd/v2 v2.0.0 + github.com/containerd/containerd/v2 v2.0.2 github.com/containerd/errdefs v1.0.0 github.com/containerd/fifo v1.1.0 - github.com/containerd/go-cni v1.1.10 + github.com/containerd/go-cni v1.1.11 github.com/containerd/nerdctl/v2 v2.0.0 - github.com/containerd/platforms v1.0.0-rc.0 + github.com/containerd/platforms v1.0.0-rc.1 github.com/containerd/typeurl/v2 v2.2.3 github.com/containernetworking/cni v1.2.3 github.com/coreos/go-iptables v0.8.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.4.1+incompatible - github.com/docker/docker v27.4.1+incompatible + github.com/docker/cli v27.5.0+incompatible + github.com/docker/docker v27.5.0+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590 @@ -49,27 +48,27 @@ require ( require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/Masterminds/semver/v3 v3.3.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect + github.com/Masterminds/semver/v3 v3.3.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/hcsshim v0.12.9 // indirect github.com/cilium/ebpf v0.16.0 // indirect github.com/containerd/accelerated-container-image v1.2.3 // indirect github.com/containerd/console v1.0.4 // indirect - github.com/containerd/continuity v0.4.4 // indirect + github.com/containerd/continuity v0.4.5 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/go-runc v1.1.0 // indirect - github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 // indirect + github.com/containerd/imgcrypt/v2 v2.0.0 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5 // indirect + github.com/containerd/nydus-snapshotter v0.15.0 // indirect github.com/containerd/plugin v1.0.0 // indirect - github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319 // indirect - github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319 // indirect - github.com/containerd/ttrpc v1.2.6 // indirect + github.com/containerd/stargz-snapshotter v0.16.3 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect + github.com/containerd/stargz-snapshotter/ipfs v0.16.3 // indirect + github.com/containerd/ttrpc v1.2.7 // indirect github.com/containernetworking/plugins v1.5.1 // indirect - github.com/containers/ocicrypt v1.2.0 // indirect - github.com/cyphar/filepath-securejoin v0.3.4 // indirect + github.com/containers/ocicrypt v1.2.1 // indirect + github.com/cyphar/filepath-securejoin v0.4.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/djherbis/times v1.6.0 // indirect github.com/docker/docker-credential-helpers v0.8.2 // indirect @@ -106,7 +105,7 @@ require ( github.com/moby/sys/symlink v0.3.0 // indirect github.com/moby/sys/user v0.3.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect - github.com/moby/term v0.5.0 // indirect + github.com/moby/term v0.5.2 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/mr-tron/base58 v1.2.0 // indirect github.com/muesli/cancelreader v0.2.2 // indirect @@ -122,15 +121,15 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rootless-containers/bypass4netns v0.4.1 // indirect - github.com/rootless-containers/rootlesskit/v2 v2.3.1 // indirect + github.com/rootless-containers/rootlesskit/v2 v2.3.2 // indirect + github.com/smallstep/pkcs7 v0.1.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tinylib/msgp v1.2.0 // indirect - github.com/vbatts/tar-split v0.11.5 // indirect + github.com/vbatts/tar-split v0.11.6 // indirect github.com/yuchanns/srslog v1.1.0 // indirect - go.mozilla.org/pkcs7 v0.9.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect @@ -145,7 +144,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.28.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect - google.golang.org/grpc v1.67.1 // indirect + google.golang.org/grpc v1.68.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.3.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index e16ccbd3..b0622014 100644 --- a/go.sum +++ b/go.sum @@ -3,13 +3,13 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8af github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2/go.mod h1:gCLVsLfv1egrcZu+GoJATN5ts75F2s62ih/457eWzOw= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= -github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4= +github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg= @@ -27,56 +27,54 @@ github.com/compose-spec/compose-go/v2 v2.4.3 h1:4+Nd9IqIGobbPles9ZuRS5uJfFfRgBo4 github.com/compose-spec/compose-go/v2 v2.4.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc= github.com/containerd/accelerated-container-image v1.2.3 h1:tAIoP7Z7b2xGhb7QCM5Fa+2xqWfPqRmyi5lodbsGGRA= github.com/containerd/accelerated-container-image v1.2.3/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q= -github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= -github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= +github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= +github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= -github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ= -github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= -github.com/containerd/containerd/v2 v2.0.0 h1:qLDdFaAykQrIyLiqwQrNLLz95wiC36bAZVwioUwqShM= -github.com/containerd/containerd/v2 v2.0.0/go.mod h1:j25kDy9P48/ngb1sxWIFfK6GsnqOHoSqo1EpAod20VQ= -github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII= -github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= +github.com/containerd/containerd/v2 v2.0.2 h1:GmH/tRBlTvrXOLwSpWE2vNAm8+MqI6nmxKpKBNKY8Wc= +github.com/containerd/containerd/v2 v2.0.2/go.mod h1:wIqEvQ/6cyPFUGJ5yMFanspPabMLor+bF865OHvNTTI= +github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= +github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/go-cni v1.1.10 h1:c2U73nld7spSWfiJwSh/8W9DK+/qQwYM2rngIhCyhyg= -github.com/containerd/go-cni v1.1.10/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= +github.com/containerd/go-cni v1.1.11 h1:fWt1K15AmSLsEfa57N+qYw4NeGPiQKYq1pjNGJwV9mc= +github.com/containerd/go-cni v1.1.11/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA= github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U= -github.com/containerd/imgcrypt/v2 v2.0.0-rc.1 h1:7OMu5otk5Z2GeQs24JBPOmYbTc50+q6jo02qWNJc0p8= -github.com/containerd/imgcrypt/v2 v2.0.0-rc.1/go.mod h1:3/Ab3iliBt/aBVNYOwecT1YagCqAiHidOmVsrjtHF1A= +github.com/containerd/imgcrypt/v2 v2.0.0 h1:vd2ByN6cXeearzXCQljH1eYe77FgFO5/B9+dK14mng0= +github.com/containerd/imgcrypt/v2 v2.0.0/go.mod h1:S4kOVvPZRerVueZULagcwkJK7sKc/wQI/ixcmyj26uY= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/nerdctl/v2 v2.0.0 h1:6b8cqP+Fkv4p9cDKf/hJUJox6m86ix7pzIr45GiJPeg= github.com/containerd/nerdctl/v2 v2.0.0/go.mod h1:ofedoI6YydZSii3Yisz6HWhIzB9tVTywOlRWrWP8E3g= -github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5 h1:NpscnGdkmWwlb0o2Q+rDO/kfoLObfY2sHwB6M5uF58Q= -github.com/containerd/nydus-snapshotter v0.14.1-0.20240806063146-8fa319bfe9c5/go.mod h1:t7X6QEMNSz69fl5e2pF56ibd4XJ6KH9dEBrLnSwyYQk= -github.com/containerd/platforms v1.0.0-rc.0 h1:GuHWSKgVVO3POn6nRBB4sH63uPOLa87yuuhsGLWaXAA= -github.com/containerd/platforms v1.0.0-rc.0/go.mod h1:T1XAzzOdYs3it7l073MNXyxRwQofJfqwi/8cRjufIk4= +github.com/containerd/nydus-snapshotter v0.15.0 h1:RqZRs1GPeM6T3wmuxJV9u+2Rg4YETVMwTmiDeX+iWC8= +github.com/containerd/nydus-snapshotter v0.15.0/go.mod h1:biq0ijpeZe0I5yZFSJyHzFSjjRZQ7P7y/OuHyd7hYOw= +github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E= +github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4= github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y= github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47bQ+KexvO8= -github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319 h1:Td/dlhRp/kIk9W1rjXHSL87zZZiBQaKPV18OnoEREUA= -github.com/containerd/stargz-snapshotter v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:dgo5lVziOOnWX8SxxHqYuc8ShsQou54eKLdahxFlHVc= -github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319 h1:BRxgmkGWi5vAvajiCwEK+xit4FeFU3GRjbiX4DKTLtM= -github.com/containerd/stargz-snapshotter/estargz v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:9WSor0wu2swhtYoFkrjy3GHt7aNgKR2A7FhnpP+CH5o= -github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319 h1:WdmIerlurjZSoLI2w8014yzJY+q4qdO/A3ZJBEK7LQA= -github.com/containerd/stargz-snapshotter/ipfs v0.15.2-0.20240709063920-1dac5ef89319/go.mod h1:L/J/O36DzcGxq3drHM45sJRr/pEQTG5u+tbffVhP6r8= -github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4= -github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= +github.com/containerd/stargz-snapshotter v0.16.3 h1:zbQMm8dRuPHEOD4OqAYGajJJUwCeUzt4j7w9Iaw58u4= +github.com/containerd/stargz-snapshotter v0.16.3/go.mod h1:XPOl2oa9zjWidTM2IX191smolwWc3/zkKtp02TzTFb0= +github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8= +github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU= +github.com/containerd/stargz-snapshotter/ipfs v0.16.3 h1:d6IBSzYo0vlFcujwTqJRwpI3cZgX3E2I6Ev7LtMaZ4M= +github.com/containerd/stargz-snapshotter/ipfs v0.16.3/go.mod h1:d4EuGnC3RteInKAdddUbDOL88uw3vZySSLZ44pbriGM= +github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRqQ= +github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM= github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M= github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ= github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM= -github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM= -github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U= +github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= +github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= @@ -84,8 +82,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= -github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= +github.com/cyphar/filepath-securejoin v0.4.0 h1:PioTG9TBRSApBpYGnDU8HC+miIsX8vitBH9LGNNMoLQ= +github.com/cyphar/filepath-securejoin v0.4.0/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -94,10 +92,10 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= -github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= -github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= -github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM= +github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U= +github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -233,8 +231,8 @@ github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= +github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= @@ -286,14 +284,16 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rootless-containers/bypass4netns v0.4.1 h1:zyYM1uSG7/prAphD2vlJvx/MEKK91EjD2XaefGx5PKA= github.com/rootless-containers/bypass4netns v0.4.1/go.mod h1:slu3ygwy1x6ey78oBTNs7lpymyEimLBYoXOG76b+Q+Y= -github.com/rootless-containers/rootlesskit/v2 v2.3.1 h1:wdYtdKxWFvVLby9ThMP6O6/v2q/GmOXbkRi+4m9nPW0= -github.com/rootless-containers/rootlesskit/v2 v2.3.1/go.mod h1:tdtfS9ak4bGmwJRmcjsAzcHN5rJ3c5dB7yhSV10KTbk= +github.com/rootless-containers/rootlesskit/v2 v2.3.2 h1:QZk7sKU3+B8UHretEeIg6NSTTpj0o4iHGNhNbJBnHOU= +github.com/rootless-containers/rootlesskit/v2 v2.3.2/go.mod h1:RL7YzL02nA2d8HAzt5d1nZnuiAeudQ4oym+HF/7sk7U= github.com/runfinch/common-tests v0.9.1 h1:O5+M+ThFPYprXhqs0UR54lbph0mTgcVhIX533k79Xbg= github.com/runfinch/common-tests v0.9.1/go.mod h1:vkWvXw8vc4f9LQFTYT1Fc6Q4eJvrBvunx4yn5WUjpiE= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU= +github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -322,8 +322,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= -github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= +github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs= +github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI= github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= @@ -341,8 +341,7 @@ github.com/yuchanns/srslog v1.1.0/go.mod h1:HsLjdv3XV02C3kgBW2bTyW6i88OQE+VYJZIx github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.mozilla.org/pkcs7 v0.9.0 h1:yM4/HS9dYv7ri2biPtxt8ikvB37a980dg69/pKmS+eI= -go.mozilla.org/pkcs7 v0.9.0/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= @@ -360,6 +359,11 @@ go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -371,6 +375,11 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -382,7 +391,14 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -392,6 +408,11 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -403,20 +424,42 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -430,6 +473,10 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -448,8 +495,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= +google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -459,8 +506,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/service/container/kill.go b/internal/service/container/kill.go index b96ed079..04471ae9 100644 --- a/internal/service/container/kill.go +++ b/internal/service/container/kill.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/pkg/errdefs" ) diff --git a/internal/service/container/kill_test.go b/internal/service/container/kill_test.go index 0e0c88c5..1159de96 100644 --- a/internal/service/container/kill_test.go +++ b/internal/service/container/kill_test.go @@ -12,9 +12,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/containerd/containerd" + containerd "github.com/containerd/containerd/v2/client" cerrdefs "github.com/containerd/errdefs" - ncTypes "github.com/containerd/nerdctl/pkg/api/types" + ncTypes "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/runfinch/finch-daemon/mocks/mocks_backend" "github.com/runfinch/finch-daemon/mocks/mocks_container" "github.com/runfinch/finch-daemon/mocks/mocks_logger" diff --git a/internal/service/distribution/distribution.go b/internal/service/distribution/distribution.go index ad863a68..bdcbc5d8 100644 --- a/internal/service/distribution/distribution.go +++ b/internal/service/distribution/distribution.go @@ -10,9 +10,9 @@ import ( "fmt" "io" - cremoteerrors "github.com/containerd/containerd/remotes/errors" containerdimages "github.com/containerd/containerd/v2/core/images" dockerresolver "github.com/containerd/containerd/v2/core/remotes/docker" + cremoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockertypes "github.com/docker/cli/cli/config/types" diff --git a/internal/service/image/pull.go b/internal/service/image/pull.go index a51fdff4..d338b99e 100644 --- a/internal/service/image/pull.go +++ b/internal/service/image/pull.go @@ -20,8 +20,6 @@ import ( "github.com/runfinch/finch-daemon/pkg/errdefs" ) -const IndexServer = "https://index.docker.io/v1/" - func (s *service) Pull(ctx context.Context, name, tag, platformStr string, ac *dockertypes.AuthConfig, outStream io.Writer) error { // get host platform's default spec if unspecified var platform ocispec.Platform