Switch to go 1.11

Whitespace changes are caused by the fact that gofmt from go-1.11 uses a different heuristic as to how to format the file, making the source code that was OK for go-1.10 causing a warning with go-1.11. NOTE this whitespace change makes the gofmt from go-1.10 complain, so please upgrade your golang. [v2: regen pb files] Signed-off-by: Kir Kolyshkin <[email protected]>
moby · Sep 18, 2018 · 0a7a379 · 0a7a379
1 parent 50c60e7
commit 0a7a379
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       # Needed to install go
       OS: linux
       ARCH: amd64
-      GOVERSION: 1.10.3
+      GOVERSION: 1.11
       # Needed to install protoc
       PROTOC: https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # NOTE(dperny): for some reason, alpine was giving me trouble
-FROM golang:1.10.3-stretch
+FROM golang:1.11.0-stretch
 
 RUN apt-get update && apt-get install -y make git unzip
 

diff --git a/Protobuild.toml b/Protobuild.toml
@@ -17,7 +17,7 @@ plugins = ["grpc", "deepcopy", "storeobject", "raftproxy", "authenticatedwrapper
   # Paths that will be added untouched to the end of the includes. We use
   # `/usr/local/include` to pickup the common install location of protobuf.
   # This is the default.
-  after = ["/usr/local/include"]
+  after = ["/usr/local/include", "/usr/include"]
 
 [importpath]
 

diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -2491,8 +2491,8 @@ file {
         label: LABEL_OPTIONAL
         type: TYPE_UINT32
         options {
-          65003: "os.FileMode"
           65001: 0
+          65003: "os.FileMode"
         }
         json_name: "mode"
       }
@@ -2646,8 +2646,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65011: 1
         65001: 0
+        65011: 1
       }
       json_name: "delay"
     }
@@ -3090,8 +3090,8 @@ file {
         }
       }
       options {
-        62023: "PublishMode"
         62001: 0
+        62023: "PublishMode"
       }
     }
   }
@@ -3790,8 +3790,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_UINT32
       options {
-        65003: "os.FileMode"
         65001: 0
+        65003: "os.FileMode"
       }
       json_name: "mode"
     }
@@ -4207,8 +4207,8 @@ file {
       }
     }
     options {
-      62023: "NodeRole"
       62001: 0
+      62023: "NodeRole"
     }
   }
   syntax: "proto3"
@@ -8058,8 +8058,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65011: 1
         65001: 0
+        65011: 1
       }
       json_name: "period"
     }
@@ -9106,11 +9106,11 @@ file {
     }
   }
   options {
-    63017: 1
-    63020: 1
-    63018: 1
     63001: 0
     63002: 0
+    63017: 1
+    63018: 1
+    63020: 1
   }
 }
 file {

diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go
diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go
diff --git a/api/raft.pb.go b/api/raft.pb.go
diff --git a/api/types.pb.go b/api/types.pb.go
diff --git a/manager/scheduler/constraint_test.go b/manager/scheduler/constraint_test.go
@@ -54,7 +54,7 @@ func setupEnv() {
 				Addr:  "186.17.9.41",
 			},
 		},
-		Tasks: make(map[string]*api.Task),
+		Tasks:                     make(map[string]*api.Task),
 		ActiveTasksCountByService: make(map[string]int),
 	}
 }

diff --git a/manager/scheduler/nodeinfo.go b/manager/scheduler/nodeinfo.go
@@ -45,8 +45,8 @@ type NodeInfo struct {
 
 func newNodeInfo(n *api.Node, tasks map[string]*api.Task, availableResources api.Resources) NodeInfo {
 	nodeInfo := NodeInfo{
-		Node:  n,
-		Tasks: make(map[string]*api.Task),
+		Node:                      n,
+		Tasks:                     make(map[string]*api.Task),
 		ActiveTasksCountByService: make(map[string]int),
 		AvailableResources:        availableResources.Copy(),
 		usedHostPorts:             make(map[hostPortSpec]struct{}),

diff --git a/protobuf/plugin/raftproxy/test/service.pb.go b/protobuf/plugin/raftproxy/test/service.pb.go