diff --git a/acl/acl_ce.go b/acl/acl_ce.go index 76e77f3b8f4..7d2b8513b83 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 06ec22dae7b..dafac8692a9 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 791776e09b1..7262e79b6dc 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 57b0eb32479..e342137b534 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 ccdb2e75855..34f8f1bf947 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 ed7eed9917c..fe139ef7ab7 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 207051f3482..4738314a6c1 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 32d076fe1ed..4ce9bb00642 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 37a1804fe27..a4a6cbf809d 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 07882c7b1ee..f9eed9018ba 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 cf2984ab5f1..657d5122fe2 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 6608f40f404..1b1dc866837 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 5e5d7996346..9ac615847e6 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 ff7cbf7472f..a38b0f155e3 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 6e7e470f298..5d699f32a49 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 cb741b6d475..ea416a3de87 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 a3c8595fbe2..68433e2196d 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 05643539be5..2f6d40f2436 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 976344aa82d..6d169f2bbc3 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 a02c8b54a74..4c61ac0babc 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 fd9cc1bd33e..f142ea698ec 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 ab7e1ece5a8..068e02f0ce8 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 3b3a220278c..9c3114ddc18 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 aaf743919b9..a60a49be25d 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 4f5adf0de72..34caf4b52b7 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 46b6d45a1e5..baad156e63c 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 538d84721f4..f0efc27eaf9 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 ccc139a86b0..4fb54ae079c 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 bab33fca55c..af6bb1f8bab 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 3baee7076b1..78ba9b87c7f 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 20e65647782..f5878133818 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 5cfad14a7d9..70e775f6e49 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 241d804841d..026d4bc1730 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 a0c0cdba054..48c43326f14 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 4a8e8ada370..bb4579cdc64 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 a1e1dd43c3f..6aafde36a60 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 774632063e9..8368454db52 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 f8bf2545d3e..99544b014ef 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 980e88075d0..17a2cc3d4a0 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 0587d0dc2a6..28802e77e63 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 7e55a90ca95..a21514f3bbb 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 27f55a0efc0..5078ab41af7 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 75a6c84ed36..13d00a16947 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 bd7f34e776f..5adb8be5725 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 19528ffedb1..2b1a474a407 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 224eee669ad..fe8840138a8 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 8eb430401a3..38b27b70115 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 e8ad4485069..b180836948c 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 c8f760049f3..504329d2008 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 6f38c025029..460f30fe4f7 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 e20b31a626f..4a95e69e23f 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 bed1211696b..b65a5186150 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 2c280120b50..d407e4cc1c8 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 b19705f65b7..585c84d91d3 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 d057012af15..cb26252e593 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 d14cb7bac33..61eb03cd116 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 bd49bae1b10..1a3622d5d74 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 5bc389dffa4..70ab2000faa 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 44f779d4b45..4e2aa9a523c 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 9e5e2d34ffd..8988adb9f77 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 98acecf918f..2d997b23294 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 3e689d40a80..e97c45a320c 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 83e8f5343d4..c5d8096e708 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 5213907d1bc..e12ea660f72 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 0b4d04a66a7..dbc8dd15ca7 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 7b00e1907b6..22b70886ab4 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 a8eae8f067d..d8c47692596 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 8d19b951c5b..00f3edb10de 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 4f7087806cf..3498b7063d3 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 3c30daf0a92..d090fa1d840 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 b9ec451869a..b0a7beb7c18 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 669ca264afd..b9eb978b8c0 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 fd3fce459f4..25e941ced00 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 ab586a0292c..fb3e55e7651 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 472560f2b92..0b75cda1a5b 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 e8f6450e09f..9e1dd7ebdbb 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 38cf2ebcda1..77b5bf3adb5 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 1c8062567d7..8068b7f0700 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 f0ad6ffbc92..d1050ecfa04 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 25e9dc149b1..5b1559b22f3 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 75f9a6ddeb2..6945b5c4765 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 091a5be1576..1f70baf19bb 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 736ede4e54f..4b9103a74ed 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 0dfbf95ecf0..aa495fb0d8f 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 b0eb69b355f..8cefdf2c3df 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 76c285b5e33..fcff27158ba 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 6397e90699d..3d307238f33 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 05568e40b09..000c3714c79 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 520f8b5d83f..b80a7b8ae83 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 ca55c465fd9..d0d2013cb0c 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 b02659b74c3..c39a8c335ec 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 43b80a47ad4..33e9bbe2618 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 6243bbd71b0..69d4c28ad2a 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 a7a1034c6a8..30e7b22e40d 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 acf1cd38b80..00469d6b0c9 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 40e207729df..72082689486 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 927fa1c71db..88546c17855 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 178dc60b77e..809f3527998 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 15a3ec44788..7dce71a038f 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 eb8a1e07957..9ed597acf65 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 6bd13c0132d..2fa24878541 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 81f25ed1e8b..ca57cf1afac 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 3daad8b9865..679d114232d 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 03f87378e75..f2938b156f0 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 7de677cc079..71457cbb48a 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 df6aa1cec09..d0b7587d068 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 f82d1a31d27..bc6216e30a4 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 e9dd9a0921d..976b7e7ebe5 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 81d41ea8fa4..85128b8b3c0 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 b31e593163a..e0ec556771c 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 aeb9b6a8478..d85ea09d785 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 562af973200..bc481945741 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 9e155019ca0..c385b65f3ce 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 e4b6b894798..023fa5189cc 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 09a03c70624..da6bef72377 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 6b5314de099..10a540bf186 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 d97e6422616..3abe7bc9109 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 0086a56065c..7ab918c7cc2 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 f435ca33105..57c3d5289e7 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 d4bdef266e0..e7efb978dff 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 1d2da03b42d..233ad64cee8 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 e2a3b375cd1..c9ef2383979 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 a4a4aaff747..fce4830d84c 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 0c302f27cd7..1c1156232d7 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 a98204a8bba..7a375b6df94 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 36f2e07183e..61ba1fcc3a5 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 6aa07588d4d..97c23d82eb3 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 711a2794b63..bac9bb5ce6d 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 92fb9fac45d..b30a0ff59f7 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 4602c01fc5a..7d9a0c286d2 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 af24a1515e6..1269e5282c0 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 83e00f27b35..173a82b96bd 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 cb49a169c09..dc6d3cc5461 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 54062047606..166558ae65a 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 55420d23e19..f15e28f6a89 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 ad5218bf80a..463f88fcbe2 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 5c0b40b5c8e..61b9db5b16a 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 0c11fb761f5..d8ca4968ad5 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 c5c3d42d603..52ee3240afa 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 bdbe463a5bf..d7333616d36 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 4dda3ff3962..b5053774a2b 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 770139ee2ef..bf69a2d8d78 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 bd74dfc9625..fa66dd7ead3 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 e11063b999d..83a09765def 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 03f82075e5a..2a5f093be70 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 1473cf95d98..4ec86f8ce04 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 319bf6adc10..74c646361a4 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 2fd3a3438de..c201ac8b429 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 b78e8b4c6c2..98d930939b3 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 dfdc10bbadc..7b6bee851da 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 b4a83b89044..b769bf8c2e0 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 cb657b8e377..d417a63f596 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 d2e909bf49e..71f20d7632d 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 c59804c25ee..2fa039032c2 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 6ec8723ae5e..67e3825f24f 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 f2fab3390df..af7732a9020 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 82a16b765f5..2cb3f905e28 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 39cddb1a37d..30ebd9184b3 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 1a38c044ef3..102940b0db6 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 ac8d843e40b..30cd41deef0 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 ba14359b792..489db77befc 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 ac6d0a31d79..777352c8061 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 fbc17775d68..7d9f41be5de 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 e37c97633b2..391d4cf4ba8 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 acf8c53a85e..13596f8a555 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 a9b2ec24843..b68d9b2e738 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 014ed0f8b9b..cd7a3e7912e 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 14d5a35253a..08b922809fc 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 a01e9bf493f..cce9b75d6eb 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 c608970428c..91dd973b683 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 3a956ffbd4b..8eb52c0dcfc 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 5c6ad246839..a655cf0b353 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 d2c10d45869..e0345eb6a78 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 1d490afeadc..1333b955725 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 128b05b58a1..9ea382fafcf 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 51e04218872..9898d5a5a21 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 9e97516cf5d..84bfb969f74 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 d61cbc85078..6eba0672eba 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 0dbab3c6a03..e949019e823 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 49d340483c5..4c20acdf957 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 87f45ec7afb..c5c95ce4c53 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 cf262214ead..fe5f2ae9a3b 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 d2c9bf1dd41..de864f0b358 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 12f148fa00c..33a531c3618 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 34f93517781..1ae2455a488 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 ef614edfac2..149131ecb3c 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 a064828a45f..c7d50568a1a 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 7ea2f73a12f..f797b8f75b4 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 f970eb35d7f..69a1749e201 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 1487d9f9743..a2b76f86bfe 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 07be8ab5083..9f88c223619 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 1d37357e6a1..8d475789710 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 b1f00a2dcdd..570e2ebdac7 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 3c5be0a370a..df599358d04 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 e852d392bc2..1e8f19b1da7 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 3d99ab3477a..ba92442084a 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 1b3d66feba0..0e814a84fb0 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 dab3d47d72f..650fc2225d0 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 032ca67ba3c..f1050dbea87 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 94aef583a1a..c464211110b 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 b81e0768613..acc395186c3 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 4c4dd959e8a..30890d85910 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 482a2640c74..444e06134c5 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 59a29c6ca76..74da8e699b3 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 5ea57d1289c..18e6b012f3c 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 22f5540560b..5f68890d6bb 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 35d0216c551..94ba3fb3c0d 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 69449ef8d06..ea7c133b5d4 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 f5ea7e86bf7..aa3e2de53a6 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 1a4258689ce..8d71aa8acb9 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 d51ed74ad0d..a01041ae3d6 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 b152de47cc6..ad954e82552 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 bc77ddb466d..cdf12237011 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 9b21607c431..e2c4d7fcc7b 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 6a9ca4386a6..65c84c21ebe 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 a1aaa060b89..aa83bb6bbec 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 2e5b1b3656b..f7f602ade89 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 ebf59c40d96..57d17b8587a 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 8054b08ecd9..bc2ee36068a 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