Merge pull request #11251 from hashicorp/f-golang-1.17.1

Upgrade Golang to 1.17.1
hashicorp · Oct 4, 2021 · 4b81337 · 4b81337
2 parents efa9d4b + 0d34b22
commit 4b81337
Show file tree

Hide file tree

Showing 126 changed files with 174 additions and 62 deletions.
diff --git a/.changelog/11251.txt b/.changelog/11251.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+build: Updated to Go 1.17.1
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -512,7 +512,7 @@ executors:
   go:
     working_directory: /go/src/github.com/hashicorp/nomad
     docker:
-      - image: docker.mirror.hashicorp.services/golang:1.16.7
+      - image: docker.mirror.hashicorp.services/golang:1.17.1
     environment:
       <<: *common_envs
       GOPATH: /go
@@ -524,7 +524,7 @@ executors:
     environment: &machine_env
       <<: *common_envs
       GOPATH: /home/circleci/go
-      GOLANG_VERSION: 1.16.7
+      GOLANG_VERSION: 1.17.1
 
   # uses a more recent image with unattended upgrades disabled properly
   # but seems to break docker builds
@@ -541,7 +541,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.16.7
+      GOLANG_VERSION: 1.17.1
 
   go-windows:
     machine:
@@ -553,7 +553,7 @@ executors:
       GOPATH: c:\gopath
       GOBIN: c:\gopath\bin
       GOTESTSUM_PATH: c:\tmp\test-reports
-      GOLANG_VERSION: 1.16.7
+      GOLANG_VERSION: 1.17.1
       GOTESTSUM_VERSION: 0.4.2
       VAULT_VERSION: 1.4.1
 

diff --git a/api/namespace_test.go b/api/namespace_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

diff --git a/api/quota_test.go b/api/quota_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

diff --git a/api/sentinel_test.go b/api/sentinel_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

diff --git a/build_linux_arm.go b/build_linux_arm.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 // #cgo LDFLAGS: -mfloat-abi=hard

diff --git a/client/allocdir/fs_unix.go b/client/allocdir/fs_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package allocdir

diff --git a/client/allocdir/task_dir_nonlinux.go b/client/allocdir/task_dir_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package allocdir

diff --git a/client/allocrunner/alloc_runner_unix_test.go b/client/allocrunner/alloc_runner_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package allocrunner

diff --git a/client/allocrunner/network_manager_nonlinux.go b/client/allocrunner/network_manager_nonlinux.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package allocrunner
 

diff --git a/client/allocrunner/networking_cni.go b/client/allocrunner/networking_cni.go
@@ -1,6 +1,7 @@
 // For now CNI is supported only on Linux.
 //
-//+build linux
+//go:build linux
+// +build linux
 
 package allocrunner
 

