gofmt all the files

mostly to handle build directives in 1.17.

api/namespace_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

api/quota_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

api/sentinel_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package api

build_linux_arm.go

@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 // #cgo LDFLAGS: -mfloat-abi=hard

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

client/allocdir/task_dir_nonlinux.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package allocdir

client/allocrunner/alloc_runner_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package allocrunner

client/allocrunner/network_manager_nonlinux.go

@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package allocrunner
 

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
 

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{},
 			},
 		},

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.
 

client/allocrunner/taskrunner/logmon_hook_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package taskrunner

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.
 

client/allocrunner/testing.go

@@ -1,3 +1,4 @@
+//go:build !release
 // +build !release
 
 package allocrunner

client/allocwatcher/alloc_watcher_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package allocwatcher

client/enterprise_client_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package client

client/fingerprint/bridge_default.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fingerprint

client/fingerprint/cgroup_default.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fingerprint

client/fingerprint/cgroup_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fingerprint

client/fingerprint/cgroup_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fingerprint

client/fingerprint/cpu_default.go

@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package fingerprint
 

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

client/fingerprint/network_default.go

@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 package fingerprint

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)

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

client/lib/cgutil/cgutil_default.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cgutil

client/lib/cgutil/cpuset_manager_default.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cgutil

client/lib/fifo/fifo_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fifo

client/pluginmanager/drivermanager/testing.go

@@ -1,3 +1,4 @@
+//go:build !release
 // +build !release
 
 package drivermanager

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()
 		}

command/agent/agent_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

command/agent/config_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

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)
 }

command/agent/host/darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package host

command/agent/host/linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package host

command/agent/host/unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package host

command/agent/host/windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package host

command/agent/http_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

command/agent/namespace_endpoint_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package agent

command/agent/operator_endpoint_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

command/agent/stub_asset.go

@@ -1,3 +1,4 @@
+//go:build !ui
 // +build !ui
 
 package agent

command/agent/testagent_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package agent

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

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"),
 			},

command/commands_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package command

command/namespace_apply_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/namespace_delete_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/namespace_inspect_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/namespace_list_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/namespace_status_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/quota_delete_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/quota_inspect_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/quota_list_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

command/quota_status_test.go

@@ -1,3 +1,4 @@
+//go:build ent
 // +build ent
 
 package command

drivers/docker/config_test.go

@@ -694,12 +694,12 @@ func TestConfig_DriverConfig_AllowRuntimes(t *testing.T) {
 		{
 			name:     "pure default",
 			config:   `{}`,
-			expected: map[string]struct{}{"runc": struct{}{}, "nvidia": struct{}{}},
+			expected: map[string]struct{}{"runc": {}, "nvidia": {}},
 		},
 		{
 			name:     "custom",
 			config:   `{ allow_runtimes = ["runc", "firecracker"]}`,
-			expected: map[string]struct{}{"runc": struct{}{}, "firecracker": struct{}{}},
+			expected: map[string]struct{}{"runc": {}, "firecracker": {}},
 		},
 	}
 

drivers/docker/driver_default.go

@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package docker
 

drivers/docker/driver_test.go

