diff --git a/builtin/credential/aws/pkcs7/verify_test_dsa.go b/builtin/credential/aws/pkcs7/verify_test_dsa.go index 1eb05bc3ea..edebb00c6c 100644 --- a/builtin/credential/aws/pkcs7/verify_test_dsa.go +++ b/builtin/credential/aws/pkcs7/verify_test_dsa.go @@ -1,4 +1,4 @@ -// +build go1.11 go1.12 go1.13 go1.14 go1.15 +//go:build go1.11 || go1.12 || go1.13 || go1.14 || go1.15 package pkcs7 diff --git a/command/agent/winsvc/service_windows.go b/command/agent/winsvc/service_windows.go index 6e073c84ae..69177e01fd 100644 --- a/command/agent/winsvc/service_windows.go +++ b/command/agent/winsvc/service_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package winsvc diff --git a/command/commands_nonwindows.go b/command/commands_nonwindows.go index 884ffb7113..c94c485f49 100644 --- a/command/commands_nonwindows.go +++ b/command/commands_nonwindows.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package command diff --git a/command/commands_windows.go b/command/commands_windows.go index 592119fb36..ed06a07406 100644 --- a/command/commands_windows.go +++ b/command/commands_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package command diff --git a/command/config/validate_listener.go b/command/config/validate_listener.go index afb9296ab8..7a56ec6998 100644 --- a/command/config/validate_listener.go +++ b/command/config/validate_listener.go @@ -1,4 +1,4 @@ -// +build !fips_140_3 +//go:build !fips_140_3 package config diff --git a/command/operator_diagnose_test.go b/command/operator_diagnose_test.go index d99740ff65..b1cbc7fa69 100644 --- a/command/operator_diagnose_test.go +++ b/command/operator_diagnose_test.go @@ -1,4 +1,4 @@ -// +build !race +//go:build !race package command diff --git a/command/operator_generate_root_test.go b/command/operator_generate_root_test.go index f4e0c9453f..f12ed5a4e0 100644 --- a/command/operator_generate_root_test.go +++ b/command/operator_generate_root_test.go @@ -1,5 +1,4 @@ //go:build !race -// +build !race package command diff --git a/command/operator_init_test.go b/command/operator_init_test.go index 99937808e7..423edad763 100644 --- a/command/operator_init_test.go +++ b/command/operator_init_test.go @@ -1,4 +1,4 @@ -// +build !race +//go:build !race package command diff --git a/command/operator_rekey_test.go b/command/operator_rekey_test.go index c57b8ef03c..31617e5ac4 100644 --- a/command/operator_rekey_test.go +++ b/command/operator_rekey_test.go @@ -1,4 +1,4 @@ -// +build !race +//go:build !race package command diff --git a/command/server/config_oss_test.go b/command/server/config_oss_test.go index 6f466ddf6d..f64670e03a 100644 --- a/command/server/config_oss_test.go +++ b/command/server/config_oss_test.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package server diff --git a/command/server/config_test_helpers_util.go b/command/server/config_test_helpers_util.go index 2ef4572a47..63fa3cfe6a 100644 --- a/command/server/config_test_helpers_util.go +++ b/command/server/config_test_helpers_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package server diff --git a/command/server/config_util.go b/command/server/config_util.go index e24073ec9b..feefc6092a 100644 --- a/command/server/config_util.go +++ b/command/server/config_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package server diff --git a/command/server_noprofile.go b/command/server_noprofile.go index 2aac2293f7..edaebeb13c 100644 --- a/command/server_noprofile.go +++ b/command/server_noprofile.go @@ -1,4 +1,4 @@ -// +build !memprofiler +//go:build !memprofiler package command diff --git a/command/server_profile.go b/command/server_profile.go index 672d2847de..1ce87a6841 100644 --- a/command/server_profile.go +++ b/command/server_profile.go @@ -1,4 +1,4 @@ -// +build memprofiler +//go:build memprofiler package command diff --git a/command/server_test.go b/command/server_test.go index 5d3998a491..2de5ea5960 100644 --- a/command/server_test.go +++ b/command/server_test.go @@ -1,4 +1,4 @@ -// +build !race,!hsm,!fips_140_3 +//go:build !race && !hsm && !fips_140_3 // NOTE: we can't use this with HSM. We can't set testing mode on and it's not // safe to use env vars since that provides an attack vector in the real world. diff --git a/helper/constants/constants_oss.go b/helper/constants/constants_oss.go index 9e31f27c6a..22b9928fd3 100644 --- a/helper/constants/constants_oss.go +++ b/helper/constants/constants_oss.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package constants diff --git a/helper/constants/fips.go b/helper/constants/fips.go index 4b8a99991c..d384e83e84 100644 --- a/helper/constants/fips.go +++ b/helper/constants/fips.go @@ -1,4 +1,4 @@ -// +build !fips_140_3 +//go:build !fips_140_3 package constants diff --git a/helper/hostutil/hostinfo.go b/helper/hostutil/hostinfo.go index f2b4f9ce22..ed8e648f6e 100644 --- a/helper/hostutil/hostinfo.go +++ b/helper/hostutil/hostinfo.go @@ -1,4 +1,4 @@ -// +build !openbsd +//go:build !openbsd package hostutil diff --git a/helper/hostutil/hostinfo_openbsd.go b/helper/hostutil/hostinfo_openbsd.go index 9e58428760..8f01458afe 100644 --- a/helper/hostutil/hostinfo_openbsd.go +++ b/helper/hostutil/hostinfo_openbsd.go @@ -1,4 +1,4 @@ -// +build openbsd +//go:build openbsd package hostutil diff --git a/helper/testhelpers/testhelpers_oss.go b/helper/testhelpers/testhelpers_oss.go index 1d42a30f38..05e132a921 100644 --- a/helper/testhelpers/testhelpers_oss.go +++ b/helper/testhelpers/testhelpers_oss.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package testhelpers diff --git a/http/assets.go b/http/assets.go index cbc6da9b11..4c4b6c395e 100644 --- a/http/assets.go +++ b/http/assets.go @@ -1,4 +1,4 @@ -// +build ui +//go:build ui package http diff --git a/http/assets_stub.go b/http/assets_stub.go index 0153ff12a5..1989a09d98 100644 --- a/http/assets_stub.go +++ b/http/assets_stub.go @@ -1,4 +1,4 @@ -// +build !ui +//go:build !ui package http diff --git a/internalshared/configutil/config_util.go b/internalshared/configutil/config_util.go index fc527cc2af..05cb061e7e 100644 --- a/internalshared/configutil/config_util.go +++ b/internalshared/configutil/config_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package configutil diff --git a/physical/foundationdb/foundationdb.go b/physical/foundationdb/foundationdb.go index 442c0bed2c..e6fe596b08 100644 --- a/physical/foundationdb/foundationdb.go +++ b/physical/foundationdb/foundationdb.go @@ -1,4 +1,4 @@ -// +build foundationdb +//go:build foundationdb package foundationdb diff --git a/physical/foundationdb/foundationdb_test.go b/physical/foundationdb/foundationdb_test.go index 9c08b812bc..c6fe75d5eb 100644 --- a/physical/foundationdb/foundationdb_test.go +++ b/physical/foundationdb/foundationdb_test.go @@ -1,4 +1,4 @@ -// +build foundationdb +//go:build foundationdb package foundationdb diff --git a/physical/foundationdb/foundationdbstub.go b/physical/foundationdb/foundationdbstub.go index 34ff9a0fa7..4fc2734e50 100644 --- a/physical/foundationdb/foundationdbstub.go +++ b/physical/foundationdb/foundationdbstub.go @@ -1,4 +1,4 @@ -// +build !foundationdb +//go:build !foundationdb package foundationdb diff --git a/physical/raft/bolt_32bit_test.go b/physical/raft/bolt_32bit_test.go index 7fceb0d50e..4b7ed4b8be 100644 --- a/physical/raft/bolt_32bit_test.go +++ b/physical/raft/bolt_32bit_test.go @@ -1,4 +1,4 @@ -// +build 386 arm +//go:build 386 || arm package raft diff --git a/physical/raft/bolt_64bit_test.go b/physical/raft/bolt_64bit_test.go index 20ec4ea43f..173f8aa718 100644 --- a/physical/raft/bolt_64bit_test.go +++ b/physical/raft/bolt_64bit_test.go @@ -1,4 +1,4 @@ -// +build !386,!arm +//go:build !386 && !arm package raft diff --git a/physical/raft/raft_util.go b/physical/raft/raft_util.go index 890c701f7e..9761c77a7b 100644 --- a/physical/raft/raft_util.go +++ b/physical/raft/raft_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package raft diff --git a/physical/raft/vars_32bit.go b/physical/raft/vars_32bit.go index 27deb58873..b232a02c8d 100644 --- a/physical/raft/vars_32bit.go +++ b/physical/raft/vars_32bit.go @@ -1,4 +1,4 @@ -// +build 386 arm +//go:build 386 || arm package raft diff --git a/physical/raft/vars_64bit.go b/physical/raft/vars_64bit.go index 1a1716cd30..890abfe50c 100644 --- a/physical/raft/vars_64bit.go +++ b/physical/raft/vars_64bit.go @@ -1,4 +1,4 @@ -// +build !386,!arm +//go:build !386 && !arm package raft diff --git a/sdk/version/cgo.go b/sdk/version/cgo.go index 2ed493a1fb..5bc93e5bfc 100644 --- a/sdk/version/cgo.go +++ b/sdk/version/cgo.go @@ -1,4 +1,4 @@ -// +build cgo +//go:build cgo package version diff --git a/tools/tools.go b/tools/tools.go index 84c5e644fb..008536efe1 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -1,4 +1,4 @@ -// +build tools +//go:build tools // This file ensures tool dependencies are kept in sync. This is the // recommended way of doing this according to diff --git a/vault/acl_util.go b/vault/acl_util.go index b3ea126bc0..e05b15018b 100644 --- a/vault/acl_util.go +++ b/vault/acl_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/activity_log_util.go b/vault/activity_log_util.go index 4a187e8727..8cfa76a0f0 100644 --- a/vault/activity_log_util.go +++ b/vault/activity_log_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/barrier_view_util.go b/vault/barrier_view_util.go index f7c6340590..b96a4af7b8 100644 --- a/vault/barrier_view_util.go +++ b/vault/barrier_view_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/core_util.go b/vault/core_util.go index f810a502f3..e30cf46ba5 100644 --- a/vault/core_util.go +++ b/vault/core_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/deadlock.go b/vault/deadlock.go index 81b5199b4d..534f18492f 100644 --- a/vault/deadlock.go +++ b/vault/deadlock.go @@ -1,4 +1,4 @@ -// +build deadlock +//go:build deadlock package vault diff --git a/vault/diagnose/file_checks_unix.go b/vault/diagnose/file_checks_unix.go index 348ab2b0d8..b18b1418b2 100644 --- a/vault/diagnose/file_checks_unix.go +++ b/vault/diagnose/file_checks_unix.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package diagnose diff --git a/vault/diagnose/file_checks_windows.go b/vault/diagnose/file_checks_windows.go index 9df5d225b3..dd41353fd8 100644 --- a/vault/diagnose/file_checks_windows.go +++ b/vault/diagnose/file_checks_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package diagnose diff --git a/vault/diagnose/os_common.go b/vault/diagnose/os_common.go index 937c4c9981..896a4df69a 100644 --- a/vault/diagnose/os_common.go +++ b/vault/diagnose/os_common.go @@ -1,4 +1,4 @@ -// +build !openbsd !arm +//go:build !openbsd || !arm package diagnose diff --git a/vault/diagnose/os_openbsd_arm.go b/vault/diagnose/os_openbsd_arm.go index 0a0ffedb70..da2aee831c 100644 --- a/vault/diagnose/os_openbsd_arm.go +++ b/vault/diagnose/os_openbsd_arm.go @@ -1,4 +1,4 @@ -// +build openbsd,arm +//go:build openbsd && arm package diagnose diff --git a/vault/diagnose/os_unix.go b/vault/diagnose/os_unix.go index 904a4ad643..2334a95fc7 100644 --- a/vault/diagnose/os_unix.go +++ b/vault/diagnose/os_unix.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package diagnose diff --git a/vault/diagnose/os_windows.go b/vault/diagnose/os_windows.go index b012c4685a..f863bb1318 100644 --- a/vault/diagnose/os_windows.go +++ b/vault/diagnose/os_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package diagnose diff --git a/vault/expiration_util.go b/vault/expiration_util.go index eac1703bc6..2170c5c82e 100644 --- a/vault/expiration_util.go +++ b/vault/expiration_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/identity_store_oidc_util.go b/vault/identity_store_oidc_util.go index 5152aaeb22..8a959e4157 100644 --- a/vault/identity_store_oidc_util.go +++ b/vault/identity_store_oidc_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/identity_store_oss.go b/vault/identity_store_oss.go index 748186d798..5cf6e1ff28 100644 --- a/vault/identity_store_oss.go +++ b/vault/identity_store_oss.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/lock.go b/vault/lock.go index 20ca4d97fd..e7014d3973 100644 --- a/vault/lock.go +++ b/vault/lock.go @@ -1,4 +1,4 @@ -// +build !deadlock +//go:build !deadlock package vault diff --git a/vault/logical_system_util.go b/vault/logical_system_util.go index d529b39291..ba87e243b1 100644 --- a/vault/logical_system_util.go +++ b/vault/logical_system_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/managed_key_registry.go b/vault/managed_key_registry.go index ca72eaf6db..11356fa121 100644 --- a/vault/managed_key_registry.go +++ b/vault/managed_key_registry.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/mount_util.go b/vault/mount_util.go index 65e5a3d5fd..d6a108b0d2 100644 --- a/vault/mount_util.go +++ b/vault/mount_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/namespaces_oss.go b/vault/namespaces_oss.go index 1afad5fbcc..33404f8930 100644 --- a/vault/namespaces_oss.go +++ b/vault/namespaces_oss.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/password_policy_util.go b/vault/password_policy_util.go index 133373677f..4db38d1c11 100644 --- a/vault/password_policy_util.go +++ b/vault/password_policy_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/policy_store_util.go b/vault/policy_store_util.go index 6b8291326b..75098c1a27 100644 --- a/vault/policy_store_util.go +++ b/vault/policy_store_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/policy_util.go b/vault/policy_util.go index 74b9263920..06c2c709d2 100644 --- a/vault/policy_util.go +++ b/vault/policy_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/quotas/quotas_util.go b/vault/quotas/quotas_util.go index 7c0732f673..cb53be7417 100644 --- a/vault/quotas/quotas_util.go +++ b/vault/quotas/quotas_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package quotas diff --git a/vault/replication/cluster.go b/vault/replication/cluster.go index 4030cd0686..a61c174ce6 100644 --- a/vault/replication/cluster.go +++ b/vault/replication/cluster.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package replication diff --git a/vault/request_forwarding_rpc_util.go b/vault/request_forwarding_rpc_util.go index f4cd607df9..932259bb4e 100644 --- a/vault/request_forwarding_rpc_util.go +++ b/vault/request_forwarding_rpc_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/request_handling_util.go b/vault/request_handling_util.go index 0487199b2c..42c1327f62 100644 --- a/vault/request_handling_util.go +++ b/vault/request_handling_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/sealunwrapper.go b/vault/sealunwrapper.go index 1d124ea530..c90ad9993a 100644 --- a/vault/sealunwrapper.go +++ b/vault/sealunwrapper.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/sealunwrapper_test.go b/vault/sealunwrapper_test.go index 55ddac9673..bd29e4f0bc 100644 --- a/vault/sealunwrapper_test.go +++ b/vault/sealunwrapper_test.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/testing_util.go b/vault/testing_util.go index bf5fd790c8..30f524177b 100644 --- a/vault/testing_util.go +++ b/vault/testing_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/token_store_util.go b/vault/token_store_util.go index ca1f39a13d..d87b089860 100644 --- a/vault/token_store_util.go +++ b/vault/token_store_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault diff --git a/vault/wrapping_util.go b/vault/wrapping_util.go index e40c5aac58..fc947e65ad 100644 --- a/vault/wrapping_util.go +++ b/vault/wrapping_util.go @@ -1,4 +1,4 @@ -// +build !enterprise +//go:build !enterprise package vault