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 <csnider@mirantis.com>

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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

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"
 )