Use gofmt to add new build constraint syntax (#4558)

* Use gofmt to add new build constraint syntax Signed-off-by: c-kruse <[email protected]> * update changelog entry Signed-off-by: c-kruse <[email protected]>
sensu · Dec 15, 2021 · d9316a9 · d9316a9
1 parent 66f1728
commit d9316a9
Show file tree

Hide file tree

Showing 68 changed files with 85 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 
 ### Changed
 - Removed unused rate limiting code in the liveness package.
+- Include new Go 1.17+ build constraint syntax by running gofmt
 
 ## [6.6.1, 6.6.2] - 2021-11-29
 

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package agent

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

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

diff --git a/agent/cmd/install_windows.go b/agent/cmd/install_windows.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package cmd

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

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

diff --git a/agent/debug_test.go b/agent/debug_test.go
@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package agent

diff --git a/agent/sockets_test.go b/agent/sockets_test.go
@@ -39,9 +39,9 @@ func TestHandleTCPMessages(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
-		Source: "proxyEnt",
+		Name:    "app_01",
+		Output:  "could not connect to something",
+		Source:  "proxyEnt",
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)
@@ -92,9 +92,9 @@ func TestHandleTCPMessagesWithClient(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
-		Client: "proxyEnt",
+		Name:    "app_01",
+		Output:  "could not connect to something",
+		Client:  "proxyEnt",
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)
@@ -145,9 +145,9 @@ func TestHandleTCPMessagesWithAgent(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
-		Source: cfg.AgentName,
+		Name:    "app_01",
+		Output:  "could not connect to something",
+		Source:  cfg.AgentName,
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)
@@ -198,8 +198,8 @@ func TestHandleTCPMessagesNoSource(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
+		Name:    "app_01",
+		Output:  "could not connect to something",
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)
@@ -251,9 +251,9 @@ func TestHandleUDPMessages(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
-		Source: "proxyEnt",
+		Name:    "app_01",
+		Output:  "could not connect to something",
+		Source:  "proxyEnt",
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)
@@ -349,9 +349,9 @@ func TestReceiveMultiWriteTCP(t *testing.T) {
 	}
 
 	payload := corev1.CheckResult{
-		Name:   "app_01",
-		Output: "could not connect to something",
-		Source: "proxyEnt",
+		Name:    "app_01",
+		Output:  "could not connect to something",
+		Source:  "proxyEnt",
 		Command: "command",
 	}
 	bytes, _ := json.Marshal(payload)

diff --git a/agent/statsd_server.go b/agent/statsd_server.go
@@ -1,3 +1,4 @@
+//go:build !solaris
 // +build !solaris
 
 // Package agent is the running Sensu agent. Agents connect to a Sensu backend,

diff --git a/agent/statsd_server_test.go b/agent/statsd_server_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !solaris
 // +build integration,!solaris
 
 package agent

diff --git a/asset/fetcher_unix.go b/asset/fetcher_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package asset

diff --git a/asset/fetcher_windows.go b/asset/fetcher_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package asset

diff --git a/backend/apid/actions/actions_test.go b/backend/apid/actions/actions_test.go
@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package actions

diff --git a/backend/apid/handlers/patch_integration_test.go b/backend/apid/handlers/patch_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package handlers

diff --git a/backend/backend_test.go b/backend/backend_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package backend

diff --git a/backend/cmd/logger_unix.go b/backend/cmd/logger_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package cmd

diff --git a/backend/debug_test.go b/backend/debug_test.go
@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package backend

diff --git a/backend/etcd/etcd_test.go b/backend/etcd/etcd_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/etcd/sequence_test.go b/backend/etcd/sequence_test.go
@@ -1,4 +1,5 @@
-//+build integration
+//go:build integration
+// +build integration
 
 package etcd
 

diff --git a/backend/eventd/integration_test.go b/backend/eventd/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package eventd

diff --git a/backend/eventd/logger_test.go b/backend/eventd/logger_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package eventd

diff --git a/backend/keepalived/integration_test.go b/backend/keepalived/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package keepalived

diff --git a/backend/liveness/liveness_test.go b/backend/liveness/liveness_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package liveness

diff --git a/backend/queue/queue_test.go b/backend/queue/queue_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package queue

diff --git a/backend/ringv2/pool_test.go b/backend/ringv2/pool_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package ringv2

diff --git a/backend/ringv2/ringv2_test.go b/backend/ringv2/ringv2_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 // These tests are unfortunately quite slow. This is somewhat mitigated by the

diff --git a/backend/schedulerd/check_watcher_test.go b/backend/schedulerd/check_watcher_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package schedulerd

diff --git a/backend/schedulerd/debug_test.go b/backend/schedulerd/debug_test.go
@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package schedulerd

diff --git a/backend/schedulerd/executor_test.go b/backend/schedulerd/executor_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package schedulerd

diff --git a/backend/schedulerd/schedulerd_test.go b/backend/schedulerd/schedulerd_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package schedulerd

diff --git a/backend/store/cache/cache_integration_test.go b/backend/store/cache/cache_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cache

diff --git a/backend/store/cache/v2/cache_integration_test.go b/backend/store/cache/v2/cache_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package v2

diff --git a/backend/store/etcd/asset_store_test.go b/backend/store/etcd/asset_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/authentication_test.go b/backend/store/etcd/authentication_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/check_store_test.go b/backend/store/etcd/check_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/cluster_id_store_test.go b/backend/store/etcd/cluster_id_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/debug_test.go b/backend/store/etcd/debug_test.go
@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package etcd

diff --git a/backend/store/etcd/entity_store_test.go b/backend/store/etcd/entity_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/event_store_integration_test.go b/backend/store/etcd/event_store_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/filter_store_test.go b/backend/store/etcd/filter_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/handler_store_test.go b/backend/store/etcd/handler_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/health_store_test.go b/backend/store/etcd/health_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/hook_store_test.go b/backend/store/etcd/hook_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/keepalive_store_test.go b/backend/store/etcd/keepalive_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/migrations_test.go b/backend/store/etcd/migrations_test.go
@@ -1,3 +1,4 @@
+//go:build !race && integration
 // +build !race,integration
 
 package etcd

diff --git a/backend/store/etcd/mutator_store_test.go b/backend/store/etcd/mutator_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/namespace_store_test.go b/backend/store/etcd/namespace_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/resource_integration_test.go b/backend/store/etcd/resource_integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/silenced_store_test.go b/backend/store/etcd/silenced_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/store_test.go b/backend/store/etcd/store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/tessen_store_test.go b/backend/store/etcd/tessen_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/user_store_test.go b/backend/store/etcd/user_store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/version_test.go b/backend/store/etcd/version_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/etcd/watcher_test.go b/backend/store/etcd/watcher_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcd

diff --git a/backend/store/v2/etcdstore/store_test.go b/backend/store/v2/etcdstore/store_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package etcdstore_test

diff --git a/backend/tessend/tessend_test.go b/backend/tessend/tessend_test.go
@@ -1,3 +1,4 @@
+//go:build integration && !race
 // +build integration,!race
 
 package tessend

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

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

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

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

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

diff --git a/system/cpu_arm.go b/system/cpu_arm.go
@@ -1,3 +1,4 @@
+//go:build arm
 // +build arm
 
 package system

diff --git a/system/cpu_other.go b/system/cpu_other.go
@@ -1,3 +1,4 @@
+//go:build !arm
 // +build !arm
 
 package system