refactor(tests): add more granular test tags (per env per product) (#303)

filiptubic · web-flow · commit 81a29be96c64 · 2023-04-26T10:39:51.000+02:00
* refactor(tests): add sysdig_monitor, sysdig_secure, ibm_monitor build tags
* refactor(tests): set add tests granularity in github actions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Test
         run: make test
 
-  test-sysdig:
-    name: Sysdig Acceptance Tests
+  test-sysdig-monitor:
+    name: Sysdig Monitor Acceptance Tests
     runs-on: ubuntu-latest
     needs: test
 
@@ -41,11 +41,12 @@ jobs:
       - name: Test
         run: make testacc
         env:
+          TEST_SUITE: tf_acc_sysdig_monitor
           SYSDIG_MONITOR_API_TOKEN: ${{ secrets.KUBELAB_MONITOR_API_TOKEN }}
           SYSDIG_SECURE_API_TOKEN: ${{ secrets.KUBELAB_SECURE_API_TOKEN }}
 
-  test-ibm:
-    name: IBM Acceptance Tests
+  test-sysdig-secure:
+    name: Sysdig Secure Acceptance Tests
     runs-on: ubuntu-latest
     needs: test
 
@@ -61,8 +62,32 @@ jobs:
           cache: true
 
       - name: Test
-        run: make testacc-ibm
+        run: make testacc
+        env:
+          TEST_SUITE: tf_acc_sysdig_secure
+          SYSDIG_MONITOR_API_TOKEN: ${{ secrets.KUBELAB_MONITOR_API_TOKEN }}
+          SYSDIG_SECURE_API_TOKEN: ${{ secrets.KUBELAB_SECURE_API_TOKEN }}
+
+  test-ibm-monitor:
+    name: IBM Monitor Acceptance Tests
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+          cache: true
+
+      - name: Test
+        run: make testacc
         env:
+          TEST_SUITE: tf_acc_ibm_monitor
           SYSDIG_IBM_MONITOR_API_KEY: ${{ secrets.TERRAFORM_IBM_API_KEY }}
           SYSDIG_IBM_MONITOR_INSTANCE_ID: ${{ secrets.TERRAFORM_IBM_MONITOR_INSTANCE_ID }}
           SYSDIG_IBM_MONITOR_IAM_URL: "https://iam.test.cloud.ibm.com"
diff --git a/GNUmakefile b/GNUmakefile
@@ -40,9 +40,6 @@ test: fmtcheck
 testacc: fmtcheck
 	CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race -parallel=1
 
-testacc-ibm: fmtcheck
-	CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -tags=tf_acc_ibm -timeout 120m -race -parallel=1
-
 junit-report: fmtcheck
 	@go install github.com/jstemmer/go-junit-report/v2@latest
 	CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race 2>&1 -parallel=1 | go-junit-report -iocopy -out junit-report.xml
diff --git a/sysdig/common_test.go b/sysdig/common_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm || unit
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure || tf_acc_ibm || tf_acc_ibm_monitor || unit
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_current_user_test.go b/sysdig/data_source_sysdig_current_user_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_fargate_workload_agent_test.go b/sysdig/data_source_sysdig_fargate_workload_agent_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_monitor_notification_channel_email_test.go b/sysdig/data_source_sysdig_monitor_notification_channel_email_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_monitor_notification_channel_pagerduty_test.go b/sysdig/data_source_sysdig_monitor_notification_channel_pagerduty_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_secure_current_connection_test.go b/sysdig/data_source_sysdig_secure_current_connection_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_secure_notification_channel_test.go b/sysdig/data_source_sysdig_secure_notification_channel_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_secure_trusted_cloud_identity_test.go b/sysdig/data_source_sysdig_secure_trusted_cloud_identity_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/data_source_sysdig_user_test.go b/sysdig/data_source_sysdig_user_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/provider_test.go b/sysdig/provider_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_group_mapping_test.go b/sysdig/resource_sysdig_group_mapping_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_anomaly_test.go b/sysdig/resource_sysdig_monitor_alert_anomaly_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_downtime_test.go b/sysdig/resource_sysdig_monitor_alert_downtime_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_event_test.go b/sysdig/resource_sysdig_monitor_alert_event_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_group_outlier_test.go b/sysdig/resource_sysdig_monitor_alert_group_outlier_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_metric_test.go b/sysdig/resource_sysdig_monitor_alert_metric_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_promql_test.go b/sysdig/resource_sysdig_monitor_alert_promql_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_v2_downtime_test.go b/sysdig/resource_sysdig_monitor_alert_v2_downtime_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_v2_event_test.go b/sysdig/resource_sysdig_monitor_alert_v2_event_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_v2_metric_test.go b/sysdig/resource_sysdig_monitor_alert_v2_metric_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_alert_v2_prometheus_test.go b/sysdig/resource_sysdig_monitor_alert_v2_prometheus_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_cloud_account_test.go b/sysdig/resource_sysdig_monitor_cloud_account_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_dashboard_test.go b/sysdig/resource_sysdig_monitor_dashboard_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_email_test.go b/sysdig/resource_sysdig_monitor_notification_channel_email_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_opsgenie_test.go b/sysdig/resource_sysdig_monitor_notification_channel_opsgenie_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_pagerduty_test.go b/sysdig/resource_sysdig_monitor_notification_channel_pagerduty_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_slack_test.go b/sysdig/resource_sysdig_monitor_notification_channel_slack_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_sns_test.go b/sysdig/resource_sysdig_monitor_notification_channel_sns_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_victorops_test.go b/sysdig/resource_sysdig_monitor_notification_channel_victorops_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_webhook_test.go b/sysdig/resource_sysdig_monitor_notification_channel_webhook_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_team_ibm_test.go b/sysdig/resource_sysdig_monitor_team_ibm_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_ibm
+//go:build tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_team_shared_test.go b/sysdig/resource_sysdig_monitor_team_shared_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_ibm
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor || tf_acc_ibm || tf_acc_ibm_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_monitor_team_test.go b/sysdig/resource_sysdig_monitor_team_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_monitor
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_cloud_account_test.go b/sysdig/resource_sysdig_secure_cloud_account_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_list_test.go b/sysdig/resource_sysdig_secure_list_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_macro_test.go b/sysdig/resource_sysdig_secure_macro_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_email_test.go b/sysdig/resource_sysdig_secure_notification_channel_email_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_opsgenie_test.go b/sysdig/resource_sysdig_secure_notification_channel_opsgenie_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_pagerduty_test.go b/sysdig/resource_sysdig_secure_notification_channel_pagerduty_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_slack_test.go b/sysdig/resource_sysdig_secure_notification_channel_slack_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_sns_test.go b/sysdig/resource_sysdig_secure_notification_channel_sns_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_victorops_test.go b/sysdig/resource_sysdig_secure_notification_channel_victorops_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_notification_channel_webhook_test.go b/sysdig/resource_sysdig_secure_notification_channel_webhook_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_policy_test.go b/sysdig/resource_sysdig_secure_policy_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_container_test.go b/sysdig/resource_sysdig_secure_rule_container_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_falco_test.go b/sysdig/resource_sysdig_secure_rule_falco_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_filesystem_test.go b/sysdig/resource_sysdig_secure_rule_filesystem_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_network_test.go b/sysdig/resource_sysdig_secure_rule_network_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_process_test.go b/sysdig/resource_sysdig_secure_rule_process_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_rule_syscall_test.go b/sysdig/resource_sysdig_secure_rule_syscall_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_policies
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_policies
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_scanningpolicies_test.go b/sysdig/resource_sysdig_secure_scanningpolicies_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_scanning_legacy
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_scanning_legacy
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_scanningpoliciesassignments_test.go b/sysdig/resource_sysdig_secure_scanningpoliciesassignments_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_scanning_legacy
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_scanning_legacy
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_team_test.go b/sysdig/resource_sysdig_secure_team_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_vulnerability_exception_list_test.go b/sysdig/resource_sysdig_secure_vulnerability_exception_list_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_scanning_legacy
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_scanning_legacy
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_secure_vulnerability_exception_test.go b/sysdig/resource_sysdig_secure_vulnerability_exception_test.go
@@ -1,4 +1,4 @@
-//go:build tf_acc_sysdig || tf_acc_scanning_legacy
+//go:build tf_acc_sysdig || tf_acc_sysdig_secure || tf_acc_scanning_legacy
 
 package sysdig_test
 
diff --git a/sysdig/resource_sysdig_user_test.go b/sysdig/resource_sysdig_user_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build tf_acc_sysdig \|\| tf_acc_ibm \|\| unit`
	`1`	`+//go:build tf_acc_sysdig \|\| tf_acc_sysdig_monitor \|\| tf_acc_sysdig_secure \|\| tf_acc_ibm \|\| tf_acc_ibm_monitor \|\| unit`
`2`	`2`
`3`	`3`	`package sysdig_test`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build tf_acc_sysdig`
	`1`	`+//go:build tf_acc_sysdig \|\| tf_acc_sysdig_monitor \|\| tf_acc_sysdig_secure`
`2`	`2`
`3`	`3`	`package sysdig_test`
`4`	`4`