Fix Failing test TestAccSecurityCenterV2ProjectBigQueryExportConfig_b…

…asic + others (#12334) (#20700) [upstream:654663666d97447080ded5cd3e5cb3b62e2dfffc] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Dec 16, 2024 · 1a593c0 · 1a593c0
1 parent a4bdf40
commit 1a593c0
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 17 deletions.
diff --git a/.changelog/12334.txt b/.changelog/12334.txt
@@ -0,0 +1,3 @@
+```release-note:none
+securitycenterv2: fixed flaky test TestAccSecurityCenterV2ProjectBigQueryExportConfig_basic
+```
diff --git a/google/services/securitycenter/resource_scc_organization_big_query_export_config_test.go b/google/services/securitycenter/resource_scc_organization_big_query_export_config_test.go
@@ -15,13 +15,13 @@ func TestAccSecurityCenterOrganizationBigQueryExportConfig_basic(t *testing.T) {
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
-	dataset_id := "tf_test_" + randomSuffix
+	datasetID := "tf_test_" + randomSuffix
 	orgID := envvar.GetTestOrgFromEnv(t)
 
 	context := map[string]interface{}{
 		"org_id":              orgID,
 		"random_suffix":       randomSuffix,
-		"dataset_id":          dataset_id,
+		"dataset_id":          datasetID,
 		"big_query_export_id": "tf-test-export-" + randomSuffix,
 		"name": fmt.Sprintf("organizations/%s/bigQueryExports/%s",
 			orgID, "tf-test-export-"+randomSuffix),
@@ -67,6 +67,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true
 
   labels = {
     env = "default"
@@ -79,7 +80,7 @@ resource "google_bigquery_dataset" "default" {
 
 resource "time_sleep" "wait_1_minute" {
 	depends_on = [google_bigquery_dataset.default]
-	create_duration = "3m"
+	create_duration = "6m"
 }
 
 resource "google_scc_organization_scc_big_query_export" "default" {
@@ -92,6 +93,10 @@ resource "google_scc_organization_scc_big_query_export" "default" {
   depends_on = [time_sleep.wait_1_minute]
 }
 
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_organization_scc_big_query_export.default]
+}
 `, context)
 }
 
@@ -105,6 +110,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true
 
   labels = {
     env = "default"
@@ -115,12 +121,24 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
+resource "time_sleep" "wait_1_minute" {
+	depends_on = [google_bigquery_dataset.default]
+	create_duration = "6m"
+}
+
 resource "google_scc_organization_scc_big_query_export" "default" {
   big_query_export_id    = "%{big_query_export_id}"
   organization = "%{org_id}"
   dataset      = google_bigquery_dataset.default.id
   description  = "SCC Findings Big Query Export Update"
   filter       = "state=\"ACTIVE\" AND NOT mute=\"MUTED\""
+
+  depends_on = [time_sleep.wait_1_minute]
+}
+
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_organization_scc_big_query_export.default]
 }
 `, context)
 }
diff --git a/google/services/securitycenter/resource_scc_project_big_query_export_config_test.go b/google/services/securitycenter/resource_scc_project_big_query_export_config_test.go
@@ -14,13 +14,13 @@ func TestAccSecurityCenterProjectBigQueryExportConfig_basic(t *testing.T) {
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
-	dataset_id := "tf_test_" + randomSuffix
+	datasetID := "tf_test_" + randomSuffix
 	orgID := envvar.GetTestOrgFromEnv(t)
 
 	context := map[string]interface{}{
 		"org_id":              orgID,
 		"random_suffix":       randomSuffix,
-		"dataset_id":          dataset_id,
+		"dataset_id":          datasetID,
 		"big_query_export_id": "tf-test-export-" + randomSuffix,
 		"project":             envvar.GetTestProjectFromEnv(),
 	}
@@ -65,6 +65,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true
 
   labels = {
     env = "default"
@@ -77,7 +78,7 @@ resource "google_bigquery_dataset" "default" {
 
 resource "time_sleep" "wait_x_minutes" {
 	depends_on = [google_bigquery_dataset.default]
-	create_duration = "3m"
+	create_duration = "6m"
 	# need to wait for destruction due to 
 	# 'still in use' error from api 
 	destroy_duration = "1m"
@@ -93,6 +94,11 @@ resource "google_scc_project_scc_big_query_export" "default" {
   depends_on = [time_sleep.wait_x_minutes]
 }
 
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_project_scc_big_query_export.default]
+}
+
 `, context)
 }
 
@@ -106,6 +112,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true
 
   labels = {
     env = "default"
@@ -116,12 +123,27 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
+resource "time_sleep" "wait_x_minutes" {
+	depends_on = [google_bigquery_dataset.default]
+	create_duration = "6m"
+	# need to wait for destruction due to
+	# 'still in use' error from api
+	destroy_duration = "1m"
+}
+
 resource "google_scc_project_scc_big_query_export" "default" {
   big_query_export_id    = "%{big_query_export_id}"
   project      = "%{project}"
   dataset      = google_bigquery_dataset.default.id
   description  = "SCC Findings Big Query Export Update"
   filter       = "state=\"ACTIVE\" AND NOT mute=\"MUTED\""
+
+  depends_on = [time_sleep.wait_x_minutes]
+}
+
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_project_scc_big_query_export.default]
 }
 
 `, context)

diff --git a/...le/services/securitycenterv2/resource_scc_v2_organization_big_query_export_config_test.go b/...le/services/securitycenterv2/resource_scc_v2_organization_big_query_export_config_test.go
@@ -15,13 +15,13 @@ func TestAccSecurityCenterV2OrganizationBigQueryExportConfig_basic(t *testing.T)
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
-	dataset_id := "tf_test_" + randomSuffix
+	datasetID := "tf_test_" + randomSuffix
 	orgID := envvar.GetTestOrgFromEnv(t)
 
 	context := map[string]interface{}{
 		"org_id":              orgID,
 		"random_suffix":       randomSuffix,
-		"dataset_id":          dataset_id,
+		"dataset_id":          datasetID,
 		"big_query_export_id": "tf-test-export-" + randomSuffix,
 		"name": fmt.Sprintf("organizations/%s/locations/global/bigQueryExports/%s",
 			orgID, "tf-test-export-"+randomSuffix),
@@ -96,7 +96,7 @@ resource "google_scc_v2_organization_scc_big_query_export" "default" {
 }
 
 resource "time_sleep" "wait_for_cleanup" {
-	create_duration = "3m"
+	create_duration = "6m"
 	depends_on = [google_scc_v2_organization_scc_big_query_export.default]
 }
 `, context)
@@ -123,6 +123,11 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
+resource "time_sleep" "wait_1_minute" {
+	depends_on = [google_bigquery_dataset.default]
+	create_duration = "6m"
+}
+
 resource "google_scc_v2_organization_scc_big_query_export" "default" {
   name		   = "%{name}"
   big_query_export_id    = "%{big_query_export_id}"
@@ -131,10 +136,12 @@ resource "google_scc_v2_organization_scc_big_query_export" "default" {
   location     = "global"
   description  = "SCC Findings Big Query Export Update"
   filter       = "state=\"ACTIVE\" AND NOT mute=\"MUTED\""
+
+  depends_on = [time_sleep.wait_1_minute]
 }
 
 resource "time_sleep" "wait_for_cleanup" {
-	create_duration = "3m"
+	create_duration = "6m"
 	depends_on = [google_scc_v2_organization_scc_big_query_export.default]
 }
 `, context)

diff --git a/...e/services/securitycenterv2/resource_scc_v2_organization_big_query_exports_config_test.go b/...e/services/securitycenterv2/resource_scc_v2_organization_big_query_exports_config_test.go
@@ -15,13 +15,13 @@ func TestAccSecurityCenterV2OrganizationBigQueryExportsConfig_basic(t *testing.T
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
-	dataset_id := "tf_test_" + randomSuffix
+	datasetID := "tf_test_" + randomSuffix
 	orgID := envvar.GetTestOrgFromEnv(t)
 
 	context := map[string]interface{}{
 		"org_id":              orgID,
 		"random_suffix":       randomSuffix,
-		"dataset_id":          dataset_id,
+		"dataset_id":          datasetID,
 		"big_query_export_id": "tf-test-export-" + randomSuffix,
 		"name": fmt.Sprintf("organizations/%s/locations/global/bigQueryExports/%s",
 			orgID, "tf-test-export-"+randomSuffix),
@@ -96,7 +96,7 @@ resource "google_scc_v2_organization_scc_big_query_exports" "default" {
 }
 
 resource "time_sleep" "wait_for_cleanup" {
-	create_duration = "3m"
+	create_duration = "6m"
 	depends_on = [google_scc_v2_organization_scc_big_query_exports.default]
 }
 `, context)
@@ -123,6 +123,11 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
+resource "time_sleep" "wait_1_minute" {
+	depends_on = [google_bigquery_dataset.default]
+	create_duration = "6m"
+}
+
 resource "google_scc_v2_organization_scc_big_query_exports" "default" {
   name		   = "%{name}"
   big_query_export_id    = "%{big_query_export_id}"
@@ -131,10 +136,12 @@ resource "google_scc_v2_organization_scc_big_query_exports" "default" {
   location     = "global"
   description  = "SCC Findings Big Query Export Update"
   filter       = "state=\"ACTIVE\" AND NOT mute=\"MUTED\""
+
+  depends_on = [time_sleep.wait_1_minute]  
 }
 
 resource "time_sleep" "wait_for_cleanup" {
-	create_duration = "3m"
+	create_duration = "6m"
 	depends_on = [google_scc_v2_organization_scc_big_query_exports.default]
 }
 `, context)

diff --git a/google/services/securitycenterv2/resource_scc_v2_project_big_query_export_config_test.go b/google/services/securitycenterv2/resource_scc_v2_project_big_query_export_config_test.go
@@ -15,13 +15,13 @@ func TestAccSecurityCenterV2ProjectBigQueryExportConfig_basic(t *testing.T) {
 	t.Parallel()
 
 	randomSuffix := acctest.RandString(t, 10)
-	dataset_id := "tf_test_" + randomSuffix
+	datasetID := "tf_test_" + randomSuffix
 	orgID := envvar.GetTestOrgFromEnv(t)
 
 	context := map[string]interface{}{
 		"org_id":              orgID,
 		"random_suffix":       randomSuffix,
-		"dataset_id":          dataset_id,
+		"dataset_id":          datasetID,
 		"big_query_export_id": "tf-test-export-" + randomSuffix,
 		"name": fmt.Sprintf("projects/%s/locations/global/bigQueryExports/%s",
 			envvar.GetTestProjectFromEnv(), "tf-test-export-"+randomSuffix),
@@ -68,6 +68,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true
 
   labels = {
     env = "default"
@@ -80,7 +81,10 @@ resource "google_bigquery_dataset" "default" {
 
 resource "time_sleep" "wait_1_minute" {
 	depends_on = [google_bigquery_dataset.default]
-	create_duration = "3m"
+	create_duration = "6m"
+	# need to wait for destruction due to 
+	# 'still in use' error from api 
+	destroy_duration = "1m"
 }
 
 resource "google_scc_v2_project_scc_big_query_export" "default" {
@@ -94,6 +98,11 @@ resource "google_scc_v2_project_scc_big_query_export" "default" {
   depends_on = [time_sleep.wait_1_minute]
 }
 
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_v2_project_scc_big_query_export.default]
+}
+
 `, context)
 }
 
@@ -107,6 +116,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "US"
   default_table_expiration_ms = 3600000
   default_partition_expiration_ms = null
+  delete_contents_on_destroy  = true  
 
   labels = {
     env = "default"
@@ -117,6 +127,14 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
+resource "time_sleep" "wait_1_minute" {
+	depends_on = [google_bigquery_dataset.default]
+	create_duration = "6m"
+	# need to wait for destruction due to 
+	# 'still in use' error from api 
+	destroy_duration = "1m"
+}
+
 resource "google_scc_v2_project_scc_big_query_export" "default" {
   big_query_export_id    = "%{big_query_export_id}"
   project      = "%{project}"
@@ -125,6 +143,13 @@ resource "google_scc_v2_project_scc_big_query_export" "default" {
   description  = "SCC Findings Big Query Export Update"
   filter       = "state=\"ACTIVE\" AND NOT mute=\"MUTED\""
 
+  depends_on = [time_sleep.wait_1_minute] 
+
+}
+
+resource "time_sleep" "wait_for_cleanup" {
+	create_duration = "6m"
+	depends_on = [google_scc_v2_project_scc_big_query_export.default]
 }
 
 `, context)