diff --git a/acl/acl_ce.go b/acl/acl_ce.go index 76e77f3b8f..7d2b8513b8 100644 --- a/acl/acl_ce.go +++ b/acl/acl_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/authorizer_ce.go b/acl/authorizer_ce.go index 06ec22dae7..dafac8692a 100644 --- a/acl/authorizer_ce.go +++ b/acl/authorizer_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/enterprisemeta_ce.go b/acl/enterprisemeta_ce.go index 791776e09b..7262e79b6d 100644 --- a/acl/enterprisemeta_ce.go +++ b/acl/enterprisemeta_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/errors_ce.go b/acl/errors_ce.go index 57b0eb3247..e342137b53 100644 --- a/acl/errors_ce.go +++ b/acl/errors_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/policy_authorizer_ce.go b/acl/policy_authorizer_ce.go index ccdb2e7585..34f8f1bf94 100644 --- a/acl/policy_authorizer_ce.go +++ b/acl/policy_authorizer_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/policy_ce.go b/acl/policy_ce.go index ed7eed9917..fe139ef7ab 100644 --- a/acl/policy_ce.go +++ b/acl/policy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/acl/policy_merger_ce.go b/acl/policy_merger_ce.go index 207051f348..4738314a6c 100644 --- a/acl/policy_merger_ce.go +++ b/acl/policy_merger_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package acl diff --git a/agent/acl_ce.go b/agent/acl_ce.go index 32d076fe1e..4ce9bb0064 100644 --- a/agent/acl_ce.go +++ b/agent/acl_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/agent_ce.go b/agent/agent_ce.go index 37a1804fe2..a4a6cbf809 100644 --- a/agent/agent_ce.go +++ b/agent/agent_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/agent_ce_test.go b/agent/agent_ce_test.go index 07882c7b1e..f9eed9018b 100644 --- a/agent/agent_ce_test.go +++ b/agent/agent_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/agent_endpoint_ce.go b/agent/agent_endpoint_ce.go index cf2984ab5f..657d5122fe 100644 --- a/agent/agent_endpoint_ce.go +++ b/agent/agent_endpoint_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/agent_endpoint_ce_test.go b/agent/agent_endpoint_ce_test.go index 6608f40f40..1b1dc86683 100644 --- a/agent/agent_endpoint_ce_test.go +++ b/agent/agent_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/auto-config/auto_config_ce.go b/agent/auto-config/auto_config_ce.go index 5e5d799634..9ac615847e 100644 --- a/agent/auto-config/auto_config_ce.go +++ b/agent/auto-config/auto_config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package autoconf diff --git a/agent/auto-config/auto_config_ce_test.go b/agent/auto-config/auto_config_ce_test.go index ff7cbf7472..a38b0f155e 100644 --- a/agent/auto-config/auto_config_ce_test.go +++ b/agent/auto-config/auto_config_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package autoconf diff --git a/agent/auto-config/config_ce.go b/agent/auto-config/config_ce.go index 6e7e470f29..5d699f32a4 100644 --- a/agent/auto-config/config_ce.go +++ b/agent/auto-config/config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package autoconf diff --git a/agent/auto-config/mock_ce_test.go b/agent/auto-config/mock_ce_test.go index cb741b6d47..ea416a3de8 100644 --- a/agent/auto-config/mock_ce_test.go +++ b/agent/auto-config/mock_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package autoconf diff --git a/agent/catalog_endpoint_ce.go b/agent/catalog_endpoint_ce.go index a3c8595fbe..68433e2196 100644 --- a/agent/catalog_endpoint_ce.go +++ b/agent/catalog_endpoint_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/checks/check_windows_test.go b/agent/checks/check_windows_test.go index 05643539be..2f6d40f243 100644 --- a/agent/checks/check_windows_test.go +++ b/agent/checks/check_windows_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package checks diff --git a/agent/checks/docker_unix.go b/agent/checks/docker_unix.go index 976344aa82..6d169f2bbc 100644 --- a/agent/checks/docker_unix.go +++ b/agent/checks/docker_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package checks diff --git a/agent/checks/os_service_unix.go b/agent/checks/os_service_unix.go index a02c8b54a7..4c61ac0bab 100644 --- a/agent/checks/os_service_unix.go +++ b/agent/checks/os_service_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package checks diff --git a/agent/checks/os_service_windows.go b/agent/checks/os_service_windows.go index fd9cc1bd33..f142ea698e 100644 --- a/agent/checks/os_service_windows.go +++ b/agent/checks/os_service_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package checks diff --git a/agent/config/builder_ce.go b/agent/config/builder_ce.go index ab7e1ece5a..068e02f0ce 100644 --- a/agent/config/builder_ce.go +++ b/agent/config/builder_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/builder_ce_test.go b/agent/config/builder_ce_test.go index 3b3a220278..9c3114ddc1 100644 --- a/agent/config/builder_ce_test.go +++ b/agent/config/builder_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/config_ce.go b/agent/config/config_ce.go index aaf743919b..a60a49be25 100644 --- a/agent/config/config_ce.go +++ b/agent/config/config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/default_ce.go b/agent/config/default_ce.go index 4f5adf0de7..34caf4b52b 100644 --- a/agent/config/default_ce.go +++ b/agent/config/default_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/limits.go b/agent/config/limits.go index 46b6d45a1e..baad156e63 100644 --- a/agent/config/limits.go +++ b/agent/config/limits.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package config diff --git a/agent/config/limits_windows.go b/agent/config/limits_windows.go index 538d84721f..f0efc27eaf 100644 --- a/agent/config/limits_windows.go +++ b/agent/config/limits_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package config diff --git a/agent/config/runtime_ce.go b/agent/config/runtime_ce.go index ccc139a86b..4fb54ae079 100644 --- a/agent/config/runtime_ce.go +++ b/agent/config/runtime_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/runtime_ce_test.go b/agent/config/runtime_ce_test.go index bab33fca55..af6bb1f8ba 100644 --- a/agent/config/runtime_ce_test.go +++ b/agent/config/runtime_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/segment_ce.go b/agent/config/segment_ce.go index 3baee7076b..78ba9b87c7 100644 --- a/agent/config/segment_ce.go +++ b/agent/config/segment_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/config/segment_ce_test.go b/agent/config/segment_ce_test.go index 20e6564778..f587813381 100644 --- a/agent/config/segment_ce_test.go +++ b/agent/config/segment_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package config diff --git a/agent/connect/uri_agent_ce.go b/agent/connect/uri_agent_ce.go index 5cfad14a7d..70e775f6e4 100644 --- a/agent/connect/uri_agent_ce.go +++ b/agent/connect/uri_agent_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_agent_ce_test.go b/agent/connect/uri_agent_ce_test.go index 241d804841..026d4bc173 100644 --- a/agent/connect/uri_agent_ce_test.go +++ b/agent/connect/uri_agent_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_mesh_gateway_ce.go b/agent/connect/uri_mesh_gateway_ce.go index a0c0cdba05..48c43326f1 100644 --- a/agent/connect/uri_mesh_gateway_ce.go +++ b/agent/connect/uri_mesh_gateway_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_mesh_gateway_ce_test.go b/agent/connect/uri_mesh_gateway_ce_test.go index 4a8e8ada37..bb4579cdc6 100644 --- a/agent/connect/uri_mesh_gateway_ce_test.go +++ b/agent/connect/uri_mesh_gateway_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_service_ce.go b/agent/connect/uri_service_ce.go index a1e1dd43c3..6aafde36a6 100644 --- a/agent/connect/uri_service_ce.go +++ b/agent/connect/uri_service_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_service_ce_test.go b/agent/connect/uri_service_ce_test.go index 774632063e..8368454db5 100644 --- a/agent/connect/uri_service_ce_test.go +++ b/agent/connect/uri_service_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_workload_identity_ce.go b/agent/connect/uri_workload_identity_ce.go index f8bf2545d3..99544b014e 100644 --- a/agent/connect/uri_workload_identity_ce.go +++ b/agent/connect/uri_workload_identity_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/connect/uri_workload_identity_ce_test.go b/agent/connect/uri_workload_identity_ce_test.go index 980e88075d..17a2cc3d4a 100644 --- a/agent/connect/uri_workload_identity_ce_test.go +++ b/agent/connect/uri_workload_identity_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package connect diff --git a/agent/consul/acl_authmethod_ce.go b/agent/consul/acl_authmethod_ce.go index 0587d0dc2a..28802e77e6 100644 --- a/agent/consul/acl_authmethod_ce.go +++ b/agent/consul/acl_authmethod_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/acl_ce.go b/agent/consul/acl_ce.go index 7e55a90ca9..a21514f3bb 100644 --- a/agent/consul/acl_ce.go +++ b/agent/consul/acl_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/acl_ce_test.go b/agent/consul/acl_ce_test.go index 27f55a0efc..5078ab41af 100644 --- a/agent/consul/acl_ce_test.go +++ b/agent/consul/acl_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/acl_endpoint_ce.go b/agent/consul/acl_endpoint_ce.go index 75a6c84ed3..13d00a1694 100644 --- a/agent/consul/acl_endpoint_ce.go +++ b/agent/consul/acl_endpoint_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/acl_server_ce.go b/agent/consul/acl_server_ce.go index bd7f34e776..5adb8be572 100644 --- a/agent/consul/acl_server_ce.go +++ b/agent/consul/acl_server_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/auth/binder_ce.go b/agent/consul/auth/binder_ce.go index 19528ffedb..2b1a474a40 100644 --- a/agent/consul/auth/binder_ce.go +++ b/agent/consul/auth/binder_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package auth diff --git a/agent/consul/auth/token_writer_ce.go b/agent/consul/auth/token_writer_ce.go index 224eee669a..fe8840138a 100644 --- a/agent/consul/auth/token_writer_ce.go +++ b/agent/consul/auth/token_writer_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package auth diff --git a/agent/consul/authmethod/authmethods_ce.go b/agent/consul/authmethod/authmethods_ce.go index 8eb430401a..38b27b7011 100644 --- a/agent/consul/authmethod/authmethods_ce.go +++ b/agent/consul/authmethod/authmethods_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package authmethod diff --git a/agent/consul/authmethod/kubeauth/k8s_ce.go b/agent/consul/authmethod/kubeauth/k8s_ce.go index e8ad448506..b180836948 100644 --- a/agent/consul/authmethod/kubeauth/k8s_ce.go +++ b/agent/consul/authmethod/kubeauth/k8s_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package kubeauth diff --git a/agent/consul/authmethod/ssoauth/sso_ce.go b/agent/consul/authmethod/ssoauth/sso_ce.go index c8f760049f..504329d200 100644 --- a/agent/consul/authmethod/ssoauth/sso_ce.go +++ b/agent/consul/authmethod/ssoauth/sso_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package ssoauth diff --git a/agent/consul/authmethod/testauth/testing_ce.go b/agent/consul/authmethod/testauth/testing_ce.go index 6f38c02502..460f30fe4f 100644 --- a/agent/consul/authmethod/testauth/testing_ce.go +++ b/agent/consul/authmethod/testauth/testing_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package testauth diff --git a/agent/consul/autopilot_ce.go b/agent/consul/autopilot_ce.go index e20b31a626..4a95e69e23 100644 --- a/agent/consul/autopilot_ce.go +++ b/agent/consul/autopilot_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/config_ce.go b/agent/consul/config_ce.go index bed1211696..b65a518615 100644 --- a/agent/consul/config_ce.go +++ b/agent/consul/config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/discoverychain/compile_ce.go b/agent/consul/discoverychain/compile_ce.go index 2c280120b5..d407e4cc1c 100644 --- a/agent/consul/discoverychain/compile_ce.go +++ b/agent/consul/discoverychain/compile_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package discoverychain diff --git a/agent/consul/enterprise_client_ce.go b/agent/consul/enterprise_client_ce.go index b19705f65b..585c84d91d 100644 --- a/agent/consul/enterprise_client_ce.go +++ b/agent/consul/enterprise_client_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/enterprise_config_ce.go b/agent/consul/enterprise_config_ce.go index d057012af1..cb26252e59 100644 --- a/agent/consul/enterprise_config_ce.go +++ b/agent/consul/enterprise_config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/enterprise_server_ce.go b/agent/consul/enterprise_server_ce.go index d14cb7bac3..61eb03cd11 100644 --- a/agent/consul/enterprise_server_ce.go +++ b/agent/consul/enterprise_server_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/enterprise_server_ce_test.go b/agent/consul/enterprise_server_ce_test.go index bd49bae1b1..1a3622d5d7 100644 --- a/agent/consul/enterprise_server_ce_test.go +++ b/agent/consul/enterprise_server_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/fsm/snapshot_ce_test.go b/agent/consul/fsm/snapshot_ce_test.go index 5bc389dffa..70ab2000fa 100644 --- a/agent/consul/fsm/snapshot_ce_test.go +++ b/agent/consul/fsm/snapshot_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package fsm diff --git a/agent/consul/gateways/controller_gateways_ce.go b/agent/consul/gateways/controller_gateways_ce.go index 44f779d4b4..4e2aa9a523 100644 --- a/agent/consul/gateways/controller_gateways_ce.go +++ b/agent/consul/gateways/controller_gateways_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package gateways diff --git a/agent/consul/leader_ce_test.go b/agent/consul/leader_ce_test.go index 9e5e2d34ff..8988adb9f7 100644 --- a/agent/consul/leader_ce_test.go +++ b/agent/consul/leader_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/leader_intentions_ce.go b/agent/consul/leader_intentions_ce.go index 98acecf918..2d997b2329 100644 --- a/agent/consul/leader_intentions_ce.go +++ b/agent/consul/leader_intentions_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/leader_intentions_ce_test.go b/agent/consul/leader_intentions_ce_test.go index 3e689d40a8..e97c45a320 100644 --- a/agent/consul/leader_intentions_ce_test.go +++ b/agent/consul/leader_intentions_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/merge_ce.go b/agent/consul/merge_ce.go index 83e8f5343d..c5d8096e70 100644 --- a/agent/consul/merge_ce.go +++ b/agent/consul/merge_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/merge_ce_test.go b/agent/consul/merge_ce_test.go index 5213907d1b..e12ea660f7 100644 --- a/agent/consul/merge_ce_test.go +++ b/agent/consul/merge_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/options_ce.go b/agent/consul/options_ce.go index 0b4d04a66a..dbc8dd15ca 100644 --- a/agent/consul/options_ce.go +++ b/agent/consul/options_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/peering_backend_ce.go b/agent/consul/peering_backend_ce.go index 7b00e1907b..22b70886ab 100644 --- a/agent/consul/peering_backend_ce.go +++ b/agent/consul/peering_backend_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/peering_backend_ce_test.go b/agent/consul/peering_backend_ce_test.go index a8eae8f067..d8c4769259 100644 --- a/agent/consul/peering_backend_ce_test.go +++ b/agent/consul/peering_backend_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/prepared_query/walk_ce_test.go b/agent/consul/prepared_query/walk_ce_test.go index 8d19b951c5..00f3edb10d 100644 --- a/agent/consul/prepared_query/walk_ce_test.go +++ b/agent/consul/prepared_query/walk_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package prepared_query diff --git a/agent/consul/prepared_query_endpoint_ce.go b/agent/consul/prepared_query_endpoint_ce.go index 4f7087806c..3498b7063d 100644 --- a/agent/consul/prepared_query_endpoint_ce.go +++ b/agent/consul/prepared_query_endpoint_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/prepared_query_endpoint_ce_test.go b/agent/consul/prepared_query_endpoint_ce_test.go index 3c30daf0a9..d090fa1d84 100644 --- a/agent/consul/prepared_query_endpoint_ce_test.go +++ b/agent/consul/prepared_query_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/rate/handler_ce.go b/agent/consul/rate/handler_ce.go index b9ec451869..b0a7beb7c1 100644 --- a/agent/consul/rate/handler_ce.go +++ b/agent/consul/rate/handler_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package rate diff --git a/agent/consul/reporting/reporting_ce.go b/agent/consul/reporting/reporting_ce.go index 669ca264af..b9eb978b8c 100644 --- a/agent/consul/reporting/reporting_ce.go +++ b/agent/consul/reporting/reporting_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package reporting diff --git a/agent/consul/segment_ce.go b/agent/consul/segment_ce.go index fd3fce459f..25e941ced0 100644 --- a/agent/consul/segment_ce.go +++ b/agent/consul/segment_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/server_ce.go b/agent/consul/server_ce.go index ab586a0292..fb3e55e765 100644 --- a/agent/consul/server_ce.go +++ b/agent/consul/server_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/server_ce_test.go b/agent/consul/server_ce_test.go index 472560f2b9..0b75cda1a5 100644 --- a/agent/consul/server_ce_test.go +++ b/agent/consul/server_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/state/acl_ce.go b/agent/consul/state/acl_ce.go index e8f6450e09..9e1dd7ebdb 100644 --- a/agent/consul/state/acl_ce.go +++ b/agent/consul/state/acl_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/acl_ce_test.go b/agent/consul/state/acl_ce_test.go index 38cf2ebcda..77b5bf3adb 100644 --- a/agent/consul/state/acl_ce_test.go +++ b/agent/consul/state/acl_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/catalog_ce.go b/agent/consul/state/catalog_ce.go index 1c8062567d..8068b7f070 100644 --- a/agent/consul/state/catalog_ce.go +++ b/agent/consul/state/catalog_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/catalog_ce_test.go b/agent/consul/state/catalog_ce_test.go index f0ad6ffbc9..d1050ecfa0 100644 --- a/agent/consul/state/catalog_ce_test.go +++ b/agent/consul/state/catalog_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/catalog_events_ce.go b/agent/consul/state/catalog_events_ce.go index 25e9dc149b..5b1559b22f 100644 --- a/agent/consul/state/catalog_events_ce.go +++ b/agent/consul/state/catalog_events_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/catalog_events_ce_test.go b/agent/consul/state/catalog_events_ce_test.go index 75f9a6ddeb..6945b5c476 100644 --- a/agent/consul/state/catalog_events_ce_test.go +++ b/agent/consul/state/catalog_events_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_ce.go b/agent/consul/state/config_entry_ce.go index 091a5be157..1f70baf19b 100644 --- a/agent/consul/state/config_entry_ce.go +++ b/agent/consul/state/config_entry_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_ce_test.go b/agent/consul/state/config_entry_ce_test.go index 736ede4e54..4b9103a74e 100644 --- a/agent/consul/state/config_entry_ce_test.go +++ b/agent/consul/state/config_entry_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_exported_services_ce.go b/agent/consul/state/config_entry_exported_services_ce.go index 0dfbf95ecf..aa495fb0d8 100644 --- a/agent/consul/state/config_entry_exported_services_ce.go +++ b/agent/consul/state/config_entry_exported_services_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_intention_ce.go b/agent/consul/state/config_entry_intention_ce.go index b0eb69b355..8cefdf2c3d 100644 --- a/agent/consul/state/config_entry_intention_ce.go +++ b/agent/consul/state/config_entry_intention_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_sameness_group_ce.go b/agent/consul/state/config_entry_sameness_group_ce.go index 76c285b5e3..fcff27158b 100644 --- a/agent/consul/state/config_entry_sameness_group_ce.go +++ b/agent/consul/state/config_entry_sameness_group_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/config_entry_sameness_group_ce_test.go b/agent/consul/state/config_entry_sameness_group_ce_test.go index 6397e90699..3d307238f3 100644 --- a/agent/consul/state/config_entry_sameness_group_ce_test.go +++ b/agent/consul/state/config_entry_sameness_group_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/coordinate_ce.go b/agent/consul/state/coordinate_ce.go index 05568e40b0..000c3714c7 100644 --- a/agent/consul/state/coordinate_ce.go +++ b/agent/consul/state/coordinate_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/coordinate_ce_test.go b/agent/consul/state/coordinate_ce_test.go index 520f8b5d83..b80a7b8ae8 100644 --- a/agent/consul/state/coordinate_ce_test.go +++ b/agent/consul/state/coordinate_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/delay_ce.go b/agent/consul/state/delay_ce.go index ca55c465fd..d0d2013cb0 100644 --- a/agent/consul/state/delay_ce.go +++ b/agent/consul/state/delay_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/graveyard_ce.go b/agent/consul/state/graveyard_ce.go index b02659b74c..c39a8c335e 100644 --- a/agent/consul/state/graveyard_ce.go +++ b/agent/consul/state/graveyard_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/intention_ce.go b/agent/consul/state/intention_ce.go index 43b80a47ad..33e9bbe261 100644 --- a/agent/consul/state/intention_ce.go +++ b/agent/consul/state/intention_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/kvs_ce.go b/agent/consul/state/kvs_ce.go index 6243bbd71b..69d4c28ad2 100644 --- a/agent/consul/state/kvs_ce.go +++ b/agent/consul/state/kvs_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/kvs_ce_test.go b/agent/consul/state/kvs_ce_test.go index a7a1034c6a..30e7b22e40 100644 --- a/agent/consul/state/kvs_ce_test.go +++ b/agent/consul/state/kvs_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/operations_ce.go b/agent/consul/state/operations_ce.go index acf1cd38b8..00469d6b0c 100644 --- a/agent/consul/state/operations_ce.go +++ b/agent/consul/state/operations_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/peering_ce.go b/agent/consul/state/peering_ce.go index 40e207729d..7208268948 100644 --- a/agent/consul/state/peering_ce.go +++ b/agent/consul/state/peering_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/peering_ce_test.go b/agent/consul/state/peering_ce_test.go index 927fa1c71d..88546c1785 100644 --- a/agent/consul/state/peering_ce_test.go +++ b/agent/consul/state/peering_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/query_ce.go b/agent/consul/state/query_ce.go index 178dc60b77..809f352799 100644 --- a/agent/consul/state/query_ce.go +++ b/agent/consul/state/query_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/schema_ce.go b/agent/consul/state/schema_ce.go index 15a3ec4478..7dce71a038 100644 --- a/agent/consul/state/schema_ce.go +++ b/agent/consul/state/schema_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/schema_ce_test.go b/agent/consul/state/schema_ce_test.go index eb8a1e0795..9ed597acf6 100644 --- a/agent/consul/state/schema_ce_test.go +++ b/agent/consul/state/schema_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/session_ce.go b/agent/consul/state/session_ce.go index 6bd13c0132..2fa2487854 100644 --- a/agent/consul/state/session_ce.go +++ b/agent/consul/state/session_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/state_store_ce_test.go b/agent/consul/state/state_store_ce_test.go index 81f25ed1e8..ca57cf1afa 100644 --- a/agent/consul/state/state_store_ce_test.go +++ b/agent/consul/state/state_store_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/state/usage_ce.go b/agent/consul/state/usage_ce.go index 3daad8b986..679d114232 100644 --- a/agent/consul/state/usage_ce.go +++ b/agent/consul/state/usage_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package state diff --git a/agent/consul/tenancy_bridge_ce.go b/agent/consul/tenancy_bridge_ce.go index 03f87378e7..f2938b156f 100644 --- a/agent/consul/tenancy_bridge_ce.go +++ b/agent/consul/tenancy_bridge_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package consul diff --git a/agent/consul/usagemetrics/usagemetrics_ce.go b/agent/consul/usagemetrics/usagemetrics_ce.go index 7de677cc07..71457cbb48 100644 --- a/agent/consul/usagemetrics/usagemetrics_ce.go +++ b/agent/consul/usagemetrics/usagemetrics_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package usagemetrics diff --git a/agent/consul/usagemetrics/usagemetrics_ce_test.go b/agent/consul/usagemetrics/usagemetrics_ce_test.go index df6aa1cec0..d0b7587d06 100644 --- a/agent/consul/usagemetrics/usagemetrics_ce_test.go +++ b/agent/consul/usagemetrics/usagemetrics_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package usagemetrics diff --git a/agent/dns_ce.go b/agent/dns_ce.go index f82d1a31d2..bc6216e30a 100644 --- a/agent/dns_ce.go +++ b/agent/dns_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/dns_ce_test.go b/agent/dns_ce_test.go index e9dd9a0921..976b7e7ebe 100644 --- a/agent/dns_ce_test.go +++ b/agent/dns_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/enterprise_delegate_ce.go b/agent/enterprise_delegate_ce.go index 81d41ea8fa..85128b8b3c 100644 --- a/agent/enterprise_delegate_ce.go +++ b/agent/enterprise_delegate_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/exec/exec_unix.go b/agent/exec/exec_unix.go index b31e593163..e0ec556771 100644 --- a/agent/exec/exec_unix.go +++ b/agent/exec/exec_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package exec diff --git a/agent/exec/exec_windows.go b/agent/exec/exec_windows.go index aeb9b6a847..d85ea09d78 100644 --- a/agent/exec/exec_windows.go +++ b/agent/exec/exec_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package exec diff --git a/agent/grpc-external/services/resource/server_ce.go b/agent/grpc-external/services/resource/server_ce.go index 562af97320..bc48194574 100644 --- a/agent/grpc-external/services/resource/server_ce.go +++ b/agent/grpc-external/services/resource/server_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package resource diff --git a/agent/grpc-external/services/resource/server_ce_test.go b/agent/grpc-external/services/resource/server_ce_test.go index 9e155019ca..c385b65f3c 100644 --- a/agent/grpc-external/services/resource/server_ce_test.go +++ b/agent/grpc-external/services/resource/server_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package resource diff --git a/agent/grpc-external/services/resource/testing/testing_ce.go b/agent/grpc-external/services/resource/testing/testing_ce.go index e4b6b89479..023fa5189c 100644 --- a/agent/grpc-external/services/resource/testing/testing_ce.go +++ b/agent/grpc-external/services/resource/testing/testing_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package testing diff --git a/agent/http_ce.go b/agent/http_ce.go index 09a03c7062..da6bef7237 100644 --- a/agent/http_ce.go +++ b/agent/http_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/intentions_endpoint_ce_test.go b/agent/intentions_endpoint_ce_test.go index 6b5314de09..10a540bf18 100644 --- a/agent/intentions_endpoint_ce_test.go +++ b/agent/intentions_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/operator_endpoint_ce.go b/agent/operator_endpoint_ce.go index d97e642261..3abe7bc910 100644 --- a/agent/operator_endpoint_ce.go +++ b/agent/operator_endpoint_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/operator_endpoint_ce_test.go b/agent/operator_endpoint_ce_test.go index 0086a56065..7ab918c7cc 100644 --- a/agent/operator_endpoint_ce_test.go +++ b/agent/operator_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/peering_endpoint_ce_test.go b/agent/peering_endpoint_ce_test.go index f435ca3310..57c3d5289e 100644 --- a/agent/peering_endpoint_ce_test.go +++ b/agent/peering_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/proxycfg-glue/intentions_ce.go b/agent/proxycfg-glue/intentions_ce.go index d4bdef266e..e7efb978df 100644 --- a/agent/proxycfg-glue/intentions_ce.go +++ b/agent/proxycfg-glue/intentions_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfgglue diff --git a/agent/proxycfg-sources/catalog/config_source_oss.go b/agent/proxycfg-sources/catalog/config_source_oss.go index 1d2da03b42..233ad64cee 100644 --- a/agent/proxycfg-sources/catalog/config_source_oss.go +++ b/agent/proxycfg-sources/catalog/config_source_oss.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package catalog diff --git a/agent/proxycfg/api_gateway_ce.go b/agent/proxycfg/api_gateway_ce.go index e2a3b375cd..c9ef238397 100644 --- a/agent/proxycfg/api_gateway_ce.go +++ b/agent/proxycfg/api_gateway_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/data_sources_ce.go b/agent/proxycfg/data_sources_ce.go index a4a4aaff74..fce4830d84 100644 --- a/agent/proxycfg/data_sources_ce.go +++ b/agent/proxycfg/data_sources_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/mesh_gateway_ce.go b/agent/proxycfg/mesh_gateway_ce.go index 0c302f27cd..1c1156232d 100644 --- a/agent/proxycfg/mesh_gateway_ce.go +++ b/agent/proxycfg/mesh_gateway_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/naming_ce.go b/agent/proxycfg/naming_ce.go index a98204a8bb..7a375b6df9 100644 --- a/agent/proxycfg/naming_ce.go +++ b/agent/proxycfg/naming_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/state_ce_test.go b/agent/proxycfg/state_ce_test.go index 36f2e07183..61ba1fcc3a 100644 --- a/agent/proxycfg/state_ce_test.go +++ b/agent/proxycfg/state_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/testing_ce.go b/agent/proxycfg/testing_ce.go index 6aa07588d4..97c23d82eb 100644 --- a/agent/proxycfg/testing_ce.go +++ b/agent/proxycfg/testing_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/proxycfg/testing_upstreams_ce.go b/agent/proxycfg/testing_upstreams_ce.go index 711a2794b6..bac9bb5ce6 100644 --- a/agent/proxycfg/testing_upstreams_ce.go +++ b/agent/proxycfg/testing_upstreams_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxycfg diff --git a/agent/rpc/peering/service_ce_test.go b/agent/rpc/peering/service_ce_test.go index 92fb9fac45..b30a0ff59f 100644 --- a/agent/rpc/peering/service_ce_test.go +++ b/agent/rpc/peering/service_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package peering_test diff --git a/agent/rpc/peering/testutil_ce_test.go b/agent/rpc/peering/testutil_ce_test.go index 4602c01fc5..7d9a0c286d 100644 --- a/agent/rpc/peering/testutil_ce_test.go +++ b/agent/rpc/peering/testutil_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package peering_test diff --git a/agent/setup_ce.go b/agent/setup_ce.go index af24a1515e..1269e5282c 100644 --- a/agent/setup_ce.go +++ b/agent/setup_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/signal_unix.go b/agent/signal_unix.go index 83e00f27b3..173a82b96b 100644 --- a/agent/signal_unix.go +++ b/agent/signal_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package agent diff --git a/agent/signal_windows.go b/agent/signal_windows.go index cb49a169c0..dc6d3cc546 100644 --- a/agent/signal_windows.go +++ b/agent/signal_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package agent diff --git a/agent/structs/acl_ce.go b/agent/structs/acl_ce.go index 5406204760..166558ae65 100644 --- a/agent/structs/acl_ce.go +++ b/agent/structs/acl_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/autopilot_ce.go b/agent/structs/autopilot_ce.go index 55420d23e1..f15e28f6a8 100644 --- a/agent/structs/autopilot_ce.go +++ b/agent/structs/autopilot_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/catalog_ce.go b/agent/structs/catalog_ce.go index ad5218bf80..463f88fcbe 100644 --- a/agent/structs/catalog_ce.go +++ b/agent/structs/catalog_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_apigw_jwt_ce.go b/agent/structs/config_entry_apigw_jwt_ce.go index 5c0b40b5c8..61b9db5b16 100644 --- a/agent/structs/config_entry_apigw_jwt_ce.go +++ b/agent/structs/config_entry_apigw_jwt_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_ce.go b/agent/structs/config_entry_ce.go index 0c11fb761f..d8ca4968ad 100644 --- a/agent/structs/config_entry_ce.go +++ b/agent/structs/config_entry_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_ce_test.go b/agent/structs/config_entry_ce_test.go index c5c3d42d60..52ee3240af 100644 --- a/agent/structs/config_entry_ce_test.go +++ b/agent/structs/config_entry_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_discoverychain_ce.go b/agent/structs/config_entry_discoverychain_ce.go index bdbe463a5b..d7333616d3 100644 --- a/agent/structs/config_entry_discoverychain_ce.go +++ b/agent/structs/config_entry_discoverychain_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_discoverychain_ce_test.go b/agent/structs/config_entry_discoverychain_ce_test.go index 4dda3ff396..b5053774a2 100644 --- a/agent/structs/config_entry_discoverychain_ce_test.go +++ b/agent/structs/config_entry_discoverychain_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_exports_ce.go b/agent/structs/config_entry_exports_ce.go index 770139ee2e..bf69a2d8d7 100644 --- a/agent/structs/config_entry_exports_ce.go +++ b/agent/structs/config_entry_exports_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_exports_ce_test.go b/agent/structs/config_entry_exports_ce_test.go index bd74dfc962..fa66dd7ead 100644 --- a/agent/structs/config_entry_exports_ce_test.go +++ b/agent/structs/config_entry_exports_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_intentions_ce.go b/agent/structs/config_entry_intentions_ce.go index e11063b999..83a09765de 100644 --- a/agent/structs/config_entry_intentions_ce.go +++ b/agent/structs/config_entry_intentions_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_intentions_ce_test.go b/agent/structs/config_entry_intentions_ce_test.go index 03f82075e5..2a5f093be7 100644 --- a/agent/structs/config_entry_intentions_ce_test.go +++ b/agent/structs/config_entry_intentions_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_jwt_provider_ce.go b/agent/structs/config_entry_jwt_provider_ce.go index 1473cf95d9..4ec86f8ce0 100644 --- a/agent/structs/config_entry_jwt_provider_ce.go +++ b/agent/structs/config_entry_jwt_provider_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_mesh_ce.go b/agent/structs/config_entry_mesh_ce.go index 319bf6adc1..74c646361a 100644 --- a/agent/structs/config_entry_mesh_ce.go +++ b/agent/structs/config_entry_mesh_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/config_entry_sameness_group_ce.go b/agent/structs/config_entry_sameness_group_ce.go index 2fd3a3438d..c201ac8b42 100644 --- a/agent/structs/config_entry_sameness_group_ce.go +++ b/agent/structs/config_entry_sameness_group_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/connect_ce.go b/agent/structs/connect_ce.go index b78e8b4c6c..98d930939b 100644 --- a/agent/structs/connect_ce.go +++ b/agent/structs/connect_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/connect_proxy_config_ce.go b/agent/structs/connect_proxy_config_ce.go index dfdc10bbad..7b6bee851d 100644 --- a/agent/structs/connect_proxy_config_ce.go +++ b/agent/structs/connect_proxy_config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/discovery_chain_ce.go b/agent/structs/discovery_chain_ce.go index b4a83b8904..b769bf8c2e 100644 --- a/agent/structs/discovery_chain_ce.go +++ b/agent/structs/discovery_chain_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/intention_ce.go b/agent/structs/intention_ce.go index cb657b8e37..d417a63f59 100644 --- a/agent/structs/intention_ce.go +++ b/agent/structs/intention_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/structs.deepcopy_ce.go b/agent/structs/structs.deepcopy_ce.go index d2e909bf49..71f20d7632 100644 --- a/agent/structs/structs.deepcopy_ce.go +++ b/agent/structs/structs.deepcopy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/structs_ce.go b/agent/structs/structs_ce.go index c59804c25e..2fa039032c 100644 --- a/agent/structs/structs_ce.go +++ b/agent/structs/structs_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/structs/structs_ce_test.go b/agent/structs/structs_ce_test.go index 6ec8723ae5..67e3825f24 100644 --- a/agent/structs/structs_ce_test.go +++ b/agent/structs/structs_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package structs diff --git a/agent/token/store_ce.go b/agent/token/store_ce.go index f2fab3390d..af7732a902 100644 --- a/agent/token/store_ce.go +++ b/agent/token/store_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package token diff --git a/agent/ui_endpoint_ce_test.go b/agent/ui_endpoint_ce_test.go index 82a16b765f..2cb3f905e2 100644 --- a/agent/ui_endpoint_ce_test.go +++ b/agent/ui_endpoint_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package agent diff --git a/agent/xds/delta_envoy_extender_ce_test.go b/agent/xds/delta_envoy_extender_ce_test.go index 39cddb1a37..30ebd9184b 100644 --- a/agent/xds/delta_envoy_extender_ce_test.go +++ b/agent/xds/delta_envoy_extender_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/extensionruntime/runtime_config_ce_test.go b/agent/xds/extensionruntime/runtime_config_ce_test.go index 1a38c044ef..102940b0db 100644 --- a/agent/xds/extensionruntime/runtime_config_ce_test.go +++ b/agent/xds/extensionruntime/runtime_config_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package extensionruntime diff --git a/agent/xds/failover_policy_ce.go b/agent/xds/failover_policy_ce.go index ac8d843e40..30cd41deef 100644 --- a/agent/xds/failover_policy_ce.go +++ b/agent/xds/failover_policy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/gw_per_route_filters_ce.go b/agent/xds/gw_per_route_filters_ce.go index ba14359b79..489db77bef 100644 --- a/agent/xds/gw_per_route_filters_ce.go +++ b/agent/xds/gw_per_route_filters_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/jwt_authn_ce.go b/agent/xds/jwt_authn_ce.go index ac6d0a31d7..777352c806 100644 --- a/agent/xds/jwt_authn_ce.go +++ b/agent/xds/jwt_authn_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/locality_policy_ce.go b/agent/xds/locality_policy_ce.go index fbc17775d6..7d9f41be5d 100644 --- a/agent/xds/locality_policy_ce.go +++ b/agent/xds/locality_policy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/platform/net_fallback.go b/agent/xds/platform/net_fallback.go index e37c97633b..391d4cf4ba 100644 --- a/agent/xds/platform/net_fallback.go +++ b/agent/xds/platform/net_fallback.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !linux -// +build !linux package platform diff --git a/agent/xds/platform/net_linux.go b/agent/xds/platform/net_linux.go index acf8c53a85..13596f8a55 100644 --- a/agent/xds/platform/net_linux.go +++ b/agent/xds/platform/net_linux.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build linux -// +build linux package platform diff --git a/agent/xds/proxystateconverter/failover_policy_ce.go b/agent/xds/proxystateconverter/failover_policy_ce.go index a9b2ec2484..b68d9b2e73 100644 --- a/agent/xds/proxystateconverter/failover_policy_ce.go +++ b/agent/xds/proxystateconverter/failover_policy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxystateconverter diff --git a/agent/xds/proxystateconverter/locality_policy_ce.go b/agent/xds/proxystateconverter/locality_policy_ce.go index 014ed0f8b9..cd7a3e7912 100644 --- a/agent/xds/proxystateconverter/locality_policy_ce.go +++ b/agent/xds/proxystateconverter/locality_policy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package proxystateconverter diff --git a/agent/xds/resources_ce_test.go b/agent/xds/resources_ce_test.go index 14d5a35253..08b922809f 100644 --- a/agent/xds/resources_ce_test.go +++ b/agent/xds/resources_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/agent/xds/server_ce.go b/agent/xds/server_ce.go index a01e9bf493..cce9b75d6e 100644 --- a/agent/xds/server_ce.go +++ b/agent/xds/server_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package xds diff --git a/api/ce_test.go b/api/ce_test.go index c608970428..91dd973b68 100644 --- a/api/ce_test.go +++ b/api/ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build !consulent -// +build !consulent package api diff --git a/api/namespace_test.go b/api/namespace_test.go index 3a956ffbd4..8eb52c0dcf 100644 --- a/api/namespace_test.go +++ b/api/namespace_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build consulent -// +build consulent package api diff --git a/command/acl/authmethod/create/authmethod_create_ce.go b/command/acl/authmethod/create/authmethod_create_ce.go index 5c6ad24683..a655cf0b35 100644 --- a/command/acl/authmethod/create/authmethod_create_ce.go +++ b/command/acl/authmethod/create/authmethod_create_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package authmethodcreate diff --git a/command/acl/authmethod/update/authmethod_update_ce.go b/command/acl/authmethod/update/authmethod_update_ce.go index d2c10d4586..e0345eb6a7 100644 --- a/command/acl/authmethod/update/authmethod_update_ce.go +++ b/command/acl/authmethod/update/authmethod_update_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package authmethodupdate diff --git a/command/acl/templatedpolicy/formatter_ce_test.go b/command/acl/templatedpolicy/formatter_ce_test.go index 1d490afead..1333b95572 100644 --- a/command/acl/templatedpolicy/formatter_ce_test.go +++ b/command/acl/templatedpolicy/formatter_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package templatedpolicy diff --git a/command/acl/token/formatter_ce_test.go b/command/acl/token/formatter_ce_test.go index 128b05b58a..9ea382fafc 100644 --- a/command/acl/token/formatter_ce_test.go +++ b/command/acl/token/formatter_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package token diff --git a/command/catalog/helpers_ce.go b/command/catalog/helpers_ce.go index 51e0421887..9898d5a5a2 100644 --- a/command/catalog/helpers_ce.go +++ b/command/catalog/helpers_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package catalog diff --git a/command/connect/envoy/envoy_ce_test.go b/command/connect/envoy/envoy_ce_test.go index 9e97516cf5..84bfb969f7 100644 --- a/command/connect/envoy/envoy_ce_test.go +++ b/command/connect/envoy/envoy_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package envoy diff --git a/command/connect/envoy/exec_supported.go b/command/connect/envoy/exec_supported.go index d61cbc8507..6eba0672eb 100644 --- a/command/connect/envoy/exec_supported.go +++ b/command/connect/envoy/exec_supported.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build linux || darwin || windows -// +build linux darwin windows package envoy diff --git a/command/connect/envoy/exec_test.go b/command/connect/envoy/exec_test.go index 0dbab3c6a0..e949019e82 100644 --- a/command/connect/envoy/exec_test.go +++ b/command/connect/envoy/exec_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //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 49d340483c..4c20acdf95 100644 --- a/command/connect/envoy/exec_unix.go +++ b/command/connect/envoy/exec_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //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 87f45ec7af..c5c95ce4c5 100644 --- a/command/connect/envoy/exec_unsupported.go +++ b/command/connect/envoy/exec_unsupported.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !linux && !darwin && !windows -// +build !linux,!darwin,!windows package envoy diff --git a/command/connect/envoy/exec_windows.go b/command/connect/envoy/exec_windows.go index cf262214ea..fe5f2ae9a3 100644 --- a/command/connect/envoy/exec_windows.go +++ b/command/connect/envoy/exec_windows.go @@ -1,7 +1,6 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: BUSL-1.1 //go:build windows && !fips -// +build windows,!fips package envoy diff --git a/command/lock/util_unix.go b/command/lock/util_unix.go index d2c9bf1dd4..de864f0b35 100644 --- a/command/lock/util_unix.go +++ b/command/lock/util_unix.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !windows -// +build !windows package lock diff --git a/command/lock/util_windows.go b/command/lock/util_windows.go index 12f148fa00..33a531c361 100644 --- a/command/lock/util_windows.go +++ b/command/lock/util_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows -// +build windows package lock diff --git a/command/login/login_ce.go b/command/login/login_ce.go index 34f9351778..1ae2455a48 100644 --- a/command/login/login_ce.go +++ b/command/login/login_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package login diff --git a/command/operator/usage/instances/usage_instances_ce.go b/command/operator/usage/instances/usage_instances_ce.go index ef614edfac..149131ecb3 100644 --- a/command/operator/usage/instances/usage_instances_ce.go +++ b/command/operator/usage/instances/usage_instances_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package instances diff --git a/command/operator/usage/instances/usage_instances_ce_test.go b/command/operator/usage/instances/usage_instances_ce_test.go index a064828a45..c7d50568a1 100644 --- a/command/operator/usage/instances/usage_instances_ce_test.go +++ b/command/operator/usage/instances/usage_instances_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package instances diff --git a/command/registry_ce.go b/command/registry_ce.go index 7ea2f73a12..f797b8f75b 100644 --- a/command/registry_ce.go +++ b/command/registry_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package command diff --git a/internal/resource/authz_ce.go b/internal/resource/authz_ce.go index f970eb35d7..69a1749e20 100644 --- a/internal/resource/authz_ce.go +++ b/internal/resource/authz_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package resource diff --git a/internal/resource/authz_ce_test.go b/internal/resource/authz_ce_test.go index 1487d9f974..a2b76f86bf 100644 --- a/internal/resource/authz_ce_test.go +++ b/internal/resource/authz_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package resource diff --git a/internal/resource/tenancy_bridge_ce.go b/internal/resource/tenancy_bridge_ce.go index 07be8ab508..9f88c22361 100644 --- a/internal/resource/tenancy_bridge_ce.go +++ b/internal/resource/tenancy_bridge_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package resource diff --git a/internal/tenancy/internal/types/types_ce.go b/internal/tenancy/internal/types/types_ce.go index 1d37357e6a..8d47578971 100644 --- a/internal/tenancy/internal/types/types_ce.go +++ b/internal/tenancy/internal/types/types_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package types diff --git a/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go b/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go index b1f00a2dcd..570e2ebdac 100644 --- a/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go +++ b/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go @@ -27,7 +27,6 @@ import "github.com/hashicorp/consul/agent/consul/rate" ` entTags = `//go:build consulent -// +build consulent ` ) diff --git a/logging/logfile_bsd.go b/logging/logfile_bsd.go index 3c5be0a370..df599358d0 100644 --- a/logging/logfile_bsd.go +++ b/logging/logfile_bsd.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build darwin || freebsd || netbsd || openbsd -// +build darwin freebsd netbsd openbsd package logging diff --git a/logging/logfile_linux.go b/logging/logfile_linux.go index e852d392bc..1e8f19b1da 100644 --- a/logging/logfile_linux.go +++ b/logging/logfile_linux.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build dragonfly || linux -// +build dragonfly linux package logging diff --git a/logging/logfile_solaris.go b/logging/logfile_solaris.go index 3d99ab3477..ba92442084 100644 --- a/logging/logfile_solaris.go +++ b/logging/logfile_solaris.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build solaris -// +build solaris package logging diff --git a/logging/syslog_test.go b/logging/syslog_test.go index 1b3d66feba..0e814a84fb 100644 --- a/logging/syslog_test.go +++ b/logging/syslog_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || solaris -// +build linux darwin dragonfly freebsd netbsd openbsd solaris package logging diff --git a/logging/syslog_unsupported_test.go b/logging/syslog_unsupported_test.go index dab3d47d72..650fc2225d 100644 --- a/logging/syslog_unsupported_test.go +++ b/logging/syslog_unsupported_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build windows || plan9 || nacl -// +build windows plan9 nacl package logging diff --git a/proto/private/pbautoconf/auto_config_ce.go b/proto/private/pbautoconf/auto_config_ce.go index 032ca67ba3..f1050dbea8 100644 --- a/proto/private/pbautoconf/auto_config_ce.go +++ b/proto/private/pbautoconf/auto_config_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbautoconf diff --git a/proto/private/pbcommon/common_ce.go b/proto/private/pbcommon/common_ce.go index 94aef583a1..c464211110 100644 --- a/proto/private/pbcommon/common_ce.go +++ b/proto/private/pbcommon/common_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbcommon diff --git a/proto/private/pbconfigentry/config_entry_ce.go b/proto/private/pbconfigentry/config_entry_ce.go index b81e076861..acc395186c 100644 --- a/proto/private/pbconfigentry/config_entry_ce.go +++ b/proto/private/pbconfigentry/config_entry_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbconfigentry diff --git a/proto/private/pbpeering/peering_ce.go b/proto/private/pbpeering/peering_ce.go index 4c4dd959e8..30890d8591 100644 --- a/proto/private/pbpeering/peering_ce.go +++ b/proto/private/pbpeering/peering_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbpeering diff --git a/proto/private/pbservice/convert_ce.go b/proto/private/pbservice/convert_ce.go index 482a2640c7..444e06134c 100644 --- a/proto/private/pbservice/convert_ce.go +++ b/proto/private/pbservice/convert_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbservice diff --git a/proto/private/pbservice/convert_ce_test.go b/proto/private/pbservice/convert_ce_test.go index 59a29c6ca7..74da8e699b 100644 --- a/proto/private/pbservice/convert_ce_test.go +++ b/proto/private/pbservice/convert_ce_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package pbservice diff --git a/sdk/freeport/ephemeral_darwin.go b/sdk/freeport/ephemeral_darwin.go index 5ea57d1289..18e6b012f3 100644 --- a/sdk/freeport/ephemeral_darwin.go +++ b/sdk/freeport/ephemeral_darwin.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build darwin -// +build darwin package freeport diff --git a/sdk/freeport/ephemeral_darwin_test.go b/sdk/freeport/ephemeral_darwin_test.go index 22f5540560..5f68890d6b 100644 --- a/sdk/freeport/ephemeral_darwin_test.go +++ b/sdk/freeport/ephemeral_darwin_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build darwin -// +build darwin package freeport diff --git a/sdk/freeport/ephemeral_fallback.go b/sdk/freeport/ephemeral_fallback.go index 35d0216c55..94ba3fb3c0 100644 --- a/sdk/freeport/ephemeral_fallback.go +++ b/sdk/freeport/ephemeral_fallback.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build !linux && !darwin -// +build !linux,!darwin package freeport diff --git a/sdk/freeport/ephemeral_linux.go b/sdk/freeport/ephemeral_linux.go index 69449ef8d0..ea7c133b5d 100644 --- a/sdk/freeport/ephemeral_linux.go +++ b/sdk/freeport/ephemeral_linux.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build linux -// +build linux package freeport diff --git a/sdk/freeport/ephemeral_linux_test.go b/sdk/freeport/ephemeral_linux_test.go index f5ea7e86bf..aa3e2de53a 100644 --- a/sdk/freeport/ephemeral_linux_test.go +++ b/sdk/freeport/ephemeral_linux_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build linux -// +build linux package freeport diff --git a/sdk/freeport/systemlimit.go b/sdk/freeport/systemlimit.go index 1a4258689c..8d71aa8acb 100644 --- a/sdk/freeport/systemlimit.go +++ b/sdk/freeport/systemlimit.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build !windows -// +build !windows package freeport diff --git a/sdk/freeport/systemlimit_windows.go b/sdk/freeport/systemlimit_windows.go index d51ed74ad0..a01041ae3d 100644 --- a/sdk/freeport/systemlimit_windows.go +++ b/sdk/freeport/systemlimit_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build windows -// +build windows package freeport diff --git a/sdk/iptables/iptables_executor_linux.go b/sdk/iptables/iptables_executor_linux.go index b152de47cc..ad954e8255 100644 --- a/sdk/iptables/iptables_executor_linux.go +++ b/sdk/iptables/iptables_executor_linux.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build linux -// +build linux package iptables diff --git a/sdk/iptables/iptables_executor_unsupported.go b/sdk/iptables/iptables_executor_unsupported.go index bc77ddb466..cdf1223701 100644 --- a/sdk/iptables/iptables_executor_unsupported.go +++ b/sdk/iptables/iptables_executor_unsupported.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:build !linux -// +build !linux package iptables diff --git a/sentinel/sentinel_ce.go b/sentinel/sentinel_ce.go index 9b21607c43..e2c4d7fcc7 100644 --- a/sentinel/sentinel_ce.go +++ b/sentinel/sentinel_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package sentinel diff --git a/service_os/service_windows.go b/service_os/service_windows.go index 6a9ca4386a..65c84c21eb 100644 --- a/service_os/service_windows.go +++ b/service_os/service_windows.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //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 a1aaa060b8..aa83bb6bbe 100644 --- a/test/integration/connect/envoy/main_test.go +++ b/test/integration/connect/envoy/main_test.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build integration -// +build integration package envoy diff --git a/test/integration/consul-container/libs/utils/version_ce.go b/test/integration/consul-container/libs/utils/version_ce.go index 2e5b1b3656..f7f602ade8 100644 --- a/test/integration/consul-container/libs/utils/version_ce.go +++ b/test/integration/consul-container/libs/utils/version_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package utils diff --git a/test/integration/consul-container/test/gateways/tenancy_ce.go b/test/integration/consul-container/test/gateways/tenancy_ce.go index ebf59c40d9..57d17b8587 100644 --- a/test/integration/consul-container/test/gateways/tenancy_ce.go +++ b/test/integration/consul-container/test/gateways/tenancy_ce.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: BUSL-1.1 //go:build !consulent -// +build !consulent package gateways diff --git a/tlsutil/config_test.go b/tlsutil/config_test.go index 8054b08ecd..bc2ee36068 100644 --- a/tlsutil/config_test.go +++ b/tlsutil/config_test.go @@ -1,7 +1,6 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: BUSL-1.1 //go:build !fips -// +build !fips package tlsutil