From 906172e8f502c7c0eedf9f1cb77527b91b589eeb Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Wed, 20 Mar 2024 17:33:20 -0400 Subject: [PATCH] swarmd: remove /v2/ from module path The module path for swarmd is not valid for the location of the swarmd module within the swarmkit repo. The go command resolves package paths to the swarmkit/v2 module and fails when the packages don't exist. $ go run github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool@master go: github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool@master: module github.com/moby/swarmkit/v2@master found (v2.0.0-20240227173239-911c97650f2e), but does not contain package github.com/moby/swarmkit/v2/swarmd/cmd/swarm-rafttool (This is only a problem when swarmd is not the main module.) Fix the swarmd module's path to align with the module source location so that `go run` can once again be used to invoke swarm-rafttool and the other commands. Signed-off-by: Cory Snider --- swarmd/cmd/swarm-rafttool/main.go | 2 +- swarmd/cmd/swarmctl/cluster/inspect.go | 2 +- swarmd/cmd/swarmctl/cluster/list.go | 2 +- swarmd/cmd/swarmctl/cluster/unlockkey.go | 2 +- swarmd/cmd/swarmctl/cluster/update.go | 2 +- swarmd/cmd/swarmctl/config/create.go | 2 +- swarmd/cmd/swarmctl/config/inspect.go | 2 +- swarmd/cmd/swarmctl/config/list.go | 2 +- swarmd/cmd/swarmctl/config/remove.go | 2 +- swarmd/cmd/swarmctl/main.go | 16 ++++++++-------- swarmd/cmd/swarmctl/network/create.go | 2 +- swarmd/cmd/swarmctl/network/inspect.go | 2 +- swarmd/cmd/swarmctl/network/list.go | 2 +- swarmd/cmd/swarmctl/network/remove.go | 2 +- swarmd/cmd/swarmctl/node/common.go | 2 +- swarmd/cmd/swarmctl/node/inspect.go | 4 ++-- swarmd/cmd/swarmctl/node/list.go | 2 +- swarmd/cmd/swarmctl/node/remove.go | 2 +- swarmd/cmd/swarmctl/secret/create.go | 2 +- swarmd/cmd/swarmctl/secret/inspect.go | 2 +- swarmd/cmd/swarmctl/secret/list.go | 2 +- swarmd/cmd/swarmctl/secret/remove.go | 2 +- swarmd/cmd/swarmctl/service/create.go | 4 ++-- swarmd/cmd/swarmctl/service/flagparser/config.go | 2 +- swarmd/cmd/swarmctl/service/flagparser/flags.go | 2 +- .../cmd/swarmctl/service/flagparser/network.go | 4 ++-- swarmd/cmd/swarmctl/service/flagparser/secret.go | 2 +- swarmd/cmd/swarmctl/service/inspect.go | 4 ++-- swarmd/cmd/swarmctl/service/list.go | 2 +- swarmd/cmd/swarmctl/service/logs.go | 2 +- swarmd/cmd/swarmctl/service/remove.go | 2 +- swarmd/cmd/swarmctl/service/update.go | 4 ++-- swarmd/cmd/swarmctl/task/inspect.go | 2 +- swarmd/cmd/swarmctl/task/list.go | 2 +- swarmd/cmd/swarmctl/task/print.go | 2 +- swarmd/cmd/swarmctl/task/remove.go | 2 +- swarmd/cmd/swarmd/main.go | 4 ++-- swarmd/go.mod | 2 +- 38 files changed, 51 insertions(+), 51 deletions(-) diff --git a/swarmd/cmd/swarm-rafttool/main.go b/swarmd/cmd/swarm-rafttool/main.go index 67c38d372..afc591d37 100644 --- a/swarmd/cmd/swarm-rafttool/main.go +++ b/swarmd/cmd/swarm-rafttool/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/moby/swarmkit/v2/swarmd/internal/defaults" + "github.com/moby/swarmkit/swarmd/internal/defaults" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/cluster/inspect.go b/swarmd/cmd/swarmctl/cluster/inspect.go index 9205ff0d1..1f5f14962 100644 --- a/swarmd/cmd/swarmctl/cluster/inspect.go +++ b/swarmd/cmd/swarmctl/cluster/inspect.go @@ -8,8 +8,8 @@ import ( "text/tabwriter" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/cluster/list.go b/swarmd/cmd/swarmctl/cluster/list.go index 9c7c33b54..19513a7b5 100644 --- a/swarmd/cmd/swarmctl/cluster/list.go +++ b/swarmd/cmd/swarmctl/cluster/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/cluster/unlockkey.go b/swarmd/cmd/swarmctl/cluster/unlockkey.go index e13d0b4b5..7110495a9 100644 --- a/swarmd/cmd/swarmctl/cluster/unlockkey.go +++ b/swarmd/cmd/swarmctl/cluster/unlockkey.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/manager/encryption" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/cluster/update.go b/swarmd/cmd/swarmctl/cluster/update.go index 0460c57fe..9931e2663 100644 --- a/swarmd/cmd/swarmctl/cluster/update.go +++ b/swarmd/cmd/swarmctl/cluster/update.go @@ -7,9 +7,9 @@ import ( "time" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/cli" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/config/create.go b/swarmd/cmd/swarmctl/config/create.go index 59baa5606..9e8656afe 100644 --- a/swarmd/cmd/swarmctl/config/create.go +++ b/swarmd/cmd/swarmctl/config/create.go @@ -6,8 +6,8 @@ import ( "io" "os" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/config/inspect.go b/swarmd/cmd/swarmctl/config/inspect.go index 2d86cfe89..d4fa30d45 100644 --- a/swarmd/cmd/swarmctl/config/inspect.go +++ b/swarmd/cmd/swarmctl/config/inspect.go @@ -7,8 +7,8 @@ import ( "text/tabwriter" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/config/list.go b/swarmd/cmd/swarmctl/config/list.go index 8ce205d59..397e4d6ae 100644 --- a/swarmd/cmd/swarmctl/config/list.go +++ b/swarmd/cmd/swarmctl/config/list.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/config/remove.go b/swarmd/cmd/swarmctl/config/remove.go index d30e48025..64dfde431 100644 --- a/swarmd/cmd/swarmctl/config/remove.go +++ b/swarmd/cmd/swarmctl/config/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/main.go b/swarmd/cmd/swarmctl/main.go index 97d805edf..8f2ff41e4 100644 --- a/swarmd/cmd/swarmctl/main.go +++ b/swarmd/cmd/swarmctl/main.go @@ -3,14 +3,14 @@ package main import ( "os" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/cluster" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/config" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/node" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/secret" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task" - "github.com/moby/swarmkit/v2/swarmd/internal/defaults" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/cluster" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/config" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/network" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/node" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/secret" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/service" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/task" + "github.com/moby/swarmkit/swarmd/internal/defaults" "github.com/moby/swarmkit/v2/version" "github.com/spf13/cobra" "google.golang.org/grpc/status" diff --git a/swarmd/cmd/swarmctl/network/create.go b/swarmd/cmd/swarmctl/network/create.go index ca0b5fff3..35306072d 100644 --- a/swarmd/cmd/swarmctl/network/create.go +++ b/swarmd/cmd/swarmctl/network/create.go @@ -6,8 +6,8 @@ import ( "net" "strings" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/network/inspect.go b/swarmd/cmd/swarmctl/network/inspect.go index 87ddc39e2..ac859f7c4 100644 --- a/swarmd/cmd/swarmctl/network/inspect.go +++ b/swarmd/cmd/swarmctl/network/inspect.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/network/list.go b/swarmd/cmd/swarmctl/network/list.go index 374aa5c08..e75073b7f 100644 --- a/swarmd/cmd/swarmctl/network/list.go +++ b/swarmd/cmd/swarmctl/network/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/network/remove.go b/swarmd/cmd/swarmctl/network/remove.go index d15ae7d29..27dc367f1 100644 --- a/swarmd/cmd/swarmctl/network/remove.go +++ b/swarmd/cmd/swarmctl/network/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/node/common.go b/swarmd/cmd/swarmctl/node/common.go index ab577ea67..983193771 100644 --- a/swarmd/cmd/swarmctl/node/common.go +++ b/swarmd/cmd/swarmctl/node/common.go @@ -7,8 +7,8 @@ import ( "reflect" "strings" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/node/inspect.go b/swarmd/cmd/swarmctl/node/inspect.go index a2abfab0f..c7a0d99fa 100644 --- a/swarmd/cmd/swarmctl/node/inspect.go +++ b/swarmd/cmd/swarmctl/node/inspect.go @@ -8,10 +8,10 @@ import ( "text/tabwriter" "github.com/dustin/go-humanize" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/task" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/genericresource" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/node/list.go b/swarmd/cmd/swarmctl/node/list.go index c3ebda63b..e11f42987 100644 --- a/swarmd/cmd/swarmctl/node/list.go +++ b/swarmd/cmd/swarmctl/node/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/node/remove.go b/swarmd/cmd/swarmctl/node/remove.go index 02ecfb147..7db686609 100644 --- a/swarmd/cmd/swarmctl/node/remove.go +++ b/swarmd/cmd/swarmctl/node/remove.go @@ -3,8 +3,8 @@ package node import ( "errors" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/secret/create.go b/swarmd/cmd/swarmctl/secret/create.go index 3859b1049..4f4132e36 100644 --- a/swarmd/cmd/swarmctl/secret/create.go +++ b/swarmd/cmd/swarmctl/secret/create.go @@ -6,8 +6,8 @@ import ( "io" "os" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/secret/inspect.go b/swarmd/cmd/swarmctl/secret/inspect.go index f04bc4bd6..30957112e 100644 --- a/swarmd/cmd/swarmctl/secret/inspect.go +++ b/swarmd/cmd/swarmctl/secret/inspect.go @@ -7,8 +7,8 @@ import ( "text/tabwriter" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/secret/list.go b/swarmd/cmd/swarmctl/secret/list.go index eed696abd..c6afb900a 100644 --- a/swarmd/cmd/swarmctl/secret/list.go +++ b/swarmd/cmd/swarmctl/secret/list.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/secret/remove.go b/swarmd/cmd/swarmctl/secret/remove.go index e5e27d38f..3ab6ca32b 100644 --- a/swarmd/cmd/swarmctl/secret/remove.go +++ b/swarmd/cmd/swarmctl/secret/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/create.go b/swarmd/cmd/swarmctl/service/create.go index 321a25131..f160ecf3c 100644 --- a/swarmd/cmd/swarmctl/service/create.go +++ b/swarmd/cmd/swarmctl/service/create.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/service/flagparser" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/flagparser/config.go b/swarmd/cmd/swarmctl/service/flagparser/config.go index 3e98d3669..6235c0c42 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/config.go +++ b/swarmd/cmd/swarmctl/service/flagparser/config.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/flagparser/flags.go b/swarmd/cmd/swarmctl/service/flagparser/flags.go index beebbce1a..47fc032f8 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/flags.go +++ b/swarmd/cmd/swarmctl/service/flagparser/flags.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/swarmd/cmd/swarmctl/service/flagparser/network.go b/swarmd/cmd/swarmctl/service/flagparser/network.go index 63ae526ed..c5e77983d 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/network.go +++ b/swarmd/cmd/swarmctl/service/flagparser/network.go @@ -1,9 +1,9 @@ package flagparser import ( + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/network" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/network" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/flagparser/secret.go b/swarmd/cmd/swarmctl/service/flagparser/secret.go index f7f800d1b..4e38638e1 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/secret.go +++ b/swarmd/cmd/swarmctl/service/flagparser/secret.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/inspect.go b/swarmd/cmd/swarmctl/service/inspect.go index 13221ca35..e76b18ea5 100644 --- a/swarmd/cmd/swarmctl/service/inspect.go +++ b/swarmd/cmd/swarmctl/service/inspect.go @@ -11,10 +11,10 @@ import ( "github.com/dustin/go-humanize" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/task" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/genericresource" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/task" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/list.go b/swarmd/cmd/swarmctl/service/list.go index 0f33931ea..a9f2bf630 100644 --- a/swarmd/cmd/swarmctl/service/list.go +++ b/swarmd/cmd/swarmctl/service/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/logs.go b/swarmd/cmd/swarmctl/service/logs.go index a63078c5a..333119020 100644 --- a/swarmd/cmd/swarmctl/service/logs.go +++ b/swarmd/cmd/swarmctl/service/logs.go @@ -6,8 +6,8 @@ import ( "io" "os" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/remove.go b/swarmd/cmd/swarmctl/service/remove.go index 7ba4cefd8..3f49c84ca 100644 --- a/swarmd/cmd/swarmctl/service/remove.go +++ b/swarmd/cmd/swarmctl/service/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/service/update.go b/swarmd/cmd/swarmctl/service/update.go index de3819301..163059feb 100644 --- a/swarmd/cmd/swarmctl/service/update.go +++ b/swarmd/cmd/swarmctl/service/update.go @@ -5,9 +5,9 @@ import ( "fmt" "reflect" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/service/flagparser" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/service/flagparser" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/task/inspect.go b/swarmd/cmd/swarmctl/task/inspect.go index 4287e3257..913b7501d 100644 --- a/swarmd/cmd/swarmctl/task/inspect.go +++ b/swarmd/cmd/swarmctl/task/inspect.go @@ -9,8 +9,8 @@ import ( "text/tabwriter" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/task/list.go b/swarmd/cmd/swarmctl/task/list.go index 5d3dc6e6b..67ced8ae2 100644 --- a/swarmd/cmd/swarmctl/task/list.go +++ b/swarmd/cmd/swarmctl/task/list.go @@ -6,8 +6,8 @@ import ( "os" "text/tabwriter" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmctl/task/print.go b/swarmd/cmd/swarmctl/task/print.go index c79511f87..2a3a7031f 100644 --- a/swarmd/cmd/swarmctl/task/print.go +++ b/swarmd/cmd/swarmctl/task/print.go @@ -7,8 +7,8 @@ import ( "text/tabwriter" gogotypes "github.com/gogo/protobuf/types" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" ) type tasksBySlot []*api.Task diff --git a/swarmd/cmd/swarmctl/task/remove.go b/swarmd/cmd/swarmctl/task/remove.go index 94cdca061..d32f8afdc 100644 --- a/swarmd/cmd/swarmctl/task/remove.go +++ b/swarmd/cmd/swarmctl/task/remove.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/moby/swarmkit/v2/swarmd/cmd/swarmctl/common" "github.com/spf13/cobra" ) diff --git a/swarmd/cmd/swarmd/main.go b/swarmd/cmd/swarmd/main.go index b4642142c..dfaf1ef18 100644 --- a/swarmd/cmd/swarmd/main.go +++ b/swarmd/cmd/swarmd/main.go @@ -12,14 +12,14 @@ import ( engineapi "github.com/docker/docker/client" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/moby/swarmkit/swarmd/dockerexec" + "github.com/moby/swarmkit/swarmd/internal/defaults" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/genericresource" "github.com/moby/swarmkit/v2/cli" "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/encryption" "github.com/moby/swarmkit/v2/node" - "github.com/moby/swarmkit/v2/swarmd/dockerexec" - "github.com/moby/swarmkit/v2/swarmd/internal/defaults" "github.com/moby/swarmkit/v2/version" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" diff --git a/swarmd/go.mod b/swarmd/go.mod index fdcdebd5a..cbd612527 100644 --- a/swarmd/go.mod +++ b/swarmd/go.mod @@ -1,4 +1,4 @@ -module github.com/moby/swarmkit/v2/swarmd +module github.com/moby/swarmkit/swarmd go 1.18