diff --git a/acl/acl_oss.go b/acl/acl_oss.go index df54e3ed0..9c62c5bdb 100644 --- a/acl/acl_oss.go +++ b/acl/acl_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package acl diff --git a/acl/authorizer_oss.go b/acl/authorizer_oss.go index cf33ea268..6870a042d 100644 --- a/acl/authorizer_oss.go +++ b/acl/authorizer_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package acl diff --git a/acl/policy_authorizer_oss.go b/acl/policy_authorizer_oss.go index 0e1c20f07..4829048a8 100644 --- a/acl/policy_authorizer_oss.go +++ b/acl/policy_authorizer_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package acl diff --git a/acl/policy_merger_oss.go b/acl/policy_merger_oss.go index 9b7cb07f8..cff74c732 100644 --- a/acl/policy_merger_oss.go +++ b/acl/policy_merger_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package acl diff --git a/acl/policy_oss.go b/acl/policy_oss.go index 4a4fc84db..a5d6828b6 100644 --- a/acl/policy_oss.go +++ b/acl/policy_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package acl diff --git a/agent/acl_oss.go b/agent/acl_oss.go index a04603731..2a1ace1ab 100644 --- a/agent/acl_oss.go +++ b/agent/acl_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/agent_endpoint_oss.go b/agent/agent_endpoint_oss.go index 1c4dd4428..2c6585a4b 100644 --- a/agent/agent_endpoint_oss.go +++ b/agent/agent_endpoint_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/agent_oss.go b/agent/agent_oss.go index fff8ef26e..b9b1f91dc 100644 --- a/agent/agent_oss.go +++ b/agent/agent_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/auto-config/auto_config_oss.go b/agent/auto-config/auto_config_oss.go index 1ce93c6e7..95b38aa05 100644 --- a/agent/auto-config/auto_config_oss.go +++ b/agent/auto-config/auto_config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package autoconf diff --git a/agent/auto-config/auto_config_oss_test.go b/agent/auto-config/auto_config_oss_test.go index 2d6092f37..6a318644f 100644 --- a/agent/auto-config/auto_config_oss_test.go +++ b/agent/auto-config/auto_config_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package autoconf diff --git a/agent/auto-config/config_oss.go b/agent/auto-config/config_oss.go index 876d090d5..a8048954a 100644 --- a/agent/auto-config/config_oss.go +++ b/agent/auto-config/config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package autoconf diff --git a/agent/auto-config/mock_oss_test.go b/agent/auto-config/mock_oss_test.go index da227484f..0518753bb 100644 --- a/agent/auto-config/mock_oss_test.go +++ b/agent/auto-config/mock_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package autoconf diff --git a/agent/cache-types/connect_ca_leaf_oss.go b/agent/cache-types/connect_ca_leaf_oss.go index 2045e85ee..07de1e793 100644 --- a/agent/cache-types/connect_ca_leaf_oss.go +++ b/agent/cache-types/connect_ca_leaf_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package cachetype diff --git a/agent/cache-types/norace_test.go b/agent/cache-types/norace_test.go index cac95de9d..93645410d 100644 --- a/agent/cache-types/norace_test.go +++ b/agent/cache-types/norace_test.go @@ -1,3 +1,4 @@ +//go:build !race // +build !race package cachetype diff --git a/agent/cache-types/race_test.go b/agent/cache-types/race_test.go index 29774bf67..7848991f2 100644 --- a/agent/cache-types/race_test.go +++ b/agent/cache-types/race_test.go @@ -1,3 +1,4 @@ +//go:build race // +build race package cachetype diff --git a/agent/catalog_endpoint_oss.go b/agent/catalog_endpoint_oss.go index 361672192..da27ab476 100644 --- a/agent/catalog_endpoint_oss.go +++ b/agent/catalog_endpoint_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/checks/docker_unix.go b/agent/checks/docker_unix.go index 0cde4ad54..528cb7d85 100644 --- a/agent/checks/docker_unix.go +++ b/agent/checks/docker_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package checks diff --git a/agent/config/builder_oss.go b/agent/config/builder_oss.go index f78bea300..ce6e8d44c 100644 --- a/agent/config/builder_oss.go +++ b/agent/config/builder_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/builder_oss_test.go b/agent/config/builder_oss_test.go index 3d2b7ba30..99a1be04d 100644 --- a/agent/config/builder_oss_test.go +++ b/agent/config/builder_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/config_oss.go b/agent/config/config_oss.go index 95b1599dd..7e061b8e5 100644 --- a/agent/config/config_oss.go +++ b/agent/config/config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/default_oss.go b/agent/config/default_oss.go index 57f52d927..d98e27bcb 100644 --- a/agent/config/default_oss.go +++ b/agent/config/default_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/limits.go b/agent/config/limits.go index bd840e58c..f1ff5e7f5 100644 --- a/agent/config/limits.go +++ b/agent/config/limits.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package config diff --git a/agent/config/limits_windows.go b/agent/config/limits_windows.go index 6cd8817b2..1e6e1822f 100644 --- a/agent/config/limits_windows.go +++ b/agent/config/limits_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package config diff --git a/agent/config/runtime_oss.go b/agent/config/runtime_oss.go index fcc9135dc..0cec03ccd 100644 --- a/agent/config/runtime_oss.go +++ b/agent/config/runtime_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/runtime_oss_test.go b/agent/config/runtime_oss_test.go index 4e9a87ffe..2179ac2df 100644 --- a/agent/config/runtime_oss_test.go +++ b/agent/config/runtime_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/segment_oss.go b/agent/config/segment_oss.go index ed9c6eb67..d7a80c71e 100644 --- a/agent/config/segment_oss.go +++ b/agent/config/segment_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/config/segment_oss_test.go b/agent/config/segment_oss_test.go index de224be85..52b4a0964 100644 --- a/agent/config/segment_oss_test.go +++ b/agent/config/segment_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package config diff --git a/agent/connect/uri_agent_oss.go b/agent/connect/uri_agent_oss.go index 0936d680a..1ae6f18c3 100644 --- a/agent/connect/uri_agent_oss.go +++ b/agent/connect/uri_agent_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package connect diff --git a/agent/connect/uri_agent_oss_test.go b/agent/connect/uri_agent_oss_test.go index 8bfc38784..37ebc0bf3 100644 --- a/agent/connect/uri_agent_oss_test.go +++ b/agent/connect/uri_agent_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package connect diff --git a/agent/connect/uri_service_oss.go b/agent/connect/uri_service_oss.go index 3838ef955..8270f96c2 100644 --- a/agent/connect/uri_service_oss.go +++ b/agent/connect/uri_service_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package connect diff --git a/agent/connect/uri_service_oss_test.go b/agent/connect/uri_service_oss_test.go index a844469e5..069df2616 100644 --- a/agent/connect/uri_service_oss_test.go +++ b/agent/connect/uri_service_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package connect diff --git a/agent/consul/acl_authmethod_oss.go b/agent/consul/acl_authmethod_oss.go index 7d68a1639..b2f28da9a 100644 --- a/agent/consul/acl_authmethod_oss.go +++ b/agent/consul/acl_authmethod_oss.go @@ -1,4 +1,5 @@ -//+build !consulent +//go:build !consulent +// +build !consulent package consul diff --git a/agent/consul/acl_endpoint_oss.go b/agent/consul/acl_endpoint_oss.go index 61788f183..6aac4629d 100644 --- a/agent/consul/acl_endpoint_oss.go +++ b/agent/consul/acl_endpoint_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/acl_oss.go b/agent/consul/acl_oss.go index ba24ee677..c42064fc1 100644 --- a/agent/consul/acl_oss.go +++ b/agent/consul/acl_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/acl_oss_test.go b/agent/consul/acl_oss_test.go index 773e2a04d..917696105 100644 --- a/agent/consul/acl_oss_test.go +++ b/agent/consul/acl_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/acl_server_oss.go b/agent/consul/acl_server_oss.go index 97aa4e439..a3ed18aea 100644 --- a/agent/consul/acl_server_oss.go +++ b/agent/consul/acl_server_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/authmethod/authmethods_oss.go b/agent/consul/authmethod/authmethods_oss.go index ca0b73046..0e5cc5a7f 100644 --- a/agent/consul/authmethod/authmethods_oss.go +++ b/agent/consul/authmethod/authmethods_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package authmethod diff --git a/agent/consul/authmethod/kubeauth/k8s_oss.go b/agent/consul/authmethod/kubeauth/k8s_oss.go index f87ca502f..b3d74361e 100644 --- a/agent/consul/authmethod/kubeauth/k8s_oss.go +++ b/agent/consul/authmethod/kubeauth/k8s_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package kubeauth diff --git a/agent/consul/authmethod/ssoauth/sso_oss.go b/agent/consul/authmethod/ssoauth/sso_oss.go index 358d1eff5..2f6bbe12a 100644 --- a/agent/consul/authmethod/ssoauth/sso_oss.go +++ b/agent/consul/authmethod/ssoauth/sso_oss.go @@ -1,4 +1,5 @@ -//+build !consulent +//go:build !consulent +// +build !consulent package ssoauth diff --git a/agent/consul/authmethod/testauth/testing_oss.go b/agent/consul/authmethod/testauth/testing_oss.go index 5ae0c8124..a3c9b4382 100644 --- a/agent/consul/authmethod/testauth/testing_oss.go +++ b/agent/consul/authmethod/testauth/testing_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package testauth diff --git a/agent/consul/autopilot_oss.go b/agent/consul/autopilot_oss.go index 09a1f76fc..d84cd2fdf 100644 --- a/agent/consul/autopilot_oss.go +++ b/agent/consul/autopilot_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/config_oss.go b/agent/consul/config_oss.go index a07a2813b..63d3cb2a3 100644 --- a/agent/consul/config_oss.go +++ b/agent/consul/config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/discoverychain/compile_oss.go b/agent/consul/discoverychain/compile_oss.go index 51949daf2..4aa43eb27 100644 --- a/agent/consul/discoverychain/compile_oss.go +++ b/agent/consul/discoverychain/compile_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package discoverychain diff --git a/agent/consul/enterprise_config_oss.go b/agent/consul/enterprise_config_oss.go index 8cd1e7124..a58998406 100644 --- a/agent/consul/enterprise_config_oss.go +++ b/agent/consul/enterprise_config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/enterprise_server_oss_test.go b/agent/consul/enterprise_server_oss_test.go index a92e12684..46a73b6d1 100644 --- a/agent/consul/enterprise_server_oss_test.go +++ b/agent/consul/enterprise_server_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/leader_intentions_oss.go b/agent/consul/leader_intentions_oss.go index a2eefdad3..db9c742bd 100644 --- a/agent/consul/leader_intentions_oss.go +++ b/agent/consul/leader_intentions_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/leader_intentions_oss_test.go b/agent/consul/leader_intentions_oss_test.go index 58517e403..ea9b8b6a4 100644 --- a/agent/consul/leader_intentions_oss_test.go +++ b/agent/consul/leader_intentions_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/options_oss.go b/agent/consul/options_oss.go index 7e33e6cd7..0718d309f 100644 --- a/agent/consul/options_oss.go +++ b/agent/consul/options_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package consul diff --git a/agent/consul/prepared_query/walk_oss_test.go b/agent/consul/prepared_query/walk_oss_test.go index 16c9b2c57..0049a62cc 100644 --- a/agent/consul/prepared_query/walk_oss_test.go +++ b/agent/consul/prepared_query/walk_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package prepared_query diff --git a/agent/consul/state/acl_oss.go b/agent/consul/state/acl_oss.go index 25483fa3e..d7bed1d80 100644 --- a/agent/consul/state/acl_oss.go +++ b/agent/consul/state/acl_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/acl_oss_test.go b/agent/consul/state/acl_oss_test.go index 4ca8fce51..22b3c3b94 100644 --- a/agent/consul/state/acl_oss_test.go +++ b/agent/consul/state/acl_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/catalog_events_oss.go b/agent/consul/state/catalog_events_oss.go index cf5231dc9..9144c62c7 100644 --- a/agent/consul/state/catalog_events_oss.go +++ b/agent/consul/state/catalog_events_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/catalog_oss.go b/agent/consul/state/catalog_oss.go index e6700cc1a..e71d13ae3 100644 --- a/agent/consul/state/catalog_oss.go +++ b/agent/consul/state/catalog_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/catalog_oss_test.go b/agent/consul/state/catalog_oss_test.go index 5c81e671e..2813a6ee5 100644 --- a/agent/consul/state/catalog_oss_test.go +++ b/agent/consul/state/catalog_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/config_entry_intention_oss.go b/agent/consul/state/config_entry_intention_oss.go index 5caf25b38..d6fafe621 100644 --- a/agent/consul/state/config_entry_intention_oss.go +++ b/agent/consul/state/config_entry_intention_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/config_entry_oss.go b/agent/consul/state/config_entry_oss.go index e7809389d..817162d19 100644 --- a/agent/consul/state/config_entry_oss.go +++ b/agent/consul/state/config_entry_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/config_entry_oss_test.go b/agent/consul/state/config_entry_oss_test.go index b6cb4832c..1a4af3cf9 100644 --- a/agent/consul/state/config_entry_oss_test.go +++ b/agent/consul/state/config_entry_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/coordinate_oss.go b/agent/consul/state/coordinate_oss.go index 9e76f0cf9..d6b6042d7 100644 --- a/agent/consul/state/coordinate_oss.go +++ b/agent/consul/state/coordinate_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/coordinate_oss_test.go b/agent/consul/state/coordinate_oss_test.go index d7a7d805d..0bb08c1df 100644 --- a/agent/consul/state/coordinate_oss_test.go +++ b/agent/consul/state/coordinate_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/delay_oss.go b/agent/consul/state/delay_oss.go index 96aa2d9c3..41b9a0405 100644 --- a/agent/consul/state/delay_oss.go +++ b/agent/consul/state/delay_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/intention_oss.go b/agent/consul/state/intention_oss.go index a06949d42..e6872ab5b 100644 --- a/agent/consul/state/intention_oss.go +++ b/agent/consul/state/intention_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/kvs_oss_test.go b/agent/consul/state/kvs_oss_test.go index b08784130..4ec7ac7a3 100644 --- a/agent/consul/state/kvs_oss_test.go +++ b/agent/consul/state/kvs_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/schema_oss_test.go b/agent/consul/state/schema_oss_test.go index 69129472b..77581d0d9 100644 --- a/agent/consul/state/schema_oss_test.go +++ b/agent/consul/state/schema_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/state_store_oss_test.go b/agent/consul/state/state_store_oss_test.go index 794dfac43..99f6d2950 100644 --- a/agent/consul/state/state_store_oss_test.go +++ b/agent/consul/state/state_store_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/state/usage_oss.go b/agent/consul/state/usage_oss.go index cdefd9e55..c8975be3b 100644 --- a/agent/consul/state/usage_oss.go +++ b/agent/consul/state/usage_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package state diff --git a/agent/consul/usagemetrics/usagemetrics_oss.go b/agent/consul/usagemetrics/usagemetrics_oss.go index 6376cce88..661fd6d34 100644 --- a/agent/consul/usagemetrics/usagemetrics_oss.go +++ b/agent/consul/usagemetrics/usagemetrics_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package usagemetrics diff --git a/agent/consul/usagemetrics/usagemetrics_oss_test.go b/agent/consul/usagemetrics/usagemetrics_oss_test.go index 94be9f632..4d90a84a9 100644 --- a/agent/consul/usagemetrics/usagemetrics_oss_test.go +++ b/agent/consul/usagemetrics/usagemetrics_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package usagemetrics diff --git a/agent/dns_oss.go b/agent/dns_oss.go index 47b68bae0..1328195c8 100644 --- a/agent/dns_oss.go +++ b/agent/dns_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/enterprise_delegate_oss.go b/agent/enterprise_delegate_oss.go index c7e1921aa..876c8837a 100644 --- a/agent/enterprise_delegate_oss.go +++ b/agent/enterprise_delegate_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/exec/exec_unix.go b/agent/exec/exec_unix.go index 3dddd1941..0bbdad8c5 100644 --- a/agent/exec/exec_unix.go +++ b/agent/exec/exec_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package exec diff --git a/agent/exec/exec_windows.go b/agent/exec/exec_windows.go index 851b1d4cf..bb96e72c3 100644 --- a/agent/exec/exec_windows.go +++ b/agent/exec/exec_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package exec diff --git a/agent/http_oss.go b/agent/http_oss.go index 79840a6d1..797070ea1 100644 --- a/agent/http_oss.go +++ b/agent/http_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/intentions_endpoint_oss_test.go b/agent/intentions_endpoint_oss_test.go index f5bd381aa..eb04d978b 100644 --- a/agent/intentions_endpoint_oss_test.go +++ b/agent/intentions_endpoint_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/operator_endpoint_oss.go b/agent/operator_endpoint_oss.go index ff87332b6..9367cc367 100644 --- a/agent/operator_endpoint_oss.go +++ b/agent/operator_endpoint_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/proxycfg/mesh_gateway_oss.go b/agent/proxycfg/mesh_gateway_oss.go index e1b2113c9..b32884452 100644 --- a/agent/proxycfg/mesh_gateway_oss.go +++ b/agent/proxycfg/mesh_gateway_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package proxycfg diff --git a/agent/setup_oss.go b/agent/setup_oss.go index a0a23c19c..9fd22210e 100644 --- a/agent/setup_oss.go +++ b/agent/setup_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/signal_unix.go b/agent/signal_unix.go index 2768a5588..a41e16a67 100644 --- a/agent/signal_unix.go +++ b/agent/signal_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package agent diff --git a/agent/signal_windows.go b/agent/signal_windows.go index 3e5b8d724..ba3d0fde9 100644 --- a/agent/signal_windows.go +++ b/agent/signal_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package agent diff --git a/agent/structs/acl_oss.go b/agent/structs/acl_oss.go index d12201033..353c68256 100644 --- a/agent/structs/acl_oss.go +++ b/agent/structs/acl_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/autopilot_oss.go b/agent/structs/autopilot_oss.go index 56f6ee7e8..a495c26a0 100644 --- a/agent/structs/autopilot_oss.go +++ b/agent/structs/autopilot_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/catalog_oss.go b/agent/structs/catalog_oss.go index 3c02d1ebc..8165ffc42 100644 --- a/agent/structs/catalog_oss.go +++ b/agent/structs/catalog_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/config_entry_discoverychain_oss.go b/agent/structs/config_entry_discoverychain_oss.go index 17f8b8473..cd22c9686 100644 --- a/agent/structs/config_entry_discoverychain_oss.go +++ b/agent/structs/config_entry_discoverychain_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/config_entry_intentions_oss.go b/agent/structs/config_entry_intentions_oss.go index 90a113a43..d2edadd27 100644 --- a/agent/structs/config_entry_intentions_oss.go +++ b/agent/structs/config_entry_intentions_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/config_entry_mesh_oss.go b/agent/structs/config_entry_mesh_oss.go index 8826c5181..087edc8e5 100644 --- a/agent/structs/config_entry_mesh_oss.go +++ b/agent/structs/config_entry_mesh_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/config_entry_oss.go b/agent/structs/config_entry_oss.go index 133d697c1..c338bdcba 100644 --- a/agent/structs/config_entry_oss.go +++ b/agent/structs/config_entry_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/config_entry_oss_test.go b/agent/structs/config_entry_oss_test.go index 8e2cc13e7..fbf0a9ebd 100644 --- a/agent/structs/config_entry_oss_test.go +++ b/agent/structs/config_entry_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/connect_oss.go b/agent/structs/connect_oss.go index 30e168104..ac4a6405f 100644 --- a/agent/structs/connect_oss.go +++ b/agent/structs/connect_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/connect_proxy_config_oss.go b/agent/structs/connect_proxy_config_oss.go index d930420fa..21dead1e7 100644 --- a/agent/structs/connect_proxy_config_oss.go +++ b/agent/structs/connect_proxy_config_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/discovery_chain_oss.go b/agent/structs/discovery_chain_oss.go index f8c44ac99..3b7f091c5 100644 --- a/agent/structs/discovery_chain_oss.go +++ b/agent/structs/discovery_chain_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/intention_oss.go b/agent/structs/intention_oss.go index 0c445b0a8..11a57e07d 100644 --- a/agent/structs/intention_oss.go +++ b/agent/structs/intention_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/sanitize_oss.go b/agent/structs/sanitize_oss.go index 4e0c0b99f..2834ebf59 100644 --- a/agent/structs/sanitize_oss.go +++ b/agent/structs/sanitize_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/structs_oss.go b/agent/structs/structs_oss.go index aa43c8fab..a003adc85 100644 --- a/agent/structs/structs_oss.go +++ b/agent/structs/structs_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/structs/structs_oss_test.go b/agent/structs/structs_oss_test.go index 94793e268..28b6e3797 100644 --- a/agent/structs/structs_oss_test.go +++ b/agent/structs/structs_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package structs diff --git a/agent/token/store_oss.go b/agent/token/store_oss.go index 16123052e..ef8b5336d 100644 --- a/agent/token/store_oss.go +++ b/agent/token/store_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package token diff --git a/agent/ui_endpoint_oss_test.go b/agent/ui_endpoint_oss_test.go index fc2f01814..2022c32c6 100644 --- a/agent/ui_endpoint_oss_test.go +++ b/agent/ui_endpoint_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package agent diff --git a/agent/xds/net_fallback.go b/agent/xds/net_fallback.go index 08857991b..a09fc1498 100644 --- a/agent/xds/net_fallback.go +++ b/agent/xds/net_fallback.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package xds diff --git a/agent/xds/net_linux.go b/agent/xds/net_linux.go index 743f756cb..1be5d80c3 100644 --- a/agent/xds/net_linux.go +++ b/agent/xds/net_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package xds diff --git a/agent/xds/server_oss.go b/agent/xds/server_oss.go index ef5adcec1..a9a01908d 100644 --- a/agent/xds/server_oss.go +++ b/agent/xds/server_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package xds diff --git a/api/namespace_test.go b/api/namespace_test.go index f8edd992d..68bbde5a8 100644 --- a/api/namespace_test.go +++ b/api/namespace_test.go @@ -1,3 +1,4 @@ +//go:build consulent // +build consulent package api diff --git a/api/oss_test.go b/api/oss_test.go index f1e25d9f9..7006385f7 100644 --- a/api/oss_test.go +++ b/api/oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package api diff --git a/command/acl/authmethod/create/authmethod_create_oss.go b/command/acl/authmethod/create/authmethod_create_oss.go index 7fc34f29a..0df5e8efd 100644 --- a/command/acl/authmethod/create/authmethod_create_oss.go +++ b/command/acl/authmethod/create/authmethod_create_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package authmethodcreate diff --git a/command/acl/authmethod/update/authmethod_update_oss.go b/command/acl/authmethod/update/authmethod_update_oss.go index 240904c4e..e72289ab3 100644 --- a/command/acl/authmethod/update/authmethod_update_oss.go +++ b/command/acl/authmethod/update/authmethod_update_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package authmethodupdate diff --git a/command/catalog/helpers_oss.go b/command/catalog/helpers_oss.go index 1469bfd3c..bc70b3358 100644 --- a/command/catalog/helpers_oss.go +++ b/command/catalog/helpers_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package catalog diff --git a/command/connect/envoy/envoy_oss_test.go b/command/connect/envoy/envoy_oss_test.go index 3c519cd46..6bcd5581d 100644 --- a/command/connect/envoy/envoy_oss_test.go +++ b/command/connect/envoy/envoy_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package envoy diff --git a/command/connect/envoy/exec_test.go b/command/connect/envoy/exec_test.go index 5ee29d147..e381a488b 100644 --- a/command/connect/envoy/exec_test.go +++ b/command/connect/envoy/exec_test.go @@ -1,3 +1,4 @@ +//go:build linux || darwin // +build linux darwin package envoy diff --git a/command/connect/envoy/exec_unix.go b/command/connect/envoy/exec_unix.go index e64a0098a..9ab83eecf 100644 --- a/command/connect/envoy/exec_unix.go +++ b/command/connect/envoy/exec_unix.go @@ -1,3 +1,4 @@ +//go:build linux || darwin // +build linux darwin package envoy diff --git a/command/connect/envoy/exec_unsupported.go b/command/connect/envoy/exec_unsupported.go index 92771b443..d22b4c8cd 100644 --- a/command/connect/envoy/exec_unsupported.go +++ b/command/connect/envoy/exec_unsupported.go @@ -1,3 +1,4 @@ +//go:build !linux && !darwin // +build !linux,!darwin package envoy diff --git a/command/lock/util_unix.go b/command/lock/util_unix.go index 99ba9247c..cc6902ff5 100644 --- a/command/lock/util_unix.go +++ b/command/lock/util_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package lock diff --git a/command/lock/util_windows.go b/command/lock/util_windows.go index b7d2c133c..14547e345 100644 --- a/command/lock/util_windows.go +++ b/command/lock/util_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package lock diff --git a/command/login/login_oss.go b/command/login/login_oss.go index c2fce854f..22466d56f 100644 --- a/command/login/login_oss.go +++ b/command/login/login_oss.go @@ -1,4 +1,5 @@ -//+build !consulent +//go:build !consulent +// +build !consulent package login diff --git a/proto/pbcommon/common_oss.go b/proto/pbcommon/common_oss.go index 024f207fa..35588b673 100644 --- a/proto/pbcommon/common_oss.go +++ b/proto/pbcommon/common_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package pbcommon diff --git a/proto/pbservice/convert_oss.go b/proto/pbservice/convert_oss.go index f49a84ac7..215a2dc5f 100644 --- a/proto/pbservice/convert_oss.go +++ b/proto/pbservice/convert_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package pbservice diff --git a/proto/pbservice/convert_oss_test.go b/proto/pbservice/convert_oss_test.go index 7848e04d0..17717f058 100644 --- a/proto/pbservice/convert_oss_test.go +++ b/proto/pbservice/convert_oss_test.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package pbservice diff --git a/sdk/freeport/ephemeral_darwin.go b/sdk/freeport/ephemeral_darwin.go index 2449041c5..13d366af6 100644 --- a/sdk/freeport/ephemeral_darwin.go +++ b/sdk/freeport/ephemeral_darwin.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package freeport diff --git a/sdk/freeport/ephemeral_darwin_test.go b/sdk/freeport/ephemeral_darwin_test.go index e602f474a..10d0b9bba 100644 --- a/sdk/freeport/ephemeral_darwin_test.go +++ b/sdk/freeport/ephemeral_darwin_test.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package freeport diff --git a/sdk/freeport/ephemeral_fallback.go b/sdk/freeport/ephemeral_fallback.go index 4e3e2b386..d250ce64f 100644 --- a/sdk/freeport/ephemeral_fallback.go +++ b/sdk/freeport/ephemeral_fallback.go @@ -1,4 +1,5 @@ -//+build !linux,!darwin +//go:build !linux && !darwin +// +build !linux,!darwin package freeport diff --git a/sdk/freeport/ephemeral_linux.go b/sdk/freeport/ephemeral_linux.go index 88cc62a88..55200ad2a 100644 --- a/sdk/freeport/ephemeral_linux.go +++ b/sdk/freeport/ephemeral_linux.go @@ -1,4 +1,5 @@ -//+build linux +//go:build linux +// +build linux package freeport diff --git a/sdk/freeport/ephemeral_linux_test.go b/sdk/freeport/ephemeral_linux_test.go index 2d9385df4..cd4e9db34 100644 --- a/sdk/freeport/ephemeral_linux_test.go +++ b/sdk/freeport/ephemeral_linux_test.go @@ -1,4 +1,5 @@ -//+build linux +//go:build linux +// +build linux package freeport diff --git a/sdk/freeport/systemlimit.go b/sdk/freeport/systemlimit.go index fdd902142..2db29870d 100644 --- a/sdk/freeport/systemlimit.go +++ b/sdk/freeport/systemlimit.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package freeport diff --git a/sdk/freeport/systemlimit_windows.go b/sdk/freeport/systemlimit_windows.go index eec211957..867c64af3 100644 --- a/sdk/freeport/systemlimit_windows.go +++ b/sdk/freeport/systemlimit_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package freeport diff --git a/sdk/iptables/iptables_executor_linux.go b/sdk/iptables/iptables_executor_linux.go index 224e088eb..5c25d5bea 100644 --- a/sdk/iptables/iptables_executor_linux.go +++ b/sdk/iptables/iptables_executor_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package iptables diff --git a/sdk/iptables/iptables_executor_unsupported.go b/sdk/iptables/iptables_executor_unsupported.go index b26f39f67..3708328aa 100644 --- a/sdk/iptables/iptables_executor_unsupported.go +++ b/sdk/iptables/iptables_executor_unsupported.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package iptables diff --git a/sentinel/sentinel_oss.go b/sentinel/sentinel_oss.go index ce7671b2b..d4323b3ab 100644 --- a/sentinel/sentinel_oss.go +++ b/sentinel/sentinel_oss.go @@ -1,3 +1,4 @@ +//go:build !consulent // +build !consulent package sentinel diff --git a/service_os/service_windows.go b/service_os/service_windows.go index d7fc245f5..80d2e9165 100644 --- a/service_os/service_windows.go +++ b/service_os/service_windows.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows package service_os diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go index 25f955829..6b60efab5 100644 --- a/test/integration/connect/envoy/main_test.go +++ b/test/integration/connect/envoy/main_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package envoy