diff --git a/client/allocrunner/networking_cni_test.go b/client/allocrunner/networking_cni_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package allocrunner
@@ -19,10 +20,10 @@ func TestCNI_cniToAllocNet_Fallback(t *testing.T) {
 	// following:
 	cniResult := &cni.CNIResult{
 		Interfaces: map[string]*cni.Config{
-			"cali39179aa3-74": &cni.Config{},
-			"eth0": &cni.Config{
+			"cali39179aa3-74": {},
+			"eth0": {
 				IPConfigs: []*cni.IPConfig{
-					&cni.IPConfig{
+					{
 						IP: net.IPv4(192, 168, 135, 232),
 					},
 				},
@@ -48,8 +49,8 @@ func TestCNI_cniToAllocNet_Fallback(t *testing.T) {
 func TestCNI_cniToAllocNet_Invalid(t *testing.T) {
 	cniResult := &cni.CNIResult{
 		Interfaces: map[string]*cni.Config{
-			"eth0": &cni.Config{},
-			"veth1": &cni.Config{
+			"eth0": {},
+			"veth1": {
 				IPConfigs: []*cni.IPConfig{},
 			},
 		},

diff --git a/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go b/client/allocrunner/taskrunner/envoy_bootstrap_hook_test.go
@@ -1,4 +1,6 @@
+//go:build !windows
 // +build !windows
+
 // todo(shoenig): Once Connect is supported on Windows, we'll need to make this
 //  set of tests work there too.
 

diff --git a/client/allocrunner/taskrunner/logmon_hook_unix_test.go b/client/allocrunner/taskrunner/logmon_hook_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package taskrunner

diff --git a/client/allocrunner/taskrunner/sids_hook_test.go b/client/allocrunner/taskrunner/sids_hook_test.go
@@ -1,4 +1,6 @@
+//go:build !windows
 // +build !windows
+
 // todo(shoenig): Once Connect is supported on Windows, we'll need to make this
 //  set of tests work there too.
 

diff --git a/client/allocrunner/testing.go b/client/allocrunner/testing.go
@@ -1,3 +1,4 @@
+//go:build !release
 // +build !release
 
 package allocrunner

diff --git a/client/allocwatcher/alloc_watcher_unix_test.go b/client/allocwatcher/alloc_watcher_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package allocwatcher

diff --git a/client/enterprise_client_oss.go b/client/enterprise_client_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package client

diff --git a/client/fingerprint/bridge_default.go b/client/fingerprint/bridge_default.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fingerprint

diff --git a/client/fingerprint/cgroup_default.go b/client/fingerprint/cgroup_default.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fingerprint

diff --git a/client/fingerprint/cgroup_linux.go b/client/fingerprint/cgroup_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fingerprint

diff --git a/client/fingerprint/cgroup_test.go b/client/fingerprint/cgroup_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fingerprint

diff --git a/client/fingerprint/cpu_default.go b/client/fingerprint/cpu_default.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package fingerprint
 

diff --git a/client/fingerprint/fingerprint_default.go b/client/fingerprint/fingerprint_default.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris || windows
 // +build darwin dragonfly freebsd netbsd openbsd solaris windows
 
 package fingerprint

diff --git a/client/fingerprint/network_default.go b/client/fingerprint/network_default.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 package fingerprint

diff --git a/client/fingerprint/network_test.go b/client/fingerprint/network_test.go
@@ -479,7 +479,7 @@ func TestNetworkFingerPrint_MultipleAliases(t *testing.T) {
 		}
 	}
 	expected := []string{}
-	for alias, _ := range cfg.HostNetworks {
+	for alias := range cfg.HostNetworks {
 		expected = append(expected, alias)
 	}
 	sort.Strings(expected)

diff --git a/client/fingerprint/storage_unix.go b/client/fingerprint/storage_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package fingerprint

diff --git a/client/lib/cgutil/cgutil_default.go b/client/lib/cgutil/cgutil_default.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cgutil

diff --git a/client/lib/cgutil/cpuset_manager_default.go b/client/lib/cgutil/cpuset_manager_default.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cgutil

diff --git a/client/lib/fifo/fifo_unix.go b/client/lib/fifo/fifo_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fifo

diff --git a/client/pluginmanager/drivermanager/testing.go b/client/pluginmanager/drivermanager/testing.go
@@ -1,3 +1,4 @@
+//go:build !release
 // +build !release
 
 package drivermanager

diff --git a/client/state/db_test.go b/client/state/db_test.go
@@ -196,7 +196,7 @@ func TestStateDB_Batch(t *testing.T) {
 		if getTxID != nil {
 			numTransactions := getTxID() - prevTxID
 			writeTime := time.Now().Sub(startTime)
-			expectedNumTransactions := ceilDiv(2 * numAllocs, batchSize) + ceilDiv(int(writeTime), int(batchDelay))
+			expectedNumTransactions := ceilDiv(2*numAllocs, batchSize) + ceilDiv(int(writeTime), int(batchDelay))
 			require.LessOrEqual(numTransactions, expectedNumTransactions)
 			prevTxID = getTxID()
 		}

diff --git a/command/agent/agent_oss.go b/command/agent/agent_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

diff --git a/command/agent/config_oss.go b/command/agent/config_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

diff --git a/command/agent/consul/connect_proxies_test.go b/command/agent/consul/connect_proxies_test.go
@@ -12,6 +12,6 @@ func TestConnectProxies_Proxies(t *testing.T) {
 	proxies, err := pc.Proxies()
 	require.NoError(t, err)
 	require.Equal(t, map[string][]string{
-		"envoy": []string{"1.14.2", "1.13.2", "1.12.4", "1.11.2"},
+		"envoy": {"1.14.2", "1.13.2", "1.12.4", "1.11.2"},
 	}, proxies)
 }
diff --git a/command/agent/host/darwin.go b/command/agent/host/darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package host

diff --git a/command/agent/host/linux.go b/command/agent/host/linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package host

diff --git a/command/agent/host/unix.go b/command/agent/host/unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package host

diff --git a/command/agent/host/windows.go b/command/agent/host/windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package host

diff --git a/command/agent/http_oss.go b/command/agent/http_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

diff --git a/command/agent/namespace_endpoint_test.go b/command/agent/namespace_endpoint_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package agent

diff --git a/command/agent/operator_endpoint_oss.go b/command/agent/operator_endpoint_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

diff --git a/command/agent/stub_asset.go b/command/agent/stub_asset.go
@@ -1,3 +1,4 @@
+//go:build !ui
 // +build !ui
 
 package agent

diff --git a/command/agent/testagent_oss.go b/command/agent/testagent_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

diff --git a/command/alloc_exec_unix.go b/command/alloc_exec_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package command

diff --git a/command/alloc_status_test.go b/command/alloc_status_test.go
@@ -133,9 +133,9 @@ func TestAllocStatusCommand_LifecycleInfo(t *testing.T) {
 	a.TaskResources["init_task"] = a.TaskResources["web"]
 	a.TaskResources["prestart_sidecar"] = a.TaskResources["web"]
 	a.TaskStates = map[string]*structs.TaskState{
-		"web":              &structs.TaskState{State: "pending"},
-		"init_task":        &structs.TaskState{State: "running"},
-		"prestart_sidecar": &structs.TaskState{State: "running"},
+		"web":              {State: "pending"},
+		"init_task":        {State: "running"},
+		"prestart_sidecar": {State: "running"},
 	}
 
 	require.Nil(t, state.UpsertAllocs(structs.MsgTypeTestSetup, 1000, []*structs.Allocation{a}))
@@ -429,7 +429,7 @@ func TestAllocStatusCommand_HostVolumes(t *testing.T) {
 	// fakes the placement enough so that we have something to iterate
 	// on in 'nomad alloc status'
 	alloc.TaskStates = map[string]*structs.TaskState{
-		"web": &structs.TaskState{
+		"web": {
 			Events: []*structs.TaskEvent{
 				structs.NewTaskEvent("test event").SetMessage("test msg"),
 			},
@@ -504,7 +504,7 @@ func TestAllocStatusCommand_CSIVolumes(t *testing.T) {
 	}
 	// if we don't set a task state, there's nothing to iterate on alloc status
 	alloc.TaskStates = map[string]*structs.TaskState{
-		"web": &structs.TaskState{
+		"web": {
 			Events: []*structs.TaskEvent{
 				structs.NewTaskEvent("test event").SetMessage("test msg"),
 			},

diff --git a/command/commands_oss.go b/command/commands_oss.go
@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package command

diff --git a/command/namespace_apply_test.go b/command/namespace_apply_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/namespace_delete_test.go b/command/namespace_delete_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/namespace_inspect_test.go b/command/namespace_inspect_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/namespace_list_test.go b/command/namespace_list_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/namespace_status_test.go b/command/namespace_status_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/quota_delete_test.go b/command/quota_delete_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/quota_inspect_test.go b/command/quota_inspect_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/quota_list_test.go b/command/quota_list_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/command/quota_status_test.go b/command/quota_status_test.go
@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

diff --git a/contributing/README.md b/contributing/README.md
@@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier
 
 Developing without Vagrant
 ---
-1. Install [Go 1.16.7+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.17.1+](https://golang.org/) *(Note: `gcc-go` is not supported)*
 1. Clone this repo
    ```sh
    $ git clone https://github.com/hashicorp/nomad.git