fixup! OCPBUGS-90710: Destroy all private cluster backend service resources

Author: barbacbd

pkg/destroy/gcp/cloudcontroller.go

@@ -34,21 +34,25 @@ func (o *ClusterUninstaller) listCloudControllerBackendServices(ctx context.Cont
 	filter := "name eq \"a[0-9a-f]{30,50}\""
 	result := []cloudResource{}
 
-	req := o.computeSvc.RegionBackendServices.List(o.ProjectID, o.Region).Fields(googleapi.Field("items(name,backends),nextPageToken"))
-	if len(filter) > 0 {
-		req = req.Filter(filter)
+	// Fetch firewall rules once (fully paginated); used to validate backend
+	// services that have no backends.
+	var firewalls []*compute.Firewall
+	if err := o.computeSvc.Firewalls.List(o.ProjectID).
+		Fields(googleapi.Field("items(name,targetTags),nextPageToken")).
+		Pages(ctx, func(list *compute.FirewallList) error {
+			firewalls = append(firewalls, list.Items...)
+			return nil
+		}); err != nil {
+		return nil, err
 	}
+
+	req := o.computeSvc.RegionBackendServices.List(o.ProjectID, o.Region).Fields(googleapi.Field("items(name,backends),nextPageToken")).Filter(filter)
 	err := req.Pages(ctx, func(list *compute.BackendServiceList) error {
 		for _, item := range list.Items {
 			if len(item.Backends) == 0 {
 				o.Logger.Debugf("Backend service %s has no backends, checking firewall rules for cluster ID", item.Name)
-				fwList, err := o.computeSvc.Firewalls.List(o.ProjectID).Fields(googleapi.Field("items(name,targetTags),nextPageToken")).Context(ctx).Do()
-				if err != nil {
-					o.Logger.Debugf("failed to list firewall rules associated with backend service %s: %v", item.Name, err)
-					continue
-				}
 				found := false
-				for _, fw := range fwList.Items {
+				for _, fw := range firewalls {
 					if strings.Contains(fw.Name, item.Name) {
 						for _, tag := range fw.TargetTags {
 							if strings.Contains(tag, o.ClusterID) {
@@ -84,10 +88,7 @@ func (o *ClusterUninstaller) listCloudControllerBackendServices(ctx context.Cont
 				quota: []gcp.QuotaUsage{{
 					Metric: &gcp.Metric{
 						Service: gcp.ServiceComputeEngineAPI,
-						Limit:   "internal_lb_forwarding_rules",
-						Dimensions: map[string]string{
-							"region": o.Region,
-						},
+						Limit:   "backend_services",
 					},
 					Amount: 1,
 				}},
@@ -196,13 +197,6 @@ func (o *ClusterUninstaller) discoverCloudControllerLoadBalancerResources(ctx co
 	}
 	o.insertPendingItems("healthcheck", found)
 
-	// Discover associated health checks: loadBalancerName - GLOBAL
-	found, err = o.listHealthChecksWithFilter(ctx, "globalhealthcheck", "items(name),nextPageToken", loadBalancerNameFilter, nil)
-	if err != nil {
-		return err
-	}
-	o.insertPendingItems("globalhealthcheck", found)
-
 	// Discover associated http health checks: loadBalancerName
 	found, err = o.listHTTPHealthChecksWithFilter(ctx, "items(name),nextPageToken", loadBalancerNameFilter, nil)
 	if err != nil {