Switch to go.mod

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
       OS: linux
       ARCH: amd64
       GOVERSION: 1.17
-      GO111MODULE: "off"
+      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`

api/api.pb.txt

@@ -2735,8 +2735,8 @@ file {
         label: LABEL_OPTIONAL
         type: TYPE_UINT32
         options {
-          65001: 0
           65003: "os.FileMode"
+          65001: 0
         }
         json_name: "mode"
       }
@@ -2904,8 +2904,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "delay"
     }
@@ -3348,8 +3348,8 @@ file {
         }
       }
       options {
-        62001: 0
         62023: "PublishMode"
+        62001: 0
       }
     }
   }
@@ -4055,8 +4055,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_UINT32
       options {
-        65001: 0
         65003: "os.FileMode"
+        65001: 0
       }
       json_name: "mode"
     }
@@ -5052,8 +5052,8 @@ file {
       }
     }
     options {
-      62001: 0
       62023: "NodeRole"
+      62001: 0
     }
   }
   syntax: "proto3"
@@ -9739,8 +9739,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65001: 0
         65011: 1
+        65001: 0
       }
       json_name: "period"
     }
@@ -10958,14 +10958,14 @@ file {
     }
   }
   options {
-    63001: 0
-    63002: 0
     63017: 1
-    63018: 1
     63020: 1
+    63018: 1
+    63001: 0
+    63002: 0
+    63035: 0
     63026: 0
     63034: 0
-    63035: 0
   }
 }
 file {

direct.mk

@@ -137,19 +137,15 @@ help: ## this help
 .PHONY: dep-validate
 dep-validate: go-mod-vendor
 	@echo "+ $@"
-	@go mod tidy -modfile vendor.mod
-	@git diff --exit-code vendor.mod vendor.sum vendor || \
-		(echo >&2 "+ inconsistent dependencies! what you have in vendor.mod does not match with what you have in vendor" && false)
-
-go.mod:
-	@printf "module github.com/docker/swarmkit\n\ngo 1.17\n" > $@
-
+	@go mod tidy
+	@git diff --exit-code go.mod go.sum vendor || \
+		(echo >&2 "+ inconsistent dependencies! what you have in go.mod does not match with what you have in vendor" && false)
 
 .PHONY: go-mod-vendor
-go-mod-vendor: go.mod
-	@go mod vendor -modfile vendor.mod
+go-mod-vendor:
+	@go mod vendor
 	@# ensure that key protobuf spec files are in vendor dir
 	@module=github.com/gogo/protobuf ; \
 		prefix=$$(go env GOPATH)/pkg/mod/$${module} ; \
-		version=$$(go list -modfile vendor.mod -m -f '{{.Version}}' $${module}) ; \
+		version=$$(go list -m -f '{{.Version}}' $${module}) ; \
 		cp -a $${prefix}@$${version}/protobuf vendor/$${module}/ && chmod -R u+w vendor/$${module}

vendor.mod → go.mod

@@ -1,20 +1,20 @@
-// 'vendor.mod' enables use of 'go mod vendor' to managed 'vendor/' directory.
-// There is no 'go.mod' file, as that would imply opting in for all the rules
-// around SemVer. Switch over may occur in the future, but presently the goal
-// is to just use 'go mod vendor' here and other projects including moby.
-
 module github.com/docker/swarmkit
 
 go 1.17
 
+retract (
+	v1.12.1 // Contains retractions only.
+	v1.12.0 // Not intended as a Swarmkit release.
+)
+
 require (
 	code.cloudfoundry.org/clock v1.0.0
 	github.com/Microsoft/go-winio v0.4.17
 	github.com/akutz/memconn v0.1.0
 	github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5
 	github.com/container-storage-interface/spec v1.2.0
 	github.com/docker/distribution v2.7.1+incompatible
-	github.com/docker/docker v20.10.3-0.20220126110425-3c06ebd87668+incompatible
+	github.com/docker/docker v20.10.3-0.20220408103430-7ea283fd9166+incompatible // v22.04 dev
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
 	github.com/docker/go-metrics v0.0.1
@@ -60,7 +60,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 // indirect
 	github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158 // indirect
-	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
@@ -77,7 +76,7 @@ require (
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/certificate-transparency-go v1.1.2 // indirect
 	github.com/google/trillian v1.4.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect