elastic · thbkrkr · May 25, 2022 · May 24, 2022 · May 24, 2022
diff --git a/cmd/license-initializer/main_test.go b/cmd/license-initializer/main_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build integration
+//go:build integration
 
 package main
 

diff --git a/pkg/controller/common/certificates/ca_test.go b/pkg/controller/common/certificates/ca_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build integration
+//go:build integration
 
 package certificates
 

diff --git a/pkg/controller/common/certificates/pem_test.go b/pkg/controller/common/certificates/pem_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build integration
+//go:build integration
 
 package certificates
 

diff --git a/pkg/controller/common/watches/handler_integration_test.go b/pkg/controller/common/watches/handler_integration_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build integration
+//go:build integration
 
 package watches_test
 

diff --git a/pkg/controller/license/license_controller_integration_test.go b/pkg/controller/license/license_controller_integration_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build integration
+//go:build integration
 
 package license
 

diff --git a/pkg/controller/license/trial/trial_controller_integration_test.go b/pkg/controller/license/trial/trial_controller_integration_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build integration
-// +build integration
 
 package trial
 

diff --git a/pkg/utils/tools.go b/pkg/utils/tools.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build tools
+//go:build tools
 
 package utils
 

diff --git a/test/e2e/agent/config_test.go b/test/e2e/agent/config_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build agent || e2e
-// +build agent e2e
 
 package agent
 

diff --git a/test/e2e/agent/recipes_test.go b/test/e2e/agent/recipes_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build agent e2e
+//go:build agent || e2e
 
 package agent
 

diff --git a/test/e2e/agent/upgrade_test.go b/test/e2e/agent/upgrade_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build agent || e2e
-// +build agent e2e
 
 package agent
 

diff --git a/test/e2e/agent/webhook_test.go b/test/e2e/agent/webhook_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build agent e2e
+//go:build agent || e2e
 
 package agent
 

diff --git a/test/e2e/apm/association_test.go b/test/e2e/apm/association_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build apm e2e
+//go:build apm || e2e
 
 package apm
 

diff --git a/test/e2e/apm/configuration_test.go b/test/e2e/apm/configuration_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build apm e2e
+//go:build apm || e2e
 
 package apm
 

diff --git a/test/e2e/apm/standalone_test.go b/test/e2e/apm/standalone_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build apm e2e
+//go:build apm || e2e
 
 package apm
 

diff --git a/test/e2e/apm/upgrade_test.go b/test/e2e/apm/upgrade_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build apm e2e
+//go:build apm || e2e
 
 package apm
 

diff --git a/test/e2e/beat/config.go b/test/e2e/beat/config.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build beat e2e
+//go:build beat || e2e
 
 package beat
 

diff --git a/test/e2e/beat/config_test.go b/test/e2e/beat/config_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build beat || e2e
-// +build beat e2e
 
 package beat
 

diff --git a/test/e2e/beat/recipes_test.go b/test/e2e/beat/recipes_test.go
@@ -1,7 +1,8 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
-// +build beat e2e
+
+//go:build beat || e2e
 
 package beat
 

diff --git a/test/e2e/beat/setup_test.go b/test/e2e/beat/setup_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build beat e2e
+//go:build beat || e2e
 
 package beat
 

diff --git a/test/e2e/beat/upgrade_test.go b/test/e2e/beat/upgrade_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build beat || e2e
-// +build beat e2e
 
 package beat
 

diff --git a/test/e2e/beat/webhook_test.go b/test/e2e/beat/webhook_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build beat e2e
+//go:build beat || e2e
 
 package beat
 

diff --git a/test/e2e/ems/ems_test.go b/test/e2e/ems/ems_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build ems e2e
+//go:build ems || e2e
 
 package ems
 

diff --git a/test/e2e/ent/configuration_test.go b/test/e2e/ent/configuration_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build ent e2e
+//go:build ent || e2e
 
 package ent
 

diff --git a/test/e2e/ent/ent_test.go b/test/e2e/ent/ent_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build ent || e2e
-// +build ent e2e
 
 package ent
 

diff --git a/test/e2e/es/auth_test.go b/test/e2e/es/auth_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/autoscaling_test.go b/test/e2e/es/autoscaling_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/certs_test.go b/test/e2e/es/certs_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/disable_predicates_test.go b/test/e2e/es/disable_predicates_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/failure_test.go b/test/e2e/es/failure_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/forced_upgrade_test.go b/test/e2e/es/forced_upgrade_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/http_test.go b/test/e2e/es/http_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/keystore_test.go b/test/e2e/es/keystore_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/license_test.go b/test/e2e/es/license_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/mutation_test.go b/test/e2e/es/mutation_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/podtemplate_test.go b/test/e2e/es/podtemplate_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/remote_cluster_test.go b/test/e2e/es/remote_cluster_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/reversal_test.go b/test/e2e/es/reversal_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/stack_monitoring_test.go b/test/e2e/es/stack_monitoring_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/suspend_test.go b/test/e2e/es/suspend_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/topology_test.go b/test/e2e/es/topology_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/validation_test.go b/test/e2e/es/validation_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/es/version_upgrade_test.go b/test/e2e/es/version_upgrade_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build es || e2e
-// +build es e2e
 
 package es
 

diff --git a/test/e2e/es/volume_test.go b/test/e2e/es/volume_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build es e2e
+//go:build es || e2e
 
 package es
 

diff --git a/test/e2e/global_ca_test.go b/test/e2e/global_ca_test.go
@@ -3,7 +3,6 @@
 // you may not use this file except in compliance with the Elastic License 2.0.
 
 //go:build mixed || e2e
-// +build mixed e2e
 
 package e2e
 

diff --git a/test/e2e/kb/association_test.go b/test/e2e/kb/association_test.go
@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License 2.0;
 // you may not use this file except in compliance with the Elastic License 2.0.
 
-// +build kb e2e
+//go:build kb || e2e
 
 package kb