From 6015dedcde8be3906cc868d754432a1f7e85af14 Mon Sep 17 00:00:00 2001 From: Pascal Zimmermann Date: Thu, 25 Nov 2021 22:40:57 +0100 Subject: [PATCH 1/4] Update golang version to 1.17 --- go.mod | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- go.sum | 1 - 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 67f8ed82c..92b080741 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gruntwork-io/terratest -go 1.14 +go 1.17 require ( cloud.google.com/go v0.83.0 @@ -47,3 +47,72 @@ require ( k8s.io/apimachinery v0.20.6 k8s.io/client-go v0.20.6 ) + +require ( + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dimchansky/utfbom v1.1.1 // indirect + github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker v20.10.7+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/go-logr/logr v0.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.3 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/googleapis/gnostic v0.4.1 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/imdario/mergo v0.3.11 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/klauspost/compress v1.13.0 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/satori/go.uuid v1.2.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + golang.org/x/tools v0.1.2 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/grpc v1.38.0 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) diff --git a/go.sum b/go.sum index 1e87ac790..6fdd7d67a 100644 --- a/go.sum +++ b/go.sum @@ -306,7 +306,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1 h1:yY9rWGoXv1U5pl4gxqlULARMQD7x0QG85lqEXTWysik= github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= From 58e80180e51c2b1ee47a05bfb7d4795c182c5eae Mon Sep 17 00:00:00 2001 From: Pascal Zimmermann Date: Thu, 23 Dec 2021 21:29:15 +0100 Subject: [PATCH 2/4] Reformat the test files with gofmt, add go version 1.17 to circleci configuration and execute pre-commit hooks --- .circleci/config.yml | 2 +- test/azure/terraform_azure_aci_example_test.go | 1 + test/azure/terraform_azure_acr_example_test.go | 1 + test/azure/terraform_azure_actiongroup_example_test.go | 1 + test/azure/terraform_azure_aks_example_test.go | 1 + test/azure/terraform_azure_availabilityset_example_test.go | 1 + test/azure/terraform_azure_cosmosdb_example_test.go | 1 + test/azure/terraform_azure_disk_example_test.go | 1 + test/azure/terraform_azure_example_test.go | 1 + test/azure/terraform_azure_frontdoor_example_test.go | 1 + test/azure/terraform_azure_functionapp_example_test.go | 1 + test/azure/terraform_azure_keyvault_example_test.go | 1 + test/azure/terraform_azure_loadbalancer_example_test.go | 1 + test/azure/terraform_azure_loganalytics_example_test.go | 1 + test/azure/terraform_azure_monitor_example_test.go | 1 + test/azure/terraform_azure_mysqldb_example_test.go | 1 + test/azure/terraform_azure_network_example_test.go | 1 + test/azure/terraform_azure_nsg_example_test.go | 1 + test/azure/terraform_azure_postgresql_example_test.go | 1 + test/azure/terraform_azure_recoveryservices_example_test.go | 1 + test/azure/terraform_azure_resourcegroup_example_test.go | 1 + test/azure/terraform_azure_servicebus_example_test.go | 1 + test/azure/terraform_azure_sqldb_example_test.go | 1 + test/azure/terraform_azure_storage_example_test.go | 1 + test/azure/terraform_azure_vm_example_test.go | 1 + test/gcp/packer_gcp_basic_example_test.go | 1 + test/gcp/terraform_gcp_example_test.go | 1 + test/gcp/terraform_gcp_hello_world_example_test.go | 1 + test/gcp/terraform_gcp_ig_example_test.go | 1 + test/helm_basic_example_integration_test.go | 1 + test/helm_basic_example_template_test.go | 1 + test/kubernetes_basic_example_service_check_test.go | 1 + test/kubernetes_basic_example_test.go | 1 + test/kubernetes_hello_world_example_test.go | 2 ++ test/kubernetes_rbac_example_test.go | 1 + 35 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92aa18bbd..2412f2a50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ env: &env PACKER_VERSION: 1.7.4 TERRAGRUNT_VERSION: v0.32.3 OPA_VERSION: v0.33.1 - GO_VERSION: 1.16.3 + GO_VERSION: 1.17 GO111MODULE: auto K8S_VERSION: v1.15.0 # Same as EKS MINIKUBE_VERSION: v1.9.2 diff --git a/test/azure/terraform_azure_aci_example_test.go b/test/azure/terraform_azure_aci_example_test.go index e4921e003..465105749 100644 --- a/test/azure/terraform_azure_aci_example_test.go +++ b/test/azure/terraform_azure_aci_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_acr_example_test.go b/test/azure/terraform_azure_acr_example_test.go index b0682a98b..cd6fc1825 100644 --- a/test/azure/terraform_azure_acr_example_test.go +++ b/test/azure/terraform_azure_acr_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_actiongroup_example_test.go b/test/azure/terraform_azure_actiongroup_example_test.go index 1b37b6e9c..299d88043 100644 --- a/test/azure/terraform_azure_actiongroup_example_test.go +++ b/test/azure/terraform_azure_actiongroup_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_aks_example_test.go b/test/azure/terraform_azure_aks_example_test.go index 6c526f02f..e8eed94cb 100644 --- a/test/azure/terraform_azure_aks_example_test.go +++ b/test/azure/terraform_azure_aks_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_availabilityset_example_test.go b/test/azure/terraform_azure_availabilityset_example_test.go index e34261b1c..244e63c39 100644 --- a/test/azure/terraform_azure_availabilityset_example_test.go +++ b/test/azure/terraform_azure_availabilityset_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_cosmosdb_example_test.go b/test/azure/terraform_azure_cosmosdb_example_test.go index 6d285c08e..9458b761c 100644 --- a/test/azure/terraform_azure_cosmosdb_example_test.go +++ b/test/azure/terraform_azure_cosmosdb_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_disk_example_test.go b/test/azure/terraform_azure_disk_example_test.go index c932555b1..bd6939728 100644 --- a/test/azure/terraform_azure_disk_example_test.go +++ b/test/azure/terraform_azure_disk_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_example_test.go b/test/azure/terraform_azure_example_test.go index 4609cdc84..56e849dbf 100644 --- a/test/azure/terraform_azure_example_test.go +++ b/test/azure/terraform_azure_example_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && compute) // +build azure azureslim,compute // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_frontdoor_example_test.go b/test/azure/terraform_azure_frontdoor_example_test.go index 1d4a3e789..0f45d1a2c 100644 --- a/test/azure/terraform_azure_frontdoor_example_test.go +++ b/test/azure/terraform_azure_frontdoor_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_functionapp_example_test.go b/test/azure/terraform_azure_functionapp_example_test.go index 3ef8fb48b..5a61af2bc 100644 --- a/test/azure/terraform_azure_functionapp_example_test.go +++ b/test/azure/terraform_azure_functionapp_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_keyvault_example_test.go b/test/azure/terraform_azure_keyvault_example_test.go index 3f4129c97..a43a23d8c 100644 --- a/test/azure/terraform_azure_keyvault_example_test.go +++ b/test/azure/terraform_azure_keyvault_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_loadbalancer_example_test.go b/test/azure/terraform_azure_loadbalancer_example_test.go index 9c7d08507..8fad24205 100644 --- a/test/azure/terraform_azure_loadbalancer_example_test.go +++ b/test/azure/terraform_azure_loadbalancer_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_loganalytics_example_test.go b/test/azure/terraform_azure_loganalytics_example_test.go index 934dbf7f5..50b866aa0 100644 --- a/test/azure/terraform_azure_loganalytics_example_test.go +++ b/test/azure/terraform_azure_loganalytics_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_monitor_example_test.go b/test/azure/terraform_azure_monitor_example_test.go index dc072ba7d..10e11212d 100644 --- a/test/azure/terraform_azure_monitor_example_test.go +++ b/test/azure/terraform_azure_monitor_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_mysqldb_example_test.go b/test/azure/terraform_azure_mysqldb_example_test.go index 6c25ebe4b..96fce2b2a 100644 --- a/test/azure/terraform_azure_mysqldb_example_test.go +++ b/test/azure/terraform_azure_mysqldb_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_network_example_test.go b/test/azure/terraform_azure_network_example_test.go index 9f7ed3276..44d271594 100644 --- a/test/azure/terraform_azure_network_example_test.go +++ b/test/azure/terraform_azure_network_example_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && network) // +build azure azureslim,network // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_nsg_example_test.go b/test/azure/terraform_azure_nsg_example_test.go index cb641ba86..b931cc52b 100644 --- a/test/azure/terraform_azure_nsg_example_test.go +++ b/test/azure/terraform_azure_nsg_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_postgresql_example_test.go b/test/azure/terraform_azure_postgresql_example_test.go index 48775354c..d7c61b453 100644 --- a/test/azure/terraform_azure_postgresql_example_test.go +++ b/test/azure/terraform_azure_postgresql_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_recoveryservices_example_test.go b/test/azure/terraform_azure_recoveryservices_example_test.go index d95052222..ae414bc81 100644 --- a/test/azure/terraform_azure_recoveryservices_example_test.go +++ b/test/azure/terraform_azure_recoveryservices_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_resourcegroup_example_test.go b/test/azure/terraform_azure_resourcegroup_example_test.go index d53c35758..af8757c38 100644 --- a/test/azure/terraform_azure_resourcegroup_example_test.go +++ b/test/azure/terraform_azure_resourcegroup_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_servicebus_example_test.go b/test/azure/terraform_azure_servicebus_example_test.go index 64dd12f53..f8966d3e2 100644 --- a/test/azure/terraform_azure_servicebus_example_test.go +++ b/test/azure/terraform_azure_servicebus_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_sqldb_example_test.go b/test/azure/terraform_azure_sqldb_example_test.go index c82ab153f..dff897136 100644 --- a/test/azure/terraform_azure_sqldb_example_test.go +++ b/test/azure/terraform_azure_sqldb_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_storage_example_test.go b/test/azure/terraform_azure_storage_example_test.go index ec71d0fb3..e15543bcc 100644 --- a/test/azure/terraform_azure_storage_example_test.go +++ b/test/azure/terraform_azure_storage_example_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/azure/terraform_azure_vm_example_test.go b/test/azure/terraform_azure_vm_example_test.go index 35f3aac8d..5df9ebeee 100644 --- a/test/azure/terraform_azure_vm_example_test.go +++ b/test/azure/terraform_azure_vm_example_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && compute) // +build azure azureslim,compute // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/test/gcp/packer_gcp_basic_example_test.go b/test/gcp/packer_gcp_basic_example_test.go index bfc3b35b2..48cee8c2d 100644 --- a/test/gcp/packer_gcp_basic_example_test.go +++ b/test/gcp/packer_gcp_basic_example_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/test/gcp/terraform_gcp_example_test.go b/test/gcp/terraform_gcp_example_test.go index 6b14ff176..72cfd74d2 100644 --- a/test/gcp/terraform_gcp_example_test.go +++ b/test/gcp/terraform_gcp_example_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/test/gcp/terraform_gcp_hello_world_example_test.go b/test/gcp/terraform_gcp_hello_world_example_test.go index 549f97bc6..8c48e7448 100644 --- a/test/gcp/terraform_gcp_hello_world_example_test.go +++ b/test/gcp/terraform_gcp_hello_world_example_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/test/gcp/terraform_gcp_ig_example_test.go b/test/gcp/terraform_gcp_ig_example_test.go index 13e6423ef..ebf7e7b07 100644 --- a/test/gcp/terraform_gcp_ig_example_test.go +++ b/test/gcp/terraform_gcp_ig_example_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/test/helm_basic_example_integration_test.go b/test/helm_basic_example_integration_test.go index 59f3e9bbf..b87132805 100644 --- a/test/helm_basic_example_integration_test.go +++ b/test/helm_basic_example_integration_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || helm // +build kubeall helm // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests, and further differentiate helm diff --git a/test/helm_basic_example_template_test.go b/test/helm_basic_example_template_test.go index 1ceb6d1bd..da120e3d2 100644 --- a/test/helm_basic_example_template_test.go +++ b/test/helm_basic_example_template_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || helm // +build kubeall helm // **NOTE**: we have build tags to differentiate kubernetes tests from non-kubernetes tests, and further differentiate helm diff --git a/test/kubernetes_basic_example_service_check_test.go b/test/kubernetes_basic_example_service_check_test.go index 6c4519a12..150012a70 100644 --- a/test/kubernetes_basic_example_service_check_test.go +++ b/test/kubernetes_basic_example_service_check_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/test/kubernetes_basic_example_test.go b/test/kubernetes_basic_example_test.go index 62927001e..d6aa83bd6 100644 --- a/test/kubernetes_basic_example_test.go +++ b/test/kubernetes_basic_example_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/test/kubernetes_hello_world_example_test.go b/test/kubernetes_hello_world_example_test.go index 32b023fd2..5a508d027 100644 --- a/test/kubernetes_hello_world_example_test.go +++ b/test/kubernetes_hello_world_example_test.go @@ -1,4 +1,6 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes + // NOTE: See the notes in the other Kubernetes example tests for why this build tag is included. package test diff --git a/test/kubernetes_rbac_example_test.go b/test/kubernetes_rbac_example_test.go index 42a52c643..d83d82793 100644 --- a/test/kubernetes_rbac_example_test.go +++ b/test/kubernetes_rbac_example_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube From f4dfd19c6dab0a0d031d89f22aa4785e441fa45f Mon Sep 17 00:00:00 2001 From: Pascal Zimmermann Date: Sat, 15 Jan 2022 13:29:30 +0100 Subject: [PATCH 3/4] Reformat with go fmt the modules path --- modules/azure/actiongroup_test.go | 1 + modules/azure/appService_test.go | 1 + modules/azure/availabilityset_test.go | 1 + modules/azure/client_factory_test.go | 1 + modules/azure/common_test.go | 1 + modules/azure/compute_test.go | 1 + modules/azure/containers_test.go | 1 + modules/azure/disk_test.go | 1 + modules/azure/frontdoor_test.go | 1 + modules/azure/loadbalancer_test.go | 1 + modules/azure/monitor_test.go | 1 + modules/azure/mysql_test.go | 1 + modules/azure/networkinterface_test.go | 1 + modules/azure/nsg_test.go | 1 + modules/azure/postgresql_test.go | 1 + modules/azure/publicaddress_test.go | 1 + modules/azure/region_test.go | 1 + modules/azure/resourcegroup_test.go | 1 + modules/azure/resourceid_test.go | 1 + modules/azure/servicebus_test.go | 1 + modules/azure/sql_test.go | 1 + modules/azure/virtualnetwork_test.go | 1 + modules/gcp/cloudbuild_test.go | 1 + modules/gcp/compute_test.go | 1 + modules/gcp/oslogin_test.go | 1 + modules/gcp/region_test.go | 1 + modules/gcp/storage_test.go | 1 + modules/helm/install_test.go | 1 + modules/helm/upgrade_test.go | 1 + modules/k8s/cluster_role_test.go | 1 + modules/k8s/config_test.go | 1 + modules/k8s/daemonset_test.go | 1 + modules/k8s/ingress_test.go | 1 + modules/k8s/job_test.go | 1 + modules/k8s/kubectl_test.go | 1 + modules/k8s/minikube_test.go | 1 + modules/k8s/namespace_test.go | 1 + modules/k8s/node_test.go | 1 + modules/k8s/pod_test.go | 1 + modules/k8s/replicaset_test.go | 1 + modules/k8s/role_test.go | 1 + modules/k8s/secret_test.go | 1 + modules/k8s/self_subject_access_review_test.go | 1 + modules/k8s/service_account_test.go | 1 + modules/k8s/service_test.go | 1 + modules/k8s/tunnel_test.go | 1 + modules/k8s/version_test.go | 1 + 47 files changed, 47 insertions(+) diff --git a/modules/azure/actiongroup_test.go b/modules/azure/actiongroup_test.go index f4d805429..78b26d388 100644 --- a/modules/azure/actiongroup_test.go +++ b/modules/azure/actiongroup_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/appService_test.go b/modules/azure/appService_test.go index d96ec118a..b2fc7dd39 100644 --- a/modules/azure/appService_test.go +++ b/modules/azure/appService_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/availabilityset_test.go b/modules/azure/availabilityset_test.go index 8490ee5c2..551d9eeb2 100644 --- a/modules/azure/availabilityset_test.go +++ b/modules/azure/availabilityset_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/client_factory_test.go b/modules/azure/client_factory_test.go index 9aba33273..b58e127fb 100644 --- a/modules/azure/client_factory_test.go +++ b/modules/azure/client_factory_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // This file contains unit tests for the client factory implementation(s). diff --git a/modules/azure/common_test.go b/modules/azure/common_test.go index 71bc609db..e14bf3941 100644 --- a/modules/azure/common_test.go +++ b/modules/azure/common_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/compute_test.go b/modules/azure/compute_test.go index af31bc2ed..e16b9364e 100644 --- a/modules/azure/compute_test.go +++ b/modules/azure/compute_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/containers_test.go b/modules/azure/containers_test.go index ff62f145c..c68d0866f 100644 --- a/modules/azure/containers_test.go +++ b/modules/azure/containers_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/disk_test.go b/modules/azure/disk_test.go index 37df6dd55..905169fdc 100644 --- a/modules/azure/disk_test.go +++ b/modules/azure/disk_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/frontdoor_test.go b/modules/azure/frontdoor_test.go index 55aecbed9..76211e7ee 100644 --- a/modules/azure/frontdoor_test.go +++ b/modules/azure/frontdoor_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/loadbalancer_test.go b/modules/azure/loadbalancer_test.go index d3837ebd5..d405ea4c6 100644 --- a/modules/azure/loadbalancer_test.go +++ b/modules/azure/loadbalancer_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/monitor_test.go b/modules/azure/monitor_test.go index 85892d771..ac3e1e799 100644 --- a/modules/azure/monitor_test.go +++ b/modules/azure/monitor_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure package azure diff --git a/modules/azure/mysql_test.go b/modules/azure/mysql_test.go index de61d0f6a..1a0f2c6c1 100644 --- a/modules/azure/mysql_test.go +++ b/modules/azure/mysql_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/networkinterface_test.go b/modules/azure/networkinterface_test.go index f5a962258..3158912e5 100644 --- a/modules/azure/networkinterface_test.go +++ b/modules/azure/networkinterface_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && network) // +build azure azureslim,network // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/nsg_test.go b/modules/azure/nsg_test.go index 49c6f5369..595c4f493 100644 --- a/modules/azure/nsg_test.go +++ b/modules/azure/nsg_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/postgresql_test.go b/modules/azure/postgresql_test.go index 5355fd441..2b6b0f474 100644 --- a/modules/azure/postgresql_test.go +++ b/modules/azure/postgresql_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/publicaddress_test.go b/modules/azure/publicaddress_test.go index d37aa175e..6f32daec9 100644 --- a/modules/azure/publicaddress_test.go +++ b/modules/azure/publicaddress_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && network) // +build azure azureslim,network // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/region_test.go b/modules/azure/region_test.go index 00c42aa39..27d19a04e 100644 --- a/modules/azure/region_test.go +++ b/modules/azure/region_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/resourcegroup_test.go b/modules/azure/resourcegroup_test.go index 5157cc645..e330292da 100644 --- a/modules/azure/resourcegroup_test.go +++ b/modules/azure/resourcegroup_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/resourceid_test.go b/modules/azure/resourceid_test.go index dac80ed2f..7136840b2 100644 --- a/modules/azure/resourceid_test.go +++ b/modules/azure/resourceid_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/servicebus_test.go b/modules/azure/servicebus_test.go index f96077dd4..b85ca8748 100644 --- a/modules/azure/servicebus_test.go +++ b/modules/azure/servicebus_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/sql_test.go b/modules/azure/sql_test.go index 530700d3d..e22b015d6 100644 --- a/modules/azure/sql_test.go +++ b/modules/azure/sql_test.go @@ -1,3 +1,4 @@ +//go:build azure // +build azure // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/azure/virtualnetwork_test.go b/modules/azure/virtualnetwork_test.go index 988e8acd3..6b3f73fbe 100644 --- a/modules/azure/virtualnetwork_test.go +++ b/modules/azure/virtualnetwork_test.go @@ -1,3 +1,4 @@ +//go:build azure || (azureslim && network) // +build azure azureslim,network // NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for diff --git a/modules/gcp/cloudbuild_test.go b/modules/gcp/cloudbuild_test.go index 98df700c4..ada2e1b19 100644 --- a/modules/gcp/cloudbuild_test.go +++ b/modules/gcp/cloudbuild_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/modules/gcp/compute_test.go b/modules/gcp/compute_test.go index f89b6f77f..da960a499 100644 --- a/modules/gcp/compute_test.go +++ b/modules/gcp/compute_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/modules/gcp/oslogin_test.go b/modules/gcp/oslogin_test.go index 038846da3..9908de315 100644 --- a/modules/gcp/oslogin_test.go +++ b/modules/gcp/oslogin_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/modules/gcp/region_test.go b/modules/gcp/region_test.go index 323b7d3aa..ee3ecd6f9 100644 --- a/modules/gcp/region_test.go +++ b/modules/gcp/region_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/modules/gcp/storage_test.go b/modules/gcp/storage_test.go index c1a2773fa..20ac29412 100644 --- a/modules/gcp/storage_test.go +++ b/modules/gcp/storage_test.go @@ -1,3 +1,4 @@ +//go:build gcp // +build gcp // NOTE: We use build tags to differentiate GCP testing for better isolation and parallelism when executing our tests. diff --git a/modules/helm/install_test.go b/modules/helm/install_test.go index a67a5c787..da7f2d764 100644 --- a/modules/helm/install_test.go +++ b/modules/helm/install_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || helm // +build kubeall helm // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests, and further differentiate helm diff --git a/modules/helm/upgrade_test.go b/modules/helm/upgrade_test.go index 1f55a73ec..90b50e853 100644 --- a/modules/helm/upgrade_test.go +++ b/modules/helm/upgrade_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || helm // +build kubeall helm // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests, and further differentiate helm diff --git a/modules/k8s/cluster_role_test.go b/modules/k8s/cluster_role_test.go index 63707c923..61b585d06 100644 --- a/modules/k8s/cluster_role_test.go +++ b/modules/k8s/cluster_role_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/config_test.go b/modules/k8s/config_test.go index 8460388a4..37b06706d 100644 --- a/modules/k8s/config_test.go +++ b/modules/k8s/config_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/daemonset_test.go b/modules/k8s/daemonset_test.go index e917326f3..ada7e273b 100644 --- a/modules/k8s/daemonset_test.go +++ b/modules/k8s/daemonset_test.go @@ -1,3 +1,4 @@ +//go:build kubernetes // +build kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/ingress_test.go b/modules/k8s/ingress_test.go index a74ac0da7..a716cd757 100644 --- a/modules/k8s/ingress_test.go +++ b/modules/k8s/ingress_test.go @@ -1,3 +1,4 @@ +//go:build kubernetes // +build kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/job_test.go b/modules/k8s/job_test.go index ea912586f..d92d07af3 100644 --- a/modules/k8s/job_test.go +++ b/modules/k8s/job_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/kubectl_test.go b/modules/k8s/kubectl_test.go index b56a0309f..bc12bb2be 100644 --- a/modules/k8s/kubectl_test.go +++ b/modules/k8s/kubectl_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/minikube_test.go b/modules/k8s/minikube_test.go index aa13b7dc1..483249e86 100644 --- a/modules/k8s/minikube_test.go +++ b/modules/k8s/minikube_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/namespace_test.go b/modules/k8s/namespace_test.go index b8bf02143..a839c143c 100644 --- a/modules/k8s/namespace_test.go +++ b/modules/k8s/namespace_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/node_test.go b/modules/k8s/node_test.go index 20419910f..135aa0047 100644 --- a/modules/k8s/node_test.go +++ b/modules/k8s/node_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/pod_test.go b/modules/k8s/pod_test.go index fcf73a4fd..0551b8a7a 100644 --- a/modules/k8s/pod_test.go +++ b/modules/k8s/pod_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/replicaset_test.go b/modules/k8s/replicaset_test.go index 6397a853c..9e99c582f 100644 --- a/modules/k8s/replicaset_test.go +++ b/modules/k8s/replicaset_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/role_test.go b/modules/k8s/role_test.go index 7718de48f..9717d6ca3 100644 --- a/modules/k8s/role_test.go +++ b/modules/k8s/role_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/secret_test.go b/modules/k8s/secret_test.go index 3bc736a22..ab0ae2255 100644 --- a/modules/k8s/secret_test.go +++ b/modules/k8s/secret_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/self_subject_access_review_test.go b/modules/k8s/self_subject_access_review_test.go index 5dfd3cdb2..e76055e86 100644 --- a/modules/k8s/self_subject_access_review_test.go +++ b/modules/k8s/self_subject_access_review_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/service_account_test.go b/modules/k8s/service_account_test.go index a0f077d12..fb985e213 100644 --- a/modules/k8s/service_account_test.go +++ b/modules/k8s/service_account_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/service_test.go b/modules/k8s/service_test.go index b1ca63ebf..ee41ff190 100644 --- a/modules/k8s/service_test.go +++ b/modules/k8s/service_test.go @@ -1,3 +1,4 @@ +//go:build kubernetes // +build kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/tunnel_test.go b/modules/k8s/tunnel_test.go index ef872ba68..d7de87b9a 100644 --- a/modules/k8s/tunnel_test.go +++ b/modules/k8s/tunnel_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube diff --git a/modules/k8s/version_test.go b/modules/k8s/version_test.go index f4d467b4b..2e90e2080 100644 --- a/modules/k8s/version_test.go +++ b/modules/k8s/version_test.go @@ -1,3 +1,4 @@ +//go:build kubeall || kubernetes // +build kubeall kubernetes // NOTE: we have build tags to differentiate kubernetes tests from non-kubernetes tests. This is done because minikube From 1524d68c05a51470ba09657e4d178ef55899ab27 Mon Sep 17 00:00:00 2001 From: Pascal Zimmermann Date: Sun, 23 Jan 2022 15:15:06 +0100 Subject: [PATCH 4/4] Update go 1.16.3 to 1.17 inside the report files --- .../logger/parser/fixtures/basic_example_expected/report.xml | 2 +- .../logger/parser/fixtures/failing_example_expected/report.xml | 2 +- .../parser/fixtures/new_go_failing_example_expected/report.xml | 2 +- .../logger/parser/fixtures/panic_example_expected/report.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/logger/parser/fixtures/basic_example_expected/report.xml b/modules/logger/parser/fixtures/basic_example_expected/report.xml index 4af7a1ca0..e652dfde2 100644 --- a/modules/logger/parser/fixtures/basic_example_expected/report.xml +++ b/modules/logger/parser/fixtures/basic_example_expected/report.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/logger/parser/fixtures/failing_example_expected/report.xml b/modules/logger/parser/fixtures/failing_example_expected/report.xml index 81eec8ab4..1d2fcb316 100644 --- a/modules/logger/parser/fixtures/failing_example_expected/report.xml +++ b/modules/logger/parser/fixtures/failing_example_expected/report.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/logger/parser/fixtures/new_go_failing_example_expected/report.xml b/modules/logger/parser/fixtures/new_go_failing_example_expected/report.xml index 10c90ab23..d3338191d 100644 --- a/modules/logger/parser/fixtures/new_go_failing_example_expected/report.xml +++ b/modules/logger/parser/fixtures/new_go_failing_example_expected/report.xml @@ -2,7 +2,7 @@ - + integration_test.go:57: diff --git a/modules/logger/parser/fixtures/panic_example_expected/report.xml b/modules/logger/parser/fixtures/panic_example_expected/report.xml index dc657d03f..776f2ed55 100644 --- a/modules/logger/parser/fixtures/panic_example_expected/report.xml +++ b/modules/logger/parser/fixtures/panic_example_expected/report.xml @@ -2,7 +2,7 @@ - +