diff --git a/acl/acl_oss.go b/acl/acl_oss.go index df54e3ed06..9c62c5bdba 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 cf33ea268f..6870a042d3 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 0e1c20f075..4829048a86 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 9b7cb07f89..cff74c7325 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 4a4fc84db3..a5d6828b63 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 a04603731d..2a1ace1ab8 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 1c4dd44285..2c6585a4b4 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 fff8ef26e2..b9b1f91dc0 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 1ce93c6e76..95b38aa056 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 2d6092f379..6a318644fb 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 876d090d54..a8048954a1 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 da227484f6..0518753bbb 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 2045e85eeb..07de1e7935 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 cac95de9dc..93645410d1 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 29774bf679..7848991f21 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 3616721926..da27ab476a 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 0cde4ad54c..528cb7d851 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 f78bea3000..ce6e8d44ce 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 3d2b7ba308..99a1be04db 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 95b1599ddf..7e061b8e56 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 57f52d9275..d98e27bcb2 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 bd840e58cc..f1ff5e7f5b 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 6cd8817b2b..1e6e1822fb 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 fcc9135dc2..0cec03ccdb 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 4e9a87ffe6..2179ac2df4 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 ed9c6eb671..d7a80c71ea 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 de224be855..52b4a0964c 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 0936d680a2..1ae6f18c3a 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 8bfc387849..37ebc0bf3e 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 3838ef955a..8270f96c26 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 a844469e59..069df26168 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 7d68a1639d..b2f28da9ab 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 61788f1836..6aac4629d3 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 ba24ee6776..c42064fc1f 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 773e2a04d9..917696105a 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 97aa4e4390..a3ed18aea1 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 ca0b730466..0e5cc5a7f4 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 f87ca502fe..b3d74361e4 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 358d1eff5c..2f6bbe12ac 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 5ae0c81243..a3c9b4382c 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 09a1f76fcd..d84cd2fdfb 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 a07a2813b3..63d3cb2a3f 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 51949daf2b..4aa43eb275 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 8cd1e71245..a589984060 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 a92e126843..46a73b6d13 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 a2eefdad34..db9c742bd1 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 58517e4032..ea9b8b6a4f 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 7e33e6cd78..0718d309f3 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 16c9b2c577..0049a62ccc 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 25483fa3e1..d7bed1d804 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 4ca8fce515..22b3c3b94a 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 cf5231dc9a..9144c62c70 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 e6700cc1a9..e71d13ae35 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 5c81e671ef..2813a6ee54 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 5caf25b380..d6fafe6211 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 e7809389d6..817162d190 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 b6cb4832ce..1a4af3cf91 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 9e76f0cf9e..d6b6042d71 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 d7a7d805d1..0bb08c1df0 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 96aa2d9c30..41b9a0405a 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 a06949d427..e6872ab5bd 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 b08784130a..4ec7ac7a3d 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 69129472b4..77581d0d97 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 794dfac431..99f6d2950a 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 cdefd9e553..c8975be3b1 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 6376cce882..661fd6d34f 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 94be9f6327..4d90a84a99 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 47b68bae08..1328195c87 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 c7e1921aa9..876c8837af 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 3dddd19414..0bbdad8c59 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 851b1d4cf8..bb96e72c3d 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 79840a6d12..797070ea10 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 f5bd381aa9..eb04d978bd 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 ff87332b62..9367cc367a 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 e1b2113c9f..b32884452e 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 a0a23c19c4..9fd22210e2 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 2768a55883..a41e16a678 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 3e5b8d7248..ba3d0fde98 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 d122010330..353c682568 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 56f6ee7e88..a495c26a07 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 3c02d1ebc5..8165ffc426 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 17f8b8473f..cd22c96863 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 90a113a437..d2edadd271 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 8826c5181b..087edc8e56 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 133d697c11..c338bdcba1 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 8e2cc13e78..fbf0a9ebd3 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 30e1681047..ac4a6405f4 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 d930420fab..21dead1e7a 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 f8c44ac997..3b7f091c5c 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 0c445b0a89..11a57e07d3 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 4e0c0b99f5..2834ebf59f 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 aa43c8fabb..a003adc857 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 94793e2680..28b6e37970 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 16123052ef..ef8b5336d2 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 fc2f018145..2022c32c6b 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 08857991b9..a09fc14983 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 743f756cb8..1be5d80c30 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 ef5adcec15..a9a01908de 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 f8edd992d9..68bbde5a8c 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 f1e25d9f94..7006385f79 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 7fc34f29ac..0df5e8efdc 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 240904c4e9..e72289ab33 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 1469bfd3c2..bc70b3358b 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 3c519cd465..6bcd5581dc 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 5ee29d147c..e381a488b7 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 e64a0098ae..9ab83eecfe 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 92771b4435..d22b4c8cdf 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 99ba9247c7..cc6902ff5c 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 b7d2c133cc..14547e345b 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 c2fce854fe..22466d56f2 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 024f207faf..35588b6730 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 f49a84ac7f..215a2dc5f6 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 7848e04d02..17717f0588 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 2449041c5e..13d366af65 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 e602f474ad..10d0b9bba9 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 4e3e2b3866..d250ce64fa 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 88cc62a886..55200ad2ac 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 2d9385df4b..cd4e9db342 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 fdd9021424..2db29870da 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 eec2119576..867c64af3a 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 224e088eb7..5c25d5beae 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 b26f39f67e..3708328aa6 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 ce7671b2bc..d4323b3abd 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 d7fc245f52..80d2e9165b 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 25f9558296..6b60efab5d 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