Merge pull request #3061 from corhere/v2

Swarmkit v2

.circleci/config.yml

@@ -11,8 +11,8 @@ jobs:
       # Needed to install go
       OS: linux
       ARCH: amd64
-      GOVERSION: 1.17
-      GO111MODULE: "off"
+      GOVERSION: 1.17.9
+      GO111MODULE: "on"
       # Needed to install protoc
       PROTOC_VERSION: 3.6.1
 
@@ -77,7 +77,6 @@ jobs:
         environment:
           # ensure GOPATH is set to single directory so the make target doesn't need to handle a column-separated list
           GOPATH: /home/circleci/.go_workspace
-          GO111MODULE: "on"
         command: |
             git fetch origin
             if test -n "`git diff --stat=1000 origin/master | grep -E \"^[[:space:]]*vendor\"`"; then

.gitignore

@@ -34,6 +34,3 @@ bin/swarmkitstate
 
 # dev sync, if used
 /.docker-sync/
-
-# top-level go.mod is not meant to be checked in yet
-/go.mod

BUILDING.md

@@ -80,7 +80,7 @@ for details.
 
 ### Update vendored dependencies
 
-To update dependency you need just change `vendor.mod` file and run:
+To update dependency you need just change `go.mod` file and run:
 ```
 make go-mod-vendor
 ```

Dockerfile

@@ -16,7 +16,7 @@ RUN curl --silent --show-error --location --output protoc.zip \
   && unzip -d /usr/local protoc.zip include/\* bin/\* \
   && rm -f protoc.zip
 
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 WORKDIR /go/src/github.com/docker/swarmkit/
 
 # install the dependencies from `make setup`

Makefile

@@ -1,8 +1,6 @@
 # Root directory of the project (absolute path).
 ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-PROJECT_ROOT=github.com/docker/swarmkit
-
 SHELL := /bin/bash
 
 # stop here. do we want to run everything inside of a container, or do we want

Protobuild.toml

@@ -31,6 +31,7 @@ plugins = ["grpc", "deepcopy", "storeobject", "raftproxy", "authenticatedwrapper
   "google/protobuf/timestamp.proto" = "github.com/gogo/protobuf/types"
   "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types"
   "google/protobuf/wrappers.proto" = "github.com/gogo/protobuf/types"
+  "github.com/docker/swarmkit/protobuf/plugin/plugin.proto" = "github.com/moby/swarmkit/v2/protobuf/plugin"
 
 [[descriptors]]
 prefix = "github.com/docker/swarmkit/api"

agent/agent.go

@@ -8,9 +8,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 	"github.com/pkg/errors"
 )
 

agent/agent_test.go

@@ -15,15 +15,15 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	events "github.com/docker/go-events"
-	agentutils "github.com/docker/swarmkit/agent/testutils"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/ca"
-	cautils "github.com/docker/swarmkit/ca/testutils"
-	"github.com/docker/swarmkit/connectionbroker"
-	"github.com/docker/swarmkit/log"
-	"github.com/docker/swarmkit/remotes"
-	"github.com/docker/swarmkit/testutils"
-	"github.com/docker/swarmkit/xnet"
+	agentutils "github.com/moby/swarmkit/v2/agent/testutils"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/ca"
+	cautils "github.com/moby/swarmkit/v2/ca/testutils"
+	"github.com/moby/swarmkit/v2/connectionbroker"
+	"github.com/moby/swarmkit/v2/log"
+	"github.com/moby/swarmkit/v2/remotes"
+	"github.com/moby/swarmkit/v2/testutils"
+	"github.com/moby/swarmkit/v2/xnet"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

agent/config.go

