re-run gofmt on 1.17 (#11579)

This should let freshly recompiled golangci-lint binaries using Go 1.17
pass 'make lint'

acl/acl_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package acl

acl/authorizer_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package acl

acl/policy_authorizer_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package acl

acl/policy_merger_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package acl

acl/policy_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package acl

agent/acl_oss.go

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

agent/agent_endpoint_oss.go

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

agent/agent_oss.go

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

agent/auto-config/auto_config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package autoconf

agent/auto-config/auto_config_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package autoconf

agent/auto-config/config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package autoconf

agent/auto-config/mock_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package autoconf

agent/cache-types/connect_ca_leaf_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package cachetype

agent/cache-types/norace_test.go

@@ -1,3 +1,4 @@
+//go:build !race
 // +build !race
 
 package cachetype

agent/cache-types/race_test.go

@@ -1,3 +1,4 @@
+//go:build race
 // +build race
 
 package cachetype

agent/catalog_endpoint_oss.go

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

agent/checks/docker_unix.go

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

agent/config/builder_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/builder_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/default_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/limits.go

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

agent/config/limits_windows.go

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

agent/config/runtime_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/runtime_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/segment_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/config/segment_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package config

agent/connect/uri_agent_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package connect

agent/connect/uri_agent_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package connect

agent/connect/uri_service_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package connect

agent/connect/uri_service_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package connect

agent/consul/acl_authmethod_oss.go

@@ -1,4 +1,5 @@
-//+build !consulent
+//go:build !consulent
+// +build !consulent
 
 package consul
 

agent/consul/acl_endpoint_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/acl_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/acl_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/acl_server_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/authmethod/authmethods_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package authmethod

agent/consul/authmethod/kubeauth/k8s_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package kubeauth

agent/consul/authmethod/ssoauth/sso_oss.go

@@ -1,4 +1,5 @@
-//+build !consulent
+//go:build !consulent
+// +build !consulent
 
 package ssoauth
 

agent/consul/authmethod/testauth/testing_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package testauth

agent/consul/autopilot_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/discoverychain/compile_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package discoverychain

agent/consul/enterprise_config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/enterprise_server_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/leader_intentions_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/leader_intentions_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/options_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package consul

agent/consul/prepared_query/walk_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package prepared_query

agent/consul/state/acl_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/acl_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/catalog_events_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/catalog_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/catalog_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/config_entry_intention_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/config_entry_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/config_entry_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/coordinate_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/coordinate_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/delay_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/intention_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/kvs_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/schema_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/state_store_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/state/usage_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package state

agent/consul/usagemetrics/usagemetrics_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package usagemetrics

agent/consul/usagemetrics/usagemetrics_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package usagemetrics

agent/dns_oss.go

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

agent/enterprise_delegate_oss.go

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

agent/exec/exec_unix.go

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

agent/exec/exec_windows.go

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

agent/http_oss.go

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

agent/intentions_endpoint_oss_test.go

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

agent/operator_endpoint_oss.go

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

agent/proxycfg/mesh_gateway_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package proxycfg

agent/setup_oss.go

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

agent/signal_unix.go

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

agent/signal_windows.go

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

agent/structs/acl_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/autopilot_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/catalog_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/config_entry_discoverychain_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/config_entry_intentions_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/config_entry_mesh_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/config_entry_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/config_entry_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/connect_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/connect_proxy_config_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/discovery_chain_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/intention_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/sanitize_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/structs_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/structs/structs_oss_test.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package structs

agent/token/store_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package token

agent/ui_endpoint_oss_test.go

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

agent/xds/net_fallback.go

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

agent/xds/net_linux.go

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

agent/xds/server_oss.go

@@ -1,3 +1,4 @@
+//go:build !consulent
 // +build !consulent
 
 package xds

api/namespace_test.go

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

api/oss_test.go

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