Convert to Go 1.17 go:build directive (#13579)

2025-11-02 03:27:54 +00:00 · 2022-01-05 12:02:03 -06:00
parent 7353573d9a
commit 377f7459af
64 changed files with 63 additions and 64 deletions
--- 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
--- 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
--- a/command/commands_nonwindows.go
+++ b/command/commands_nonwindows.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 package command
--- a/command/commands_windows.go
+++ b/command/commands_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 package command
--- 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
--- a/command/operator_diagnose_test.go
+++ b/command/operator_diagnose_test.go
@@ -1,4 +1,4 @@
-// +build !race
+//go:build !race
 package command
--- 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
--- a/command/operator_init_test.go
+++ b/command/operator_init_test.go
@@ -1,4 +1,4 @@
-// +build !race
+//go:build !race
 package command
--- a/command/operator_rekey_test.go
+++ b/command/operator_rekey_test.go
@@ -1,4 +1,4 @@
-// +build !race
+//go:build !race
 package command
--- 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
--- 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
--- a/command/server/config_util.go
+++ b/command/server/config_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package server
--- a/command/server_noprofile.go
+++ b/command/server_noprofile.go
@@ -1,4 +1,4 @@
-// +build !memprofiler
+//go:build !memprofiler
 package command
--- a/command/server_profile.go
+++ b/command/server_profile.go
@@ -1,4 +1,4 @@
-// +build memprofiler
+//go:build memprofiler
 package command
--- 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.
--- a/helper/constants/constants_oss.go
+++ b/helper/constants/constants_oss.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package constants
--- 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
--- a/helper/hostutil/hostinfo.go
+++ b/helper/hostutil/hostinfo.go
@@ -1,4 +1,4 @@
-// +build !openbsd
+//go:build !openbsd
 package hostutil
--- a/helper/hostutil/hostinfo_openbsd.go
+++ b/helper/hostutil/hostinfo_openbsd.go
@@ -1,4 +1,4 @@
-// +build openbsd
+//go:build openbsd
 package hostutil
--- a/helper/testhelpers/testhelpers_oss.go
+++ b/helper/testhelpers/testhelpers_oss.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package testhelpers
--- a/http/assets.go
+++ b/http/assets.go
@@ -1,4 +1,4 @@
-// +build ui
+//go:build ui
 package http
--- a/http/assets_stub.go
+++ b/http/assets_stub.go
@@ -1,4 +1,4 @@
-// +build !ui
+//go:build !ui
 package http
--- a/internalshared/configutil/config_util.go
+++ b/internalshared/configutil/config_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package configutil
--- a/physical/foundationdb/foundationdb.go
+++ b/physical/foundationdb/foundationdb.go
@@ -1,4 +1,4 @@
-// +build foundationdb
+//go:build foundationdb
 package foundationdb
--- a/physical/foundationdb/foundationdb_test.go
+++ b/physical/foundationdb/foundationdb_test.go
@@ -1,4 +1,4 @@
-// +build foundationdb
+//go:build foundationdb
 package foundationdb
--- a/physical/foundationdb/foundationdbstub.go
+++ b/physical/foundationdb/foundationdbstub.go
@@ -1,4 +1,4 @@
-// +build !foundationdb
+//go:build !foundationdb
 package foundationdb
--- 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
--- 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
--- a/physical/raft/raft_util.go
+++ b/physical/raft/raft_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package raft
--- 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
--- 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
--- a/sdk/version/cgo.go
+++ b/sdk/version/cgo.go
@@ -1,4 +1,4 @@
-// +build cgo
+//go:build cgo
 package version
--- 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
--- a/vault/acl_util.go
+++ b/vault/acl_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/activity_log_util.go
+++ b/vault/activity_log_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/barrier_view_util.go
+++ b/vault/barrier_view_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/core_util.go
+++ b/vault/core_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/deadlock.go
+++ b/vault/deadlock.go
@@ -1,4 +1,4 @@
-// +build deadlock
+//go:build deadlock
 package vault
--- 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
--- 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
--- 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
--- 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
--- a/vault/diagnose/os_unix.go
+++ b/vault/diagnose/os_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 package diagnose
--- a/vault/diagnose/os_windows.go
+++ b/vault/diagnose/os_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 package diagnose
--- a/vault/expiration_util.go
+++ b/vault/expiration_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- 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
--- a/vault/identity_store_oss.go
+++ b/vault/identity_store_oss.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/lock.go
+++ b/vault/lock.go
@@ -1,4 +1,4 @@
-// +build !deadlock
+//go:build !deadlock
 package vault
--- a/vault/logical_system_util.go
+++ b/vault/logical_system_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/managed_key_registry.go
+++ b/vault/managed_key_registry.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/mount_util.go
+++ b/vault/mount_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/namespaces_oss.go
+++ b/vault/namespaces_oss.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/password_policy_util.go
+++ b/vault/password_policy_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/policy_store_util.go
+++ b/vault/policy_store_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/policy_util.go
+++ b/vault/policy_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/quotas/quotas_util.go
+++ b/vault/quotas/quotas_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package quotas
--- a/vault/replication/cluster.go
+++ b/vault/replication/cluster.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package replication
--- 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
--- a/vault/request_handling_util.go
+++ b/vault/request_handling_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/sealunwrapper.go
+++ b/vault/sealunwrapper.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/sealunwrapper_test.go
+++ b/vault/sealunwrapper_test.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/testing_util.go
+++ b/vault/testing_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/token_store_util.go
+++ b/vault/token_store_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
--- a/vault/wrapping_util.go
+++ b/vault/wrapping_util.go
@@ -1,4 +1,4 @@
-// +build !enterprise
+//go:build !enterprise
 package vault
`@@ -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`	`package pkcs7`
`@@ -1,4 +1,4 @@`
	`// +build windows`	`//go:build windows`

	`package winsvc`	`package winsvc`
`@@ -1,4 +1,4 @@`
	`// +build !windows`	`//go:build !windows`

	`package command`	`package command`
`@@ -1,4 +1,4 @@`
	`// +build !fips_140_3`	`//go:build !fips_140_3`

	`package config`	`package config`
`@@ -1,4 +1,4 @@`
	`// +build !race`	`//go:build !race`

	`package command`	`package command`
`@@ -1,4 +1,4 @@`
	`// +build !enterprise`	`//go:build !enterprise`

	`package server`	`package server`
`@@ -1,4 +1,4 @@`
	`// +build !memprofiler`	`//go:build !memprofiler`

	`package command`	`package command`
`@@ -1,4 +1,4 @@`
	`// +build memprofiler`	`//go:build memprofiler`

	`package command`	`package command`
`@@ -1,4 +1,4 @@`
	`// +build !openbsd`	`//go:build !openbsd`

	`package hostutil`	`package hostutil`
`@@ -1,4 +1,4 @@`
	`// +build openbsd`	`//go:build openbsd`

	`package hostutil`	`package hostutil`