@@ -1224,12 +1224,12 @@ func TestDockerDriver_CreateContainerConfig_Mounts(t *testing.T) {
 	defer freeport.Return(ports)
 
 	cfg.Mounts = []DockerMount{
-		DockerMount{
+		{
 			Type:   "bind",
 			Target: "/map-bind-target",
 			Source: "/map-source",
 		},
-		DockerMount{
+		{
 			Type:   "tmpfs",
 			Target: "/map-tmpfs-target",
 		},

drivers/docker/driver_unix_test.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package docker

drivers/docker/driver_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package docker

drivers/docker/util/stats_posix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package util

drivers/docker/utils_unix_test.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package docker

drivers/docker/utils_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package docker

drivers/exec/driver_unix_test.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package exec

drivers/rawexec/driver_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package rawexec

drivers/shared/executor/executor_basic.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package executor

drivers/shared/executor/executor_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package executor

drivers/shared/executor/executor_unix.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package executor

drivers/shared/executor/pty_unix.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package executor

drivers/shared/executor/pty_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package executor

drivers/shared/executor/resource_container_default.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris || windows
 // +build darwin dragonfly freebsd netbsd openbsd solaris windows
 
 package executor

drivers/shared/executor/utils_unix.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package executor

drivers/shared/hostnames/mount_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package hostnames

drivers/shared/resolvconf/mount_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package resolvconf

e2e/consul/namespaces_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 // Nomad OSS ignores Consul Namespace configuration in jobs, these e2e tests

e2e/nomad09upgrade/upgrade.go

@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package nomad09upgrade
 

e2e/nomad09upgrade/upgrade_basic.go

@@ -1,3 +1,4 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package nomad09upgrade

e2e/quotas/quotas_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package quotas

e2e/vaultcompat/vault_test.go

@@ -70,7 +70,7 @@ func syncVault(t *testing.T) ([]*version.Version, map[string]string) {
 	}
 
 	binaries := make(map[string]string, len(versions))
-	for ver, _ := range versions {
+	for ver := range versions {
 		binaries[ver] = filepath.Join(binDir, ver)
 	}
 	return sorted, binaries

helper/freeport/ephemeral_darwin.go

@@ -1,4 +1,5 @@
-//+build darwin
+//go:build darwin
+// +build darwin
 
 package freeport
 

helper/freeport/ephemeral_darwin_test.go

@@ -1,4 +1,5 @@
-//+build darwin
+//go:build darwin
+// +build darwin
 
 package freeport
 

helper/freeport/ephemeral_freebsd.go

@@ -1,4 +1,5 @@
-//+build freebsd
+//go:build freebsd
+// +build freebsd
 
 package freeport
 

helper/freeport/ephemeral_linux.go

@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package freeport
 

helper/freeport/ephemeral_linux_test.go

@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package freeport
 

helper/freeport/ephemeral_windows.go

@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package freeport
 

helper/mount/mount_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package mount

helper/mount/mount_unsupported.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package mount

helper/pluginutils/catalog/register_testing.go

@@ -1,3 +1,4 @@
+//go:build !release
 // +build !release
 
 package catalog

helper/pluginutils/loader/filter_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package loader

helper/pluginutils/loader/filter_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package loader

helper/raftutil/fsm_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package raftutil

helper/snapshot/archive_test.go

@@ -21,7 +21,7 @@ func TestArchive(t *testing.T) {
 		Term:  2011,
 		Configuration: raft.Configuration{
 			Servers: []raft.Server{
-				raft.Server{
+				{
 					Suffrage: raft.Voter,
 					ID:       raft.ServerID("hello"),
 					Address:  raft.ServerAddress("127.0.0.1:8300"),

helper/testtask/testtask_unix.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package testtask

helper/testtask/testtask_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package testtask

helper/winsvc/service_windows.go

@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package winsvc
 

nomad/consul_oss_test.go

@@ -1,4 +1,5 @@
-//+build !ent
+//go:build !ent
+// +build !ent
 
 package nomad
 

nomad/consul_policy_oss_test.go

@@ -1,4 +1,5 @@
-//+build !ent
+//go:build !ent
+// +build !ent
 
 package nomad
 

nomad/consul_policy_test.go

@@ -521,7 +521,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv wild namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			NamespacePrefixes: map[string]*ConsulPolicy{
-				"": &ConsulPolicy{
+				"": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -536,7 +536,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv apple namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			NamespacePrefixes: map[string]*ConsulPolicy{
-				"apple": &ConsulPolicy{
+				"apple": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -551,7 +551,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv matching namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			NamespacePrefixes: map[string]*ConsulPolicy{
-				"app": &ConsulPolicy{
+				"app": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -566,7 +566,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv other namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			NamespacePrefixes: map[string]*ConsulPolicy{
-				"other": &ConsulPolicy{
+				"other": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -583,7 +583,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv match namespace any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			Namespaces: map[string]*ConsulPolicy{
-				"apple": &ConsulPolicy{
+				"apple": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -598,7 +598,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv mismatch namespace any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			Namespaces: map[string]*ConsulPolicy{
-				"other": &ConsulPolicy{
+				"other": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -613,7 +613,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv matching namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			Namespaces: map[string]*ConsulPolicy{
-				"apple": &ConsulPolicy{
+				"apple": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",
@@ -628,7 +628,7 @@ func TestConsulPolicy_allowKeystoreRead(t *testing.T) {
 	t.Run("kv mismatch namespace prefix any read", func(t *testing.T) {
 		policy := &ConsulPolicy{
 			Namespaces: map[string]*ConsulPolicy{
-				"other": &ConsulPolicy{
+				"other": {
 					KeyPrefixes: []*ConsulKeyRule{{
 						Name:   "",
 						Policy: "read",

nomad/deploymentwatcher/multiregion_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package deploymentwatcher

nomad/endpoints_oss.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package nomad

nomad/fsm_not_ent.go

@@ -1,3 +1,4 @@
+//go:build !ent
 // +build !ent
 
 package nomad