@@ -2,9 +2,9 @@ package agent
 
 import (
 	"github.com/docker/go-events"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/connectionbroker"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/connectionbroker"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 	"google.golang.org/grpc/credentials"

agent/configs/configs.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 // configs is a map that keeps all the currently available configs to the agent

agent/csi/plugin/manager.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/docker/pkg/plugingetter"
 
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 const (

agent/csi/plugin/manager_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/docker/swarmkit/testutils"
+	"github.com/moby/swarmkit/v2/testutils"
 )
 
 var _ = Describe("PluginManager", func() {

agent/csi/plugin/plugin.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 )
 
 // SecretGetter is a reimplementation of the exec.SecretGetter interface in the

agent/csi/plugin/plugin_fake_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/docker/docker/pkg/plugingetter"
 
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 // plugin_fake_test.go contains code for faking node plugins in the context of

agent/csi/plugin/plugin_test.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/testutils"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/testutils"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

agent/csi/plugin_manager_fake_test.go

@@ -7,8 +7,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/docker/swarmkit/agent/csi/plugin"
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/agent/csi/plugin"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 // fakePluginManager is a fake pluginManager, used for testing the volume

agent/csi/volume_manager_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/volumequeue"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/volumequeue"
 	"github.com/stretchr/testify/assert"
 )
 

agent/csi/volumes.go

@@ -9,11 +9,11 @@ import (
 
 	"github.com/docker/docker/pkg/plugingetter"
 
-	"github.com/docker/swarmkit/agent/csi/plugin"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
-	"github.com/docker/swarmkit/volumequeue"
+	"github.com/moby/swarmkit/v2/agent/csi/plugin"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
+	"github.com/moby/swarmkit/v2/volumequeue"
 )
 
 // volumeState keeps track of the state of a volume on this node.

agent/dependency.go

@@ -3,11 +3,11 @@ package agent
 import (
 	"github.com/docker/docker/pkg/plugingetter"
 
-	"github.com/docker/swarmkit/agent/configs"
-	"github.com/docker/swarmkit/agent/csi"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/agent/secrets"
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/agent/configs"
+	"github.com/moby/swarmkit/v2/agent/csi"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/agent/secrets"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 type dependencyManager struct {

agent/exec/controller.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/api/equality"
-	"github.com/docker/swarmkit/log"
-	"github.com/docker/swarmkit/protobuf/ptypes"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/api/equality"
+	"github.com/moby/swarmkit/v2/log"
+	"github.com/moby/swarmkit/v2/protobuf/ptypes"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

agent/exec/controller_stub.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 // StubController implements the Controller interface,

agent/exec/controller_test.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/assert"
 )

agent/exec/dockerapi/adapter.go

@@ -11,9 +11,9 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	engineapi "github.com/docker/docker/client"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

agent/exec/dockerapi/container.go

@@ -17,11 +17,11 @@ import (
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/api/genericresource"
-	"github.com/docker/swarmkit/api/naming"
-	"github.com/docker/swarmkit/template"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/api/genericresource"
+	"github.com/moby/swarmkit/v2/api/naming"
+	"github.com/moby/swarmkit/v2/template"
 	gogotypes "github.com/gogo/protobuf/types"
 )
 

agent/exec/dockerapi/container_test.go

@@ -9,7 +9,7 @@ import (
 	enginemount "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/go-units"
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 	gogotypes "github.com/gogo/protobuf/types"
 )
 

agent/exec/dockerapi/controller.go

@@ -15,9 +15,9 @@ import (
 	"github.com/docker/docker/api/types/events"
 	engineapi "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"golang.org/x/time/rate"

agent/exec/dockerapi/controller_integration_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	engineapi "github.com/docker/docker/client"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/api/genericresource"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/api/genericresource"
 	"github.com/stretchr/testify/assert"
 )
 

agent/exec/dockerapi/controller_test.go

@@ -16,10 +16,10 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/identity"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/identity"
+	"github.com/moby/swarmkit/v2/log"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/assert"
 )

agent/exec/dockerapi/executor.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/docker/docker/api/types/filters"
 	engineapi "github.com/docker/docker/client"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/agent/secrets"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/agent/exec"
+	"github.com/moby/swarmkit/v2/agent/secrets"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 )
 
 type executor struct {

agent/exec/executor.go

@@ -3,7 +3,7 @@ package exec
 import (
 	"context"
 
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 // Executor provides controllers for tasks.

agent/reporter.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/moby/swarmkit/v2/log"
 )
 
 // StatusReporter receives updates to task status. Method may be called

agent/reporter_test.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/docker/swarmkit/api"
+	"github.com/moby/swarmkit/v2/api"
 	"github.com/stretchr/testify/assert"
 )