Fix Failing test TestAccSecurityCenterV2ProjectBigQueryExportConfig_b…

…asic + others (GoogleCloudPlatform#12334)
amanMahendroo · Dec 17, 2024 · 642635a · 642635a
1 parent d16c33e
commit 642635a
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 17 deletions.
diff --git a/...rraform/services/securitycenter/resource_scc_organization_big_query_export_config_test.go b/...rraform/services/securitycenter/resource_scc_organization_big_query_export_config_test.go
@@ -13,13 +13,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),
@@ -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_1_minute" {
 	depends_on = [google_bigquery_dataset.default]
-	create_duration = "3m"
+	create_duration = "6m"
 }
 
 resource "google_scc_organization_scc_big_query_export" "default" {
@@ -90,6 +91,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)
 }
 
@@ -103,6 +108,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"
@@ -113,12 +119,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/...ty/terraform/services/securitycenter/resource_scc_project_big_query_export_config_test.go b/...ty/terraform/services/securitycenter/resource_scc_project_big_query_export_config_test.go
@@ -12,13 +12,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(),
 	}
@@ -63,6 +63,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"
@@ -75,7 +76,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"
@@ -91,6 +92,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)
 }
 
@@ -104,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"
@@ -114,12 +121,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/...rm/services/securitycenterv2/resource_scc_v2_organization_big_query_export_config_test.go b/...rm/services/securitycenterv2/resource_scc_v2_organization_big_query_export_config_test.go
@@ -13,13 +13,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),
@@ -94,7 +94,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)
@@ -121,6 +121,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}"
@@ -129,10 +134,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/...m/services/securitycenterv2/resource_scc_v2_organization_big_query_exports_config_test.go b/...m/services/securitycenterv2/resource_scc_v2_organization_big_query_exports_config_test.go
@@ -13,13 +13,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),
@@ -94,7 +94,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)
@@ -121,6 +121,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}"
@@ -129,10 +134,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/...rraform/services/securitycenterv2/resource_scc_v2_project_big_query_export_config_test.go b/...rraform/services/securitycenterv2/resource_scc_v2_project_big_query_export_config_test.go
@@ -13,13 +13,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),
@@ -66,6 +66,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"
@@ -78,7 +79,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" {
@@ -92,6 +96,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)
 }
 
@@ -105,6 +114,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,6 +125,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}"
@@ -123,6 +141,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)