gRPC update

.circleci/config.yml

@@ -11,7 +11,8 @@ jobs:
       # Needed to install go
       OS: linux
       ARCH: amd64
-      GOVERSION: 1.13
+      GOVERSION: 1.17
+      GO111MODULE: "off"
       # Needed to install protoc
       PROTOC_VERSION: 3.6.1
 
@@ -29,7 +30,7 @@ jobs:
 
     # /dev/shm in the container is tmpfs although files in /dev/shm are not executable.
     # If we specify TMPDIR=/dev/shm, /dev/shm will be used by our tests, which call
-    # ioutil.TempDir/ioutil.TempFile, to write temporary files.
+    # os.MkdirTemp/os.CreateTemp, to write temporary files.
     # We can also specify GOTMPDIR=/tmp or some other non-tmpfs directory
     # (see https://golang.org/doc/go1.10#goroot) - this is the directory in which the
     # go tool itself will put temporarily compiled test executables, etc.

BUILDING.md

@@ -88,14 +88,14 @@ vndr
 
 It's possible to update only one dependency:
 ```
-vndr github.com/coreos/etcd v3.0.9
+vndr go.etcd.io/etcd v3.0.9
 ```
 
 but it should be in sync with `vendor.conf`.
 
 Also, you can update dependency from fork for testing:
 ```
-vndr github.com/coreos/etcd <revision> https://github.com/LK4D4/etcd.git
+vndr go.etcd.io/etcd <revision> https://github.com/LK4D4/etcd.git
 ```
 
 ### Regenerating protobuf bindings

Dockerfile

@@ -1,5 +1,5 @@
 # NOTE(dperny): for some reason, alpine was giving me trouble
-ARG GO_VERSION=1.13.15
+ARG GO_VERSION=1.17.4
 ARG DEBIAN_FRONTEND=noninteractive
 ARG BASE_DEBIAN_DISTRO="buster"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
@@ -16,6 +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
 WORKDIR /go/src/github.com/docker/swarmkit/
 
 # install the dependencies from `make setup`

agent/exec/dockerapi/controller_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"reflect"
 	"runtime"
 	"testing"
