From a848a4a8af44531c20e55544a4290e14a99f4c77 Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Tue, 17 Sep 2024 18:24:02 +0000 Subject: [PATCH 1/6] Refactor the org etd custom module test file --- ...hreat_detection_custom_module_test.go.erb} | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) rename mmv1/third_party/terraform/services/securitycentermanagement/{resource_scc_management_organization_event_threat_detection_custom_module_test.go => resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb} (90%) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb similarity index 90% rename from mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go rename to mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb index aa3afe0781cf..de5445d3bf00 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb @@ -1,3 +1,5 @@ +<% autogen_exception -%> + package securitycentermanagement_test import ( @@ -23,10 +25,6 @@ func TestAccSecurityCenterManagement(t *testing.T) { } for name, tc := range testCases { - // shadow the tc variable into scope so that when - // the loop continues, if t.Run hasn't executed tc(t) - // yet, we don't have a race condition - // see https://github.com/golang/go/wiki/CommonMistakes#using-goroutines-on-loop-iterator-variables tc := tc t.Run(name, func(t *testing.T) { tc(t) @@ -35,8 +33,8 @@ func TestAccSecurityCenterManagement(t *testing.T) { } func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule(t *testing.T) { - // t.Parallel() - + // Comment explaining the beta-only status due to concurrent modification issues (Error 409). + // This is being marked as beta-only. See the bug link: context := map[string]interface{}{ "org_id": envvar.GetTestOrgFromEnv(t), "location": "global", @@ -45,7 +43,7 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), // Ensure beta factory is used CheckDestroy: testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModuleDestroyProducer(t), Steps: []resource.TestStep{ { @@ -72,6 +70,7 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule__sccOrganizationCustomModuleExample(context map[string]interface{}) string { return acctest.Nprintf(` +<% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { organization = "%{org_id}" location = "%{location}" @@ -90,11 +89,15 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } +<% else -%> +# GA version doesn't support this field +<% end -%> `, context) } func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule_sccOrganizationCustomModuleUpdate(context map[string]interface{}) string { return acctest.Nprintf(` +<% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { organization = "%{org_id}" location = "%{location}" @@ -112,6 +115,9 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } +<% else -%> +# GA version doesn't support this field +<% end -%> `, context) } From 50d506a31714a05a4482d2b03a2dbae22acfb938 Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Tue, 17 Sep 2024 18:43:22 +0000 Subject: [PATCH 2/6] refactor the comment --- ...ization_event_threat_detection_custom_module_test.go.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb index de5445d3bf00..00feae0d5332 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb @@ -33,8 +33,10 @@ func TestAccSecurityCenterManagement(t *testing.T) { } func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule(t *testing.T) { - // Comment explaining the beta-only status due to concurrent modification issues (Error 409). - // This is being marked as beta-only. See the bug link: + +<%# Comment explaining the beta-only status due to concurrent modification issues (Error 409). %> +<%# This is being marked as beta-only. See the bug link: %> + context := map[string]interface{}{ "org_id": envvar.GetTestOrgFromEnv(t), "location": "global", From 7ecac731070e37eb82b135ac700b8bfc323d59d8 Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Thu, 19 Sep 2024 16:44:06 +0000 Subject: [PATCH 3/6] fix etd failing test issue 19086 --- ...ization_event_threat_detection_custom_module_test.go.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb index 00feae0d5332..8c20fd936052 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb @@ -74,6 +74,8 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule return acctest.Nprintf(` <% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { + provider = google-beta + organization = "%{org_id}" location = "%{location}" display_name = "tf_test_custom_module%{random_suffix}" @@ -101,6 +103,8 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule return acctest.Nprintf(` <% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { + provider = google-beta + organization = "%{org_id}" location = "%{location}" display_name = "tf_test_custom_module%{random_suffix}_updated" @@ -163,4 +167,4 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule return nil } -} +} \ No newline at end of file From 9a4dcb2e682ef506c240458990375e47afb06ee4 Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Tue, 24 Sep 2024 18:31:23 +0000 Subject: [PATCH 4/6] Update the other test files with the version guards --- ...r_security_health_analytics_custom_module_test.go.erb} | 4 ++++ ...ation_event_threat_detection_custom_module_test.go.erb | 8 ++------ ...t_security_health_analytics_custom_module_test.go.erb} | 4 ++++ ...n_security_health_analytics_custom_module_test.go.erb} | 4 ++++ 4 files changed, 14 insertions(+), 6 deletions(-) rename mmv1/third_party/terraform/services/securitycentermanagement/{resource_scc_management_folder_security_health_analytics_custom_module_test.go => resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb} (99%) rename mmv1/third_party/terraform/services/securitycentermanagement/{resource_scc_management_organization_project_security_health_analytics_custom_module_test.go => resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb} (98%) rename mmv1/third_party/terraform/services/securitycentermanagement/{resource_scc_management_organization_security_health_analytics_custom_module_test.go => resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb} (99%) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb similarity index 99% rename from mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go rename to mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb index 297c0c297d6b..6c31e2a4540c 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb @@ -1,4 +1,6 @@ +<% autogen_exception -%> package securitycentermanagement_test +<% unless version == 'ga' -%> import ( "fmt" @@ -234,3 +236,5 @@ func testAccCheckSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModu return nil } } + +<% end -%> diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb index 8c20fd936052..3c73685a9b16 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb @@ -34,8 +34,8 @@ func TestAccSecurityCenterManagement(t *testing.T) { func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule(t *testing.T) { -<%# Comment explaining the beta-only status due to concurrent modification issues (Error 409). %> -<%# This is being marked as beta-only. See the bug link: %> + <%# Comment explaining the beta-only status due to concurrent modification issues (Error 409). %> + <%# This is being marked as beta-only. See the bug link: %> context := map[string]interface{}{ "org_id": envvar.GetTestOrgFromEnv(t), @@ -93,8 +93,6 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } -<% else -%> -# GA version doesn't support this field <% end -%> `, context) } @@ -121,8 +119,6 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } -<% else -%> -# GA version doesn't support this field <% end -%> `, context) } diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb similarity index 98% rename from mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go rename to mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb index 0edd70f41a48..24f9ca12f332 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb @@ -1,4 +1,6 @@ +<% autogen_exception -%> package securitycentermanagement_test +<% unless version == 'ga' -%> import ( "fmt" @@ -193,3 +195,5 @@ func testAccCheckSecurityCenterManagementProjectSecurityHealthAnalyticsCustomMod return nil } } + +<% end -%> diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb similarity index 99% rename from mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go rename to mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb index fdd2dcba60f6..5840d18ff473 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb @@ -1,4 +1,6 @@ +<% autogen_exception -%> package securitycentermanagement_test +<% unless version == 'ga' -%> import ( "fmt" @@ -202,3 +204,5 @@ func testAccCheckSecurityCenterManagementOrganizationSecurityHealthAnalyticsCust return nil } } + +<% end -%> From f9329201acf8e14312de873866b50a8d184fa31c Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Tue, 24 Sep 2024 20:05:58 +0000 Subject: [PATCH 5/6] Address comments --- ...er_security_health_analytics_custom_module_test.go.erb | 5 ++++- ...ation_event_threat_detection_custom_module_test.go.erb | 8 +++----- ...ct_security_health_analytics_custom_module_test.go.erb | 5 ++++- ...on_security_health_analytics_custom_module_test.go.erb | 5 ++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb index 6c31e2a4540c..c878115beb9d 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb @@ -29,7 +29,7 @@ func testAccSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModule(t acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), ExternalProviders: map[string]resource.ExternalProvider{ "random": {}, "time": {}, @@ -82,6 +82,7 @@ resource "time_sleep" "wait_1_minute" { } resource "google_scc_management_folder_security_health_analytics_custom_module" "example" { + provider = google-beta folder = google_folder.folder.folder_id location = "%{location}" display_name = "tf_test_basic_custom_module%{random_suffix}" @@ -115,6 +116,7 @@ resource "google_folder" "folder" { } resource "google_scc_management_folder_security_health_analytics_custom_module" "example" { + provider = google-beta folder = google_folder.folder.folder_id location = "%{location}" display_name = "tf_test_full_custom_module%{random_suffix}" @@ -159,6 +161,7 @@ resource "google_folder" "folder" { } resource "google_scc_management_folder_security_health_analytics_custom_module" "example" { + provider = google-beta folder = google_folder.folder.folder_id location = "%{location}" display_name = "tf_test_full_custom_module%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb index 3c73685a9b16..07b261ecad5a 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_event_threat_detection_custom_module_test.go.erb @@ -1,6 +1,7 @@ <% autogen_exception -%> package securitycentermanagement_test +<% unless version == 'ga' -%> import ( "fmt" @@ -72,7 +73,6 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule__sccOrganizationCustomModuleExample(context map[string]interface{}) string { return acctest.Nprintf(` -<% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { provider = google-beta @@ -93,13 +93,11 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } -<% end -%> `, context) } func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule_sccOrganizationCustomModuleUpdate(context map[string]interface{}) string { return acctest.Nprintf(` -<% unless version == 'ga' -%> resource "google_scc_management_organization_event_threat_detection_custom_module" "example" { provider = google-beta @@ -119,7 +117,6 @@ resource "google_scc_management_organization_event_threat_detection_custom_modul ]} EOF } -<% end -%> `, context) } @@ -163,4 +160,5 @@ func testAccSecurityCenterManagementOrganizationEventThreatDetectionCustomModule return nil } -} \ No newline at end of file +} +<% end -%> diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb index 24f9ca12f332..32d88c901c4c 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_project_security_health_analytics_custom_module_test.go.erb @@ -26,7 +26,7 @@ func testAccSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule(t acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), CheckDestroy: testAccCheckSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModuleDestroyProducer(t), Steps: []resource.TestStep{ { @@ -60,6 +60,7 @@ func testAccSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule(t func testAccCheckSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule_sccProjectCustomModuleBasicExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_project_security_health_analytics_custom_module" "example" { + provider = google-beta display_name = "tf_test_basic_custom_module%{random_suffix}" enablement_state = "ENABLED" location = "%{location}" @@ -83,6 +84,7 @@ resource "google_scc_management_project_security_health_analytics_custom_module" func testAccCheckSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule_sccProjectCustomModuleFullExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_project_security_health_analytics_custom_module" "example" { + provider = google-beta display_name = "tf_test_full_custom_module%{random_suffix}" enablement_state = "ENABLED" location = "%{location}" @@ -120,6 +122,7 @@ resource "google_scc_management_project_security_health_analytics_custom_module" func testAccCheckSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule_sccProjectCustomModuleUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_project_security_health_analytics_custom_module" "example" { + provider = google-beta location = "%{location}" display_name = "full_custom_module" enablement_state = "DISABLED" diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb index 5840d18ff473..0d1e19e91fca 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_organization_security_health_analytics_custom_module_test.go.erb @@ -28,7 +28,7 @@ func testAccSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomMod acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), CheckDestroy: testAccCheckSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomModuleDestroyProducer(t), Steps: []resource.TestStep{ { @@ -65,6 +65,7 @@ func testAccSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomMod func testAccSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomModule_sccOrganizationCustomModuleBasicExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_organization_security_health_analytics_custom_module" "example" { + provider = google-beta organization = "%{org_id}" location = "%{location}" display_name = "tf_test_basic_custom_module%{random_suffix}" @@ -89,6 +90,7 @@ resource "google_scc_management_organization_security_health_analytics_custom_mo func testAccSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomModule_sccOrganizationCustomModuleFullExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_organization_security_health_analytics_custom_module" "example" { + provider = google-beta organization = "%{org_id}" location = "%{location}" display_name = "tf_test_full_custom_module%{random_suffix}" @@ -127,6 +129,7 @@ resource "google_scc_management_organization_security_health_analytics_custom_mo func testAccSecurityCenterManagementOrganizationSecurityHealthAnalyticsCustomModule_sccOrganizationCustomModuleUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_scc_management_organization_security_health_analytics_custom_module" "example" { + provider = google-beta organization = "%{org_id}" location = "%{location}" display_name = "tf_test_full_custom_module%{random_suffix}" From 3ac66ad33303dd650ef466648b4a23ebebee4212 Mon Sep 17 00:00:00 2001 From: Vijaykanth Melugiri Date: Tue, 24 Sep 2024 21:51:22 +0000 Subject: [PATCH 6/6] add provider google beta to the folder resource --- ..._folder_security_health_analytics_custom_module_test.go.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb index c878115beb9d..0fefafa48092 100644 --- a/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb +++ b/mmv1/third_party/terraform/services/securitycentermanagement/resource_scc_management_folder_security_health_analytics_custom_module_test.go.erb @@ -70,6 +70,7 @@ func testAccSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModule(t func testAccSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModule_sccFolderCustomModuleBasicExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { + provider = google-beta parent = "organizations/%{org_id}" display_name = "tf-test-folder-name%{random_suffix}" deletion_protection = false @@ -110,6 +111,7 @@ resource "google_scc_management_folder_security_health_analytics_custom_module" func testAccSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModule_sccFolderCustomModuleFullExample(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { + provider = google-beta parent = "organizations/%{org_id}" display_name = "tf-test-folder-name%{random_suffix}" deletion_protection = false @@ -155,6 +157,7 @@ resource "google_scc_management_folder_security_health_analytics_custom_module" func testAccSecurityCenterManagementFolderSecurityHealthAnalyticsCustomModule_sccFolderCustomModuleUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { + provider = google-beta parent = "organizations/%{org_id}" display_name = "tf-test-folder-name%{random_suffix}" deletion_protection = false