fix sweepers for resources with overridden names (#14756) (#23903)

modular-magician · web-flow · commit ac056ac41675 · 2025-08-06T17:36:12.000-07:00
[upstream:3497e67827984001f69943b4cd9938ea4fcd326a]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_sweeper.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionBigqueryAnalyticsHubListingSubscription(action sweeper.Resourc
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["listingSubscriptions"]
+		resourceList, ok := res["subscriptions"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'listingSubscriptions'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'subscriptions'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/cloudbuild/resource_cloudbuild_trigger_sweeper.go b/google/services/cloudbuild/resource_cloudbuild_trigger_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionCloudBuildTrigger(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["triggers"]
+		resourceList, ok := res["buildTriggers"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'triggers'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'buildTriggers'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/colab/resource_colab_notebook_execution_sweeper.go b/google/services/colab/resource_colab_notebook_execution_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionColabNotebookExecution(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["notebookExecutions"]
+		resourceList, ok := res["notebookExecutionJobs"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notebookExecutions'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notebookExecutionJobs'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/colab/resource_colab_runtime_sweeper.go b/google/services/colab/resource_colab_runtime_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionColabRuntime(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["runtimes"]
+		resourceList, ok := res["notebookRuntimes"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'runtimes'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notebookRuntimes'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/colab/resource_colab_runtime_template_sweeper.go b/google/services/colab/resource_colab_runtime_template_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionColabRuntimeTemplate(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["runtimeTemplates"]
+		resourceList, ok := res["notebookRuntimeTemplates"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'runtimeTemplates'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notebookRuntimeTemplates'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_network_firewall_policy_sweeper.go b/google/services/compute/resource_compute_network_firewall_policy_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionComputeNetworkFirewallPolicy(action sweeper.ResourceAction) er
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["networkFirewallPolicies"]
+		resourceList, ok := res["firewallPolicies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'networkFirewallPolicies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'firewallPolicies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_network_firewall_policy_with_rules_sweeper.go b/google/services/compute/resource_compute_network_firewall_policy_with_rules_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionComputeNetworkFirewallPolicyWithRules(action sweeper.ResourceA
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["networkFirewallPolicyWithRules"]
+		resourceList, ok := res["firewallPolicies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'networkFirewallPolicyWithRules'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'firewallPolicies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_sweeper.go b/google/services/compute/resource_compute_region_network_firewall_policy_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionComputeRegionNetworkFirewallPolicy(action sweeper.ResourceActi
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionNetworkFirewallPolicies"]
+		resourceList, ok := res["firewallPolicies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionNetworkFirewallPolicies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'firewallPolicies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_sweeper.go b/google/services/compute/resource_compute_region_network_firewall_policy_with_rules_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionComputeRegionNetworkFirewallPolicyWithRules(action sweeper.Res
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionNetworkFirewallPolicyWithRules"]
+		resourceList, ok := res["firewallPolicies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionNetworkFirewallPolicyWithRules'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'firewallPolicies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_security_policy_sweeper.go b/google/services/compute/resource_compute_region_security_policy_sweeper.go
@@ -152,9 +152,9 @@ func listAndActionComputeRegionSecurityPolicy(action sweeper.ResourceAction) err
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionSecurityPolicies"]
+		resourceList, ok := res["securityPolicies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionSecurityPolicies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'securityPolicies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_target_http_proxy_sweeper.go b/google/services/compute/resource_compute_region_target_http_proxy_sweeper.go
@@ -144,9 +144,9 @@ func listAndActionComputeRegionTargetHttpProxy(action sweeper.ResourceAction) er
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionTargetHttpProxies"]
+		resourceList, ok := res["targetHttpProxies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionTargetHttpProxies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'targetHttpProxies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_target_https_proxy_sweeper.go b/google/services/compute/resource_compute_region_target_https_proxy_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionComputeRegionTargetHttpsProxy(action sweeper.ResourceAction) e
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionTargetHttpsProxies"]
+		resourceList, ok := res["targetHttpsProxies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionTargetHttpsProxies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'targetHttpsProxies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/compute/resource_compute_region_target_tcp_proxy_sweeper.go b/google/services/compute/resource_compute_region_target_tcp_proxy_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionComputeRegionTargetTcpProxy(action sweeper.ResourceAction) err
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionTargetTcpProxies"]
+		resourceList, ok := res["targetTcpProxies"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionTargetTcpProxies'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'targetTcpProxies'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/corebilling/resource_billing_project_info_sweeper.go b/google/services/corebilling/resource_billing_project_info_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionCoreBillingProjectInfo(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectInfos"]
+		resourceList, ok := res["projectBillingInfos"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectInfos'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectBillingInfos'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/dataplex/resource_dataplex_datascan_sweeper.go b/google/services/dataplex/resource_dataplex_datascan_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionDataplexDatascan(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["datascans"]
+		resourceList, ok := res["dataScans"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'datascans'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'dataScans'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/discoveryengine/resource_discovery_engine_chat_engine_sweeper.go b/google/services/discoveryengine/resource_discovery_engine_chat_engine_sweeper.go
@@ -144,9 +144,9 @@ func listAndActionDiscoveryEngineChatEngine(action sweeper.ResourceAction) error
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["chatEngines"]
+		resourceList, ok := res["engines"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'chatEngines'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'engines'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/firebaseappcheck/resource_firebase_app_check_service_config_sweeper.go b/google/services/firebaseappcheck/resource_firebase_app_check_service_config_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionFirebaseAppCheckServiceConfig(action sweeper.ResourceAction) e
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["serviceConfigs"]
+		resourceList, ok := res["services"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'serviceConfigs'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'services'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/identityplatform/resource_identity_platform_oauth_idp_config_sweeper.go b/google/services/identityplatform/resource_identity_platform_oauth_idp_config_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionIdentityPlatformOauthIdpConfig(action sweeper.ResourceAction)
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["oauthIdpConfigs"]
+		resourceList, ok := res["oAuthIdpConfigs"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'oauthIdpConfigs'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'oAuthIdpConfigs'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/logging/resource_logging_metric_sweeper.go b/google/services/logging/resource_logging_metric_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionLoggingMetric(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["metrics"]
+		resourceList, ok := res["logMetrics"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'metrics'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'logMetrics'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/monitoring/resource_monitoring_service_sweeper.go b/google/services/monitoring/resource_monitoring_service_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionMonitoringGenericService(action sweeper.ResourceAction) error
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["genericServices"]
+		resourceList, ok := res["services"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'genericServices'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'services'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/networksecurity/resource_network_security_url_lists_sweeper.go b/google/services/networksecurity/resource_network_security_url_lists_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionNetworkSecurityUrlLists(action sweeper.ResourceAction) error {
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["urlListss"]
+		resourceList, ok := res["urlLists"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'urlListss'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'urlLists'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_sweeper.go b/google/services/parametermanagerregional/resource_parameter_manager_regional_parameter_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionParameterManagerRegionalRegionalParameter(action sweeper.Resou
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["regionalParameters"]
+		resourceList, ok := res["parameters"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'regionalParameters'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'parameters'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenter/resource_scc_project_custom_module_sweeper.go b/google/services/securitycenter/resource_scc_project_custom_module_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionSecurityCenterProjectCustomModule(action sweeper.ResourceActio
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectCustomModules"]
+		resourceList, ok := res["securityHealthAnalyticsCustomModules"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectCustomModules'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'securityHealthAnalyticsCustomModules'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenter/resource_scc_project_notification_config_sweeper.go b/google/services/securitycenter/resource_scc_project_notification_config_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionSecurityCenterProjectNotificationConfig(action sweeper.Resourc
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectNotificationConfigs"]
+		resourceList, ok := res["notificationConfigs"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectNotificationConfigs'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notificationConfigs'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenter/resource_scc_project_scc_big_query_export_sweeper.go b/google/services/securitycenter/resource_scc_project_scc_big_query_export_sweeper.go
@@ -142,9 +142,9 @@ func listAndActionSecurityCenterProjectSccBigQueryExport(action sweeper.Resource
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectSccBigQueryExports"]
+		resourceList, ok := res["bigQueryExports"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectSccBigQueryExports'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'bigQueryExports'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycentermanagement/resource_scc_management_project_security_health_analytics_custom_module_sweeper.go b/google/services/securitycentermanagement/resource_scc_management_project_security_health_analytics_custom_module_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionSecurityCenterManagementProjectSecurityHealthAnalyticsCustomMo
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectSecurityHealthAnalyticsCustomModules"]
+		resourceList, ok := res["securityHealthAnalyticsCustomModules"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectSecurityHealthAnalyticsCustomModules'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'securityHealthAnalyticsCustomModules'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenterv2/resource_scc_v2_project_mute_config_sweeper.go b/google/services/securitycenterv2/resource_scc_v2_project_mute_config_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionSecurityCenterV2ProjectMuteConfig(action sweeper.ResourceActio
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectMuteConfigs"]
+		resourceList, ok := res["muteConfigs"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectMuteConfigs'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'muteConfigs'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenterv2/resource_scc_v2_project_notification_config_sweeper.go b/google/services/securitycenterv2/resource_scc_v2_project_notification_config_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionSecurityCenterV2ProjectNotificationConfig(action sweeper.Resou
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectNotificationConfigs"]
+		resourceList, ok := res["notificationConfigs"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectNotificationConfigs'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'notificationConfigs'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/securitycenterv2/resource_scc_v2_project_scc_big_query_export_sweeper.go b/google/services/securitycenterv2/resource_scc_v2_project_scc_big_query_export_sweeper.go
@@ -140,9 +140,9 @@ func listAndActionSecurityCenterV2ProjectSccBigQueryExport(action sweeper.Resour
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["projectSccBigQueryExports"]
+		resourceList, ok := res["bigQueryExports"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'projectSccBigQueryExports'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'bigQueryExports'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
diff --git a/google/services/sql/resource_sql_source_representation_instance_sweeper.go b/google/services/sql/resource_sql_source_representation_instance_sweeper.go
@@ -145,9 +145,9 @@ func listAndActionSQLSourceRepresentationInstance(action sweeper.ResourceAction)
 		}
 
 		// First try the expected resource key
-		resourceList, ok := res["sourceRepresentationInstances"]
+		resourceList, ok := res["databaseInstances"]
 		if ok {
-			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'sourceRepresentationInstances'")
+			log.Printf("[INFO][SWEEPER_LOG] Found resources under expected key 'databaseInstances'")
 		} else {
 			// Next, try the common "items" pattern
 			resourceList, ok = res["items"]