@@ -38,7 +37,7 @@ func TestControllerPrepare(t *testing.T) {
 
 	client.ImagePullFn = func(_ context.Context, refStr string, options types.ImagePullOptions) (io.ReadCloser, error) {
 		if refStr == config.image() {
-			return ioutil.NopCloser(bytes.NewBuffer([]byte{})), nil
+			return io.NopCloser(bytes.NewBuffer([]byte{})), nil
 		}
 		panic("unexpected call of ImagePull")
 	}
@@ -68,7 +67,7 @@ func TestControllerPrepareAlreadyPrepared(t *testing.T) {
 
 	client.ImagePullFn = func(_ context.Context, refStr string, options types.ImagePullOptions) (io.ReadCloser, error) {
 		if refStr == config.image() {
-			return ioutil.NopCloser(bytes.NewBuffer([]byte{})), nil
+			return io.NopCloser(bytes.NewBuffer([]byte{})), nil
 		}
 		panic("unexpected call of ImagePull")
 	}

agent/storage_test.go

@@ -1,7 +1,6 @@
 package agent
 
 import (
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -176,11 +175,11 @@ func genTaskStatus() *api.TaskStatus {
 // tests.
 func storageTestEnv(t *testing.T) (*bolt.DB, func()) {
 	var cleanup []func()
-	dir, err := ioutil.TempDir("", "agent-TestStorage-")
+	dir, err := os.MkdirTemp("", "agent-TestStorage-")
 	assert.NoError(t, err)
 
 	dbpath := filepath.Join(dir, "tasks.db")
-	assert.NoError(t, os.MkdirAll(dir, 0777))
+	assert.NoError(t, os.MkdirAll(dir, 0o777))
 	cleanup = append(cleanup, func() { os.RemoveAll(dir) })
 
 	db, err := bolt.Open(dbpath, 0666, nil)

agent/testutils/fakes.go

@@ -2,7 +2,6 @@ package testutils
 
 import (
 	"context"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -235,7 +234,7 @@ func NewMockDispatcher(t *testing.T, secConfig *ca.SecurityConfig, local bool) (
 		cleanup func()
 	)
 	if local {
-		tempDir, err := ioutil.TempDir("", "local-dispatcher-socket")
+		tempDir, err := os.MkdirTemp("", "local-dispatcher-socket")
 		require.NoError(t, err)
 		addr = filepath.Join(tempDir, "socket")
 		l, err = net.Listen("unix", addr)

api/api.pb.txt

@@ -10433,7 +10433,7 @@ file {
   syntax: "proto3"
 }
 file {
-  name: "github.com/coreos/etcd/raft/raftpb/raft.proto"
+  name: "go.etcd.io/etcd/raft/raftpb/raft.proto"
   package: "raftpb"
   dependency: "gogoproto/gogo.proto"
   message_type {
@@ -10691,11 +10691,11 @@ file {
   message_type {
     name: "ConfState"
     field {
-      name: "nodes"
+      name: "voters"
       number: 1
       label: LABEL_REPEATED
       type: TYPE_UINT64
-      json_name: "nodes"
+      json_name: "voters"
     }
     field {
       name: "learners"
@@ -10704,46 +10704,129 @@ file {
       type: TYPE_UINT64
       json_name: "learners"
     }
+    field {
+      name: "voters_outgoing"
+      number: 3
+      label: LABEL_REPEATED
+      type: TYPE_UINT64
+      json_name: "votersOutgoing"
+    }
+    field {
+      name: "learners_next"
+      number: 4
+      label: LABEL_REPEATED
+      type: TYPE_UINT64
+      json_name: "learnersNext"
+    }
+    field {
+      name: "auto_leave"
+      number: 5
+      label: LABEL_OPTIONAL
+      type: TYPE_BOOL
+      options {
+        65001: 0
+      }
+      json_name: "autoLeave"
+    }
   }
   message_type {
     name: "ConfChange"
     field {
-      name: "ID"
+      name: "type"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_ENUM
+      type_name: ".raftpb.ConfChangeType"
+      options {
+        65001: 0
+      }
+      json_name: "type"
+    }
+    field {
+      name: "node_id"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_UINT64
+      options {
+        65001: 0
+        65004: "NodeID"
+      }
+      json_name: "nodeId"
+    }
+    field {
+      name: "context"
+      number: 4
+      label: LABEL_OPTIONAL
+      type: TYPE_BYTES
+      json_name: "context"
+    }
+    field {
+      name: "id"
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
       options {
         65001: 0
+        65004: "ID"
       }
-      json_name: "ID"
+      json_name: "id"
     }
+  }
+  message_type {
+    name: "ConfChangeSingle"
     field {
-      name: "Type"
-      number: 2
+      name: "type"
+      number: 1
       label: LABEL_OPTIONAL
       type: TYPE_ENUM
       type_name: ".raftpb.ConfChangeType"
       options {
         65001: 0
       }
-      json_name: "Type"
+      json_name: "type"
     }
     field {
-      name: "NodeID"
-      number: 3
+      name: "node_id"
+      number: 2
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
       options {
         65001: 0
+        65004: "NodeID"
       }
-      json_name: "NodeID"
+      json_name: "nodeId"
     }
+  }
+  message_type {
+    name: "ConfChangeV2"
     field {
-      name: "Context"
-      number: 4
+      name: "transition"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_ENUM
+      type_name: ".raftpb.ConfChangeTransition"
+      options {
+        65001: 0
+      }
+      json_name: "transition"
+    }
+    field {
+      name: "changes"
+      number: 2
+      label: LABEL_REPEATED
+      type: TYPE_MESSAGE
+      type_name: ".raftpb.ConfChangeSingle"
+      options {
+        65001: 0
+      }
+      json_name: "changes"
+    }
+    field {
+      name: "context"
+      number: 3
       label: LABEL_OPTIONAL
       type: TYPE_BYTES
-      json_name: "Context"
+      json_name: "context"
     }
   }
   enum_type {
@@ -10756,6 +10839,10 @@ file {
       name: "EntryConfChange"
       number: 1
     }
+    value {
+      name: "EntryConfChangeV2"
+      number: 2
+    }
   }
   enum_type {
     name: "MessageType"
@@ -10836,6 +10923,21 @@ file {
       number: 18
     }
   }
+  enum_type {
+    name: "ConfChangeTransition"
+    value {
+      name: "ConfChangeTransitionAuto"
+      number: 0
+    }
+    value {
+      name: "ConfChangeTransitionJointImplicit"
+      number: 1
+    }
+    value {
+      name: "ConfChangeTransitionJointExplicit"
+      number: 2
+    }
+  }
   enum_type {
     name: "ConfChangeType"
     value {
@@ -10868,7 +10970,7 @@ file {
   package: "docker.swarmkit.v1"
   dependency: "github.com/docker/swarmkit/api/objects.proto"
   dependency: "github.com/docker/swarmkit/api/types.proto"
-  dependency: "github.com/coreos/etcd/raft/raftpb/raft.proto"
+  dependency: "go.etcd.io/etcd/raft/raftpb/raft.proto"
   dependency: "gogoproto/gogo.proto"
   dependency: "github.com/docker/swarmkit/protobuf/plugin/plugin.proto"
   message_type {