From cc730be19d6109764aabaed5410fde99bb168a6c Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Tue, 24 May 2022 15:18:38 +0200 Subject: [PATCH 1/2] Use new go build tag syntax Update all current build tags '// +build' to new format accepted in go 1.17 '//go:build'. --- cmd/license-initializer/main_test.go | 2 +- pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go | 1 - pkg/apis/apm/v1/zz_generated.deepcopy.go | 1 - pkg/apis/apm/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/beat/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/common/v1/zz_generated.deepcopy.go | 1 - pkg/apis/common/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go | 1 - pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go | 1 - pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/kibana/v1/zz_generated.deepcopy.go | 1 - pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go | 1 - pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go | 1 - pkg/controller/common/certificates/ca_test.go | 2 +- pkg/controller/common/certificates/pem_test.go | 2 +- pkg/controller/common/watches/handler_integration_test.go | 2 +- pkg/controller/license/license_controller_integration_test.go | 2 +- .../license/trial/trial_controller_integration_test.go | 1 - pkg/utils/tools.go | 2 +- test/e2e/agent/config_test.go | 1 - test/e2e/agent/recipes_test.go | 2 +- test/e2e/agent/upgrade_test.go | 1 - test/e2e/agent/webhook_test.go | 2 +- test/e2e/apm/association_test.go | 2 +- test/e2e/apm/configuration_test.go | 2 +- test/e2e/apm/standalone_test.go | 2 +- test/e2e/apm/upgrade_test.go | 2 +- test/e2e/beat/config.go | 2 +- test/e2e/beat/config_test.go | 1 - test/e2e/beat/recipes_test.go | 3 ++- test/e2e/beat/setup_test.go | 2 +- test/e2e/beat/upgrade_test.go | 1 - test/e2e/beat/webhook_test.go | 2 +- test/e2e/ems/ems_test.go | 2 +- test/e2e/ent/configuration_test.go | 2 +- test/e2e/ent/ent_test.go | 1 - test/e2e/es/auth_test.go | 1 - test/e2e/es/autoscaling_test.go | 2 +- test/e2e/es/certs_test.go | 1 - test/e2e/es/disable_predicates_test.go | 1 - test/e2e/es/failure_test.go | 2 +- test/e2e/es/forced_upgrade_test.go | 2 +- test/e2e/es/http_test.go | 2 +- test/e2e/es/keystore_test.go | 2 +- test/e2e/es/license_test.go | 2 +- test/e2e/es/mutation_test.go | 1 - test/e2e/es/podtemplate_test.go | 2 +- test/e2e/es/remote_cluster_test.go | 2 +- test/e2e/es/reversal_test.go | 1 - test/e2e/es/stack_monitoring_test.go | 2 +- test/e2e/es/suspend_test.go | 2 +- test/e2e/es/topology_test.go | 2 +- test/e2e/es/validation_test.go | 2 +- test/e2e/es/version_upgrade_test.go | 1 - test/e2e/es/volume_test.go | 2 +- test/e2e/global_ca_test.go | 1 - test/e2e/kb/association_test.go | 2 +- test/e2e/kb/failure_test.go | 2 +- test/e2e/kb/keystore_test.go | 2 +- test/e2e/kb/resource_test.go | 2 +- test/e2e/kb/stack_monitoring_test.go | 2 +- test/e2e/kb/standalone_test.go | 2 +- test/e2e/kb/telemetry_test.go | 2 +- test/e2e/kb/version_upgrade_test.go | 2 +- test/e2e/naming_test.go | 2 +- test/e2e/samples_test.go | 1 - test/e2e/smoke_test.go | 2 +- test/e2e/stack_test.go | 2 +- 69 files changed, 43 insertions(+), 69 deletions(-) diff --git a/cmd/license-initializer/main_test.go b/cmd/license-initializer/main_test.go index c16fb6c085..a472a134ca 100644 --- 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/apis/agent/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go index 9372b42b9f..e714b70e1a 100644 --- a/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/apm/v1/zz_generated.deepcopy.go b/pkg/apis/apm/v1/zz_generated.deepcopy.go index 7075886f8b..2dac8b8e17 100644 --- a/pkg/apis/apm/v1/zz_generated.deepcopy.go +++ b/pkg/apis/apm/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go b/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go index 3f35683c82..9d62d63854 100644 --- a/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go b/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go index 8a5aee0b3c..39dcd2e808 100644 --- a/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/common/v1/zz_generated.deepcopy.go b/pkg/apis/common/v1/zz_generated.deepcopy.go index e9d746265f..d398dafa1a 100644 --- a/pkg/apis/common/v1/zz_generated.deepcopy.go +++ b/pkg/apis/common/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/common/v1beta1/zz_generated.deepcopy.go b/pkg/apis/common/v1beta1/zz_generated.deepcopy.go index 0f9b997c55..fcac84ad14 100644 --- a/pkg/apis/common/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/common/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go index c424db36e1..6ac56d33c2 100644 --- a/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go +++ b/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go index 5e722bce85..600b0182f2 100644 --- a/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go b/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go index a2c6244433..de3ebe9cc0 100644 --- a/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go +++ b/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go b/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go index c3605cb99c..0cf64e45cc 100644 --- a/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/kibana/v1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1/zz_generated.deepcopy.go index b33df93e14..8ea84908b4 100644 --- a/pkg/apis/kibana/v1/zz_generated.deepcopy.go +++ b/pkg/apis/kibana/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go index 5833f4a1d3..f12ea3f7e7 100644 --- a/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go index 17cfea88d4..cf1b89d3ae 100644 --- a/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // 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; diff --git a/pkg/controller/common/certificates/ca_test.go b/pkg/controller/common/certificates/ca_test.go index c2ff19a427..ddb78c5c9e 100644 --- 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 index 912fa9f399..be428e2e5f 100644 --- 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 index e89a2fa85b..2547cb773e 100644 --- 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 index 8a101b3c59..fb47dc77cf 100644 --- 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 index 7344bca0e9..fbf94eea92 100644 --- 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 index a1319ba871..7e683268b3 100644 --- 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 index 4724bc2a9a..115d220389 100644 --- 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 index fad914d857..ba4914dec2 100644 --- 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 index 9b7f026f36..c24db36384 100644 --- 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 index 33e8ee5d35..537e2c5fde 100644 --- 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 index 3d652b74d1..02e8dd9576 100644 --- 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 index ddfd5e6d57..67b0e5e091 100644 --- 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 index bdc25abc97..614c4afd2d 100644 --- 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 index c0f3f9b9a9..f751a7e4e5 100644 --- 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 index 4af5162b27..23eeb8f14e 100644 --- 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 index 01033cec36..b2d5adba99 100644 --- 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 index a443c1f7a0..ec0312cda6 100644 --- 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 index 8f04bddecc..d1dbca2d19 100644 --- 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 index 1fc3acf11c..19dfdf2c22 100644 --- 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 index 8071173f73..45d2b7bf6c 100644 --- 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 index 184c321b17..5db8816de4 100644 --- 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 index cb386f5fa8..511a499238 100644 --- 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 index a7cafc54ac..970cada978 100644 --- 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 index 03139b6884..14702362b0 100644 --- 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 index a613dc784a..37a09e2777 100644 --- 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 index dab2e3a9d1..5ccb1e51c0 100644 --- 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 index 6addf57f2e..2c681895cc 100644 --- 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 index 41c93bef73..12db95ddf2 100644 --- 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 index 3ee6299cfd..aea3a8f089 100644 --- 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 index cfe3a3f5ec..a35cb51154 100644 --- 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 index 7ff6922716..ce2901fb68 100644 --- 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 index e48b5c37c0..cc984ed70d 100644 --- 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 index de38efe521..57b4510e69 100644 --- 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 index cb23e48d4a..e78e9d67bc 100644 --- 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 index c3dd5ad9c3..207afefbf6 100644 --- 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 index 12b313d36e..c49a4544be 100644 --- 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 index b47f8be51b..80e0e5f8ae 100644 --- 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 index f030dae2ed..92486df97d 100644 --- 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 index 6d7c153dcd..f27f2b3998 100644 --- 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 index d0081ba8d5..3df7c0ebc4 100644 --- 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 index 07e2e9319c..7b5e785b6d 100644 --- 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 index 1dd285614c..2f132d3af6 100644 --- 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 index 3bde21638d..a4cbff33d0 100644 --- 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 index 5bbaa66526..bff40edf0f 100644 --- 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 diff --git a/test/e2e/kb/failure_test.go b/test/e2e/kb/failure_test.go index 7f202ed0c6..9f6755c4bc 100644 --- a/test/e2e/kb/failure_test.go +++ b/test/e2e/kb/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 kb e2e +//go:build kb || e2e package kb diff --git a/test/e2e/kb/keystore_test.go b/test/e2e/kb/keystore_test.go index 96ad34d17a..cab0032d1a 100644 --- a/test/e2e/kb/keystore_test.go +++ b/test/e2e/kb/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 kb e2e +//go:build kb || e2e package kb diff --git a/test/e2e/kb/resource_test.go b/test/e2e/kb/resource_test.go index 982ea3633a..eeaf65a7b7 100644 --- a/test/e2e/kb/resource_test.go +++ b/test/e2e/kb/resource_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 diff --git a/test/e2e/kb/stack_monitoring_test.go b/test/e2e/kb/stack_monitoring_test.go index 9c2b912c94..0efda1b40e 100644 --- a/test/e2e/kb/stack_monitoring_test.go +++ b/test/e2e/kb/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 kb e2e +//go:build kb || e2e package kb diff --git a/test/e2e/kb/standalone_test.go b/test/e2e/kb/standalone_test.go index 036b17af33..056c193b01 100644 --- a/test/e2e/kb/standalone_test.go +++ b/test/e2e/kb/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 kb e2e +//go:build kb || e2e package kb diff --git a/test/e2e/kb/telemetry_test.go b/test/e2e/kb/telemetry_test.go index e417c2cc9b..8f4bb6b4b6 100644 --- a/test/e2e/kb/telemetry_test.go +++ b/test/e2e/kb/telemetry_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 diff --git a/test/e2e/kb/version_upgrade_test.go b/test/e2e/kb/version_upgrade_test.go index cb8969f731..435b06da9e 100644 --- a/test/e2e/kb/version_upgrade_test.go +++ b/test/e2e/kb/version_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 kb e2e +//go:build kb || e2e package kb diff --git a/test/e2e/naming_test.go b/test/e2e/naming_test.go index 1c3358631a..e6333ee470 100644 --- a/test/e2e/naming_test.go +++ b/test/e2e/naming_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 mixed e2e +//go:build mixed || e2e package e2e diff --git a/test/e2e/samples_test.go b/test/e2e/samples_test.go index 2240154eb9..022ca070ed 100644 --- a/test/e2e/samples_test.go +++ b/test/e2e/samples_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/smoke_test.go b/test/e2e/smoke_test.go index f6f78b314b..a1f9278805 100644 --- a/test/e2e/smoke_test.go +++ b/test/e2e/smoke_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 mixed e2e +//go:build mixed || e2e package e2e diff --git a/test/e2e/stack_test.go b/test/e2e/stack_test.go index 643958e248..77f8250e41 100644 --- a/test/e2e/stack_test.go +++ b/test/e2e/stack_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 mixed e2e +//go:build mixed || e2e package e2e From 3da18e0b4999e9141d5a0761b68502aca0a92674 Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Tue, 24 May 2022 15:32:28 +0200 Subject: [PATCH 2/2] Run generate --- pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go | 1 + pkg/apis/apm/v1/zz_generated.deepcopy.go | 1 + pkg/apis/apm/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/beat/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/common/v1/zz_generated.deepcopy.go | 1 + pkg/apis/common/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go | 1 + pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go | 1 + pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/kibana/v1/zz_generated.deepcopy.go | 1 + pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go | 1 + pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go | 1 + 13 files changed, 13 insertions(+) diff --git a/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go index e714b70e1a..9372b42b9f 100644 --- a/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/agent/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/apm/v1/zz_generated.deepcopy.go b/pkg/apis/apm/v1/zz_generated.deepcopy.go index 2dac8b8e17..7075886f8b 100644 --- a/pkg/apis/apm/v1/zz_generated.deepcopy.go +++ b/pkg/apis/apm/v1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go b/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go index 9d62d63854..3f35683c82 100644 --- a/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/apm/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go b/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go index 39dcd2e808..8a5aee0b3c 100644 --- a/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/beat/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/common/v1/zz_generated.deepcopy.go b/pkg/apis/common/v1/zz_generated.deepcopy.go index d398dafa1a..e9d746265f 100644 --- a/pkg/apis/common/v1/zz_generated.deepcopy.go +++ b/pkg/apis/common/v1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/common/v1beta1/zz_generated.deepcopy.go b/pkg/apis/common/v1beta1/zz_generated.deepcopy.go index fcac84ad14..0f9b997c55 100644 --- a/pkg/apis/common/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/common/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go index 6ac56d33c2..c424db36e1 100644 --- a/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go +++ b/pkg/apis/elasticsearch/v1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go b/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go index 600b0182f2..5e722bce85 100644 --- a/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/elasticsearch/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go b/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go index de3ebe9cc0..a2c6244433 100644 --- a/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go +++ b/pkg/apis/enterprisesearch/v1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go b/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go index 0cf64e45cc..c3605cb99c 100644 --- a/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/enterprisesearch/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/kibana/v1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1/zz_generated.deepcopy.go index 8ea84908b4..b33df93e14 100644 --- a/pkg/apis/kibana/v1/zz_generated.deepcopy.go +++ b/pkg/apis/kibana/v1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go b/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go index f12ea3f7e7..5833f4a1d3 100644 --- a/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/kibana/v1beta1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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; diff --git a/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go index cf1b89d3ae..17cfea88d4 100644 --- a/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/maps/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated // 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;