Scc rename to remove incorrect plural resources (#11657) (#8132)

[upstream:40b03fd9444330e853c295259fd06325b9aaf04a] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 6, 2024 · 5323032 · 5323032
1 parent c966ebe
commit 5323032
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 158 deletions.
diff --git a/.changelog/11657.txt b/.changelog/11657.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google-beta/provider/provider_mmv1_resources.go b/google-beta/provider/provider_mmv1_resources.go
@@ -1171,7 +1171,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_scc_management_project_security_health_analytics_custom_module":      securitycentermanagement.ResourceSecurityCenterManagementProjectSecurityHealthAnalyticsCustomModule(),
 	"google_scc_v2_folder_mute_config":                                           securitycenterv2.ResourceSecurityCenterV2FolderMuteConfig(),
 	"google_scc_v2_folder_notification_config":                                   securitycenterv2.ResourceSecurityCenterV2FolderNotificationConfig(),
-	"google_scc_v2_folder_scc_big_query_exports":                                 securitycenterv2.ResourceSecurityCenterV2FolderSccBigQueryExports(),
+	"google_scc_v2_folder_scc_big_query_export":                                  securitycenterv2.ResourceSecurityCenterV2FolderSccBigQueryExport(),
 	"google_scc_v2_organization_mute_config":                                     securitycenterv2.ResourceSecurityCenterV2OrganizationMuteConfig(),
 	"google_scc_v2_organization_notification_config":                             securitycenterv2.ResourceSecurityCenterV2OrganizationNotificationConfig(),
 	"google_scc_v2_organization_scc_big_query_exports":                           securitycenterv2.ResourceSecurityCenterV2OrganizationSccBigQueryExports(),
@@ -1181,7 +1181,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_scc_v2_organization_source_iam_policy":                               tpgiamresource.ResourceIamPolicy(securitycenterv2.SecurityCenterV2OrganizationSourceIamSchema, securitycenterv2.SecurityCenterV2OrganizationSourceIamUpdaterProducer, securitycenterv2.SecurityCenterV2OrganizationSourceIdParseFunc),
 	"google_scc_v2_project_mute_config":                                          securitycenterv2.ResourceSecurityCenterV2ProjectMuteConfig(),
 	"google_scc_v2_project_notification_config":                                  securitycenterv2.ResourceSecurityCenterV2ProjectNotificationConfig(),
-	"google_scc_v2_project_scc_big_query_exports":                                securitycenterv2.ResourceSecurityCenterV2ProjectSccBigQueryExports(),
+	"google_scc_v2_project_scc_big_query_export":                                 securitycenterv2.ResourceSecurityCenterV2ProjectSccBigQueryExport(),
 	"google_securityposture_posture":                                             securityposture.ResourceSecurityposturePosture(),
 	"google_securityposture_posture_deployment":                                  securityposture.ResourceSecurityposturePostureDeployment(),
 	"google_security_scanner_scan_config":                                        securityscanner.ResourceSecurityScannerScanConfig(),

diff --git a/google-beta/services/securitycenterv2/resource_scc_v2_folder_big_query_export_config_test.go b/google-beta/services/securitycenterv2/resource_scc_v2_folder_big_query_export_config_test.go
@@ -37,7 +37,7 @@ func TestAccSecurityCenterV2FolderBigQueryExportConfig_basic(t *testing.T) {
 				Config: testAccSecurityCenterV2FolderBigQueryExportConfig_basic(context),
 			},
 			{
-				ResourceName:            "google_scc_v2_folder_scc_big_query_exports.default",
+				ResourceName:            "google_scc_v2_folder_scc_big_query_export.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"update_time"},
@@ -46,7 +46,7 @@ func TestAccSecurityCenterV2FolderBigQueryExportConfig_basic(t *testing.T) {
 				Config: testAccSecurityCenterV2FolderBigQueryExportConfig_update(context),
 			},
 			{
-				ResourceName:            "google_scc_v2_folder_scc_big_query_exports.default",
+				ResourceName:            "google_scc_v2_folder_scc_big_query_export.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"update_time"},
@@ -87,7 +87,7 @@ resource "time_sleep" "wait_1_minute" {
 	create_duration = "3m"
 }
 
-resource "google_scc_v2_folder_scc_big_query_exports" "default" {
+resource "google_scc_v2_folder_scc_big_query_export" "default" {
   big_query_export_id    = "%{big_query_export_id}"
   folder 	   = google_folder.folder.folder_id
   dataset      = google_bigquery_dataset.default.id
@@ -105,7 +105,7 @@ resource "google_scc_v2_folder_scc_big_query_exports" "default" {
 
 resource "time_sleep" "wait_for_cleanup" {
 	create_duration = "3m"
-	depends_on = [google_scc_v2_folder_scc_big_query_exports.default]
+	depends_on = [google_scc_v2_folder_scc_big_query_export.default]
 }
 `, context)
 }
@@ -137,7 +137,7 @@ resource "google_bigquery_dataset" "default" {
   }
 }
 
-resource "google_scc_v2_folder_scc_big_query_exports" "default" {
+resource "google_scc_v2_folder_scc_big_query_export" "default" {
   big_query_export_id    = "%{big_query_export_id}"
   folder 	   = google_folder.folder.folder_id
   dataset      = google_bigquery_dataset.default.id
@@ -153,7 +153,7 @@ resource "google_scc_v2_folder_scc_big_query_exports" "default" {
 
 resource "time_sleep" "wait_for_cleanup" {
 	create_duration = "3m"
-	depends_on = [google_scc_v2_folder_scc_big_query_exports.default]
+	depends_on = [google_scc_v2_folder_scc_big_query_export.default]
 }
 `, context)
 }