Merge pull request openshift#8113 from barbacbd/CORS-3256

CORS-3256: GCP destroy updates for CAPG

Author: openshift-merge-bot[bot]

pkg/destroy/gcp/backendservice.go

@@ -2,69 +2,100 @@ package gcp
 
 import (
 	"context"
+	"fmt"
 
-	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 
 	"github.com/openshift/installer/pkg/types/gcp"
 )
 
-func (o *ClusterUninstaller) listBackendServices(ctx context.Context) ([]cloudResource, error) {
-	return o.listBackendServicesWithFilter(ctx, "items(name),nextPageToken", o.clusterIDFilter(), nil)
+func (o *ClusterUninstaller) listBackendServices(ctx context.Context, scope resourceScope) ([]cloudResource, error) {
+	return o.listBackendServicesWithFilter(ctx, "items(name),nextPageToken", o.clusterIDFilter(), nil, scope)
+}
+
+func createBackendServiceCloudResources(filterFunc func(*compute.BackendService) bool, list *compute.BackendServiceList) []cloudResource {
+	result := []cloudResource{}
+
+	for _, item := range list.Items {
+		if filterFunc == nil || filterFunc(item) {
+			logrus.Debugf("Found backend service: %s", item.Name)
+			result = append(result, cloudResource{
+				key:      item.Name,
+				name:     item.Name,
+				typeName: "backendservice",
+				quota: []gcp.QuotaUsage{{
+					Metric: &gcp.Metric{
+						Service: gcp.ServiceComputeEngineAPI,
+						Limit:   "backend_services",
+					},
+					Amount: 1,
+				}},
+			})
+		}
+	}
+
+	return result
 }
 
 // listBackendServicesWithFilter lists backend services in the project that satisfy the filter criteria.
 // The fields parameter specifies which fields should be returned in the result, the filter string contains
 // a filter string passed to the API to filter results. The filterFunc is a client-side filtering function
 // that determines whether a particular result should be returned or not.
-func (o *ClusterUninstaller) listBackendServicesWithFilter(ctx context.Context, fields string, filter string, filterFunc func(*compute.BackendService) bool) ([]cloudResource, error) {
-	o.Logger.Debugf("Listing backend services")
+func (o *ClusterUninstaller) listBackendServicesWithFilter(ctx context.Context, fields string, filter string, filterFunc func(*compute.BackendService) bool, scope resourceScope) ([]cloudResource, error) {
+	o.Logger.Debugf("Listing %s backend services", scope)
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
 	result := []cloudResource{}
+
+	if scope == gcpGlobalResource {
+		req := o.computeSvc.BackendServices.List(o.ProjectID).Fields(googleapi.Field(fields))
+		if len(filter) > 0 {
+			req = req.Filter(filter)
+		}
+		err := req.Pages(ctx, func(list *compute.BackendServiceList) error {
+			result = append(result, createBackendServiceCloudResources(filterFunc, list)...)
+			return nil
+		})
+		if err != nil {
+			return nil, fmt.Errorf("failed to list global backend services: %w", err)
+		}
+		return result, nil
+	}
+
+	// Regional backend services
 	req := o.computeSvc.RegionBackendServices.List(o.ProjectID, o.Region).Fields(googleapi.Field(fields))
 	if len(filter) > 0 {
 		req = req.Filter(filter)
 	}
 	err := req.Pages(ctx, func(list *compute.BackendServiceList) error {
-		for _, item := range list.Items {
-			if filterFunc == nil || filterFunc != nil && filterFunc(item) {
-				o.Logger.Debugf("Found backend service: %s", item.Name)
-				result = append(result, cloudResource{
-					key:      item.Name,
-					name:     item.Name,
-					typeName: "backendservice",
-					quota: []gcp.QuotaUsage{{
-						Metric: &gcp.Metric{
-							Service: gcp.ServiceComputeEngineAPI,
-							Limit:   "backend_services",
-						},
-						Amount: 1,
-					}},
-				})
-			}
-		}
+		result = append(result, createBackendServiceCloudResources(filterFunc, list)...)
 		return nil
 	})
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to list backend services")
+		return nil, fmt.Errorf("failed to list regional backend services: %w", err)
 	}
+
 	return result, nil
 }
 
-func (o *ClusterUninstaller) deleteBackendService(ctx context.Context, item cloudResource) error {
+func (o *ClusterUninstaller) deleteBackendService(ctx context.Context, item cloudResource, scope resourceScope) error {
 	o.Logger.Debugf("Deleting backend service %s", item.name)
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
-	op, err := o.computeSvc.RegionBackendServices.Delete(o.ProjectID, o.Region, item.name).RequestId(o.requestID(item.typeName, item.name)).Context(ctx).Do()
-	if err != nil && !isNoOp(err) {
-		o.resetRequestID(item.typeName, item.name)
-		return errors.Wrapf(err, "failed to delete backend service %s", item.name)
+
+	var op *compute.Operation
+	var err error
+	if scope == gcpGlobalResource {
+		op, err = o.computeSvc.BackendServices.Delete(o.ProjectID, item.name).RequestId(o.requestID(item.typeName, item.name)).Context(ctx).Do()
+	} else {
+		op, err = o.computeSvc.RegionBackendServices.Delete(o.ProjectID, o.Region, item.name).RequestId(o.requestID(item.typeName, item.name)).Context(ctx).Do()
 	}
+
 	if op != nil && op.Status == "DONE" && isErrorStatus(op.HttpErrorStatusCode) {
 		o.resetRequestID(item.typeName, item.name)
-		return errors.Errorf("failed to delete backend service %s with error: %s", item.name, operationErrorMessage(op))
+		return fmt.Errorf("failed to delete backend service %s with error: %s: %w", item.name, operationErrorMessage(op), err)
 	}
 	if (err != nil && isNoOp(err)) || (op != nil && op.Status == "DONE") {
 		o.resetRequestID(item.typeName, item.name)
@@ -77,19 +108,25 @@ func (o *ClusterUninstaller) deleteBackendService(ctx context.Context, item clou
 // destroyBackendServices removes backend services with a name prefixed
 // with the cluster's infra ID.
 func (o *ClusterUninstaller) destroyBackendServices(ctx context.Context) error {
-	found, err := o.listBackendServices(ctx)
-	if err != nil {
-		return err
-	}
-	items := o.insertPendingItems("backendservice", found)
-	for _, item := range items {
-		err := o.deleteBackendService(ctx, item)
+	for _, scope := range []resourceScope{gcpGlobalResource, gcpRegionalResource} {
+		found, err := o.listBackendServices(ctx, scope)
 		if err != nil {
-			o.errorTracker.suppressWarning(item.key, err, o.Logger)
+			return fmt.Errorf("failed to list backend services: %w", err)
+		}
+		items := o.insertPendingItems("backendservice", found)
+		for _, item := range items {
+			err := o.deleteBackendService(ctx, item, scope)
+			if err != nil {
+				o.errorTracker.suppressWarning(item.key, err, o.Logger)
+			}
+		}
+		if items = o.getPendingItems("backendservice"); len(items) > 0 {
+			for _, item := range items {
+				if err := o.deleteBackendService(ctx, item, scope); err != nil {
+					return fmt.Errorf("error deleting pending backend service %s: %w", item.name, err)
+				}
+			}
 		}
-	}
-	if items = o.getPendingItems("backendservice"); len(items) > 0 {
-		return errors.Errorf("%d items pending", len(items))
 	}
 	return nil
 }

pkg/destroy/gcp/bucket.go

@@ -52,7 +52,7 @@ func (o *ClusterUninstaller) listBucketsWithFilter(ctx context.Context, fields s
 }
 
 func (o *ClusterUninstaller) deleteBucket(ctx context.Context, item cloudResource) error {
-	o.Logger.Debugf("Deleting storate bucket %s", item.name)
+	o.Logger.Debugf("Deleting storage bucket %s", item.name)
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
 	err := o.storageSvc.Buckets.Delete(item.name).Context(ctx).Do()

pkg/destroy/gcp/bucketobject.go

@@ -31,7 +31,7 @@ func (o *ClusterUninstaller) listBucketObjects(ctx context.Context, bucket cloud
 }
 
 func (o *ClusterUninstaller) deleteBucketObject(ctx context.Context, bucket cloudResource, item cloudResource) error {
-	o.Logger.Debugf("Deleting storate object %s/%s", bucket.name, item.name)
+	o.Logger.Debugf("Deleting storage object %s/%s", bucket.name, item.name)
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
 	err := o.storageSvc.Objects.Delete(bucket.name, item.name).Context(ctx).Do()

pkg/destroy/gcp/cloudcontroller.go

@@ -36,7 +36,7 @@ func (o *ClusterUninstaller) listCloudControllerBackendServices(ctx context.Cont
 			}
 		}
 		return true
-	})
+	}, gcpRegionalResource)
 }
 
 // listCloudControllerTargetPools returns target pools created by the cloud controller or owned by the cloud controller.
@@ -114,7 +114,7 @@ func (o *ClusterUninstaller) discoverCloudControllerLoadBalancerResources(ctx co
 	o.insertPendingItems("firewall", found)
 
 	// Discover associated forwarding rules: loadBalancerName
-	found, err = o.listForwardingRulesWithFilter(ctx, "items(name),nextPageToken", loadBalancerNameFilter, nil)
+	found, err = o.listForwardingRulesWithFilter(ctx, "items(name),nextPageToken", loadBalancerNameFilter, nil, gcpRegionalResource)
 	if err != nil {
 		return err
 	}

pkg/destroy/gcp/firewall.go

@@ -2,6 +2,7 @@ package gcp
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	"google.golang.org/api/compute/v1"
@@ -11,7 +12,11 @@ import (
 )
 
 func (o *ClusterUninstaller) listFirewalls(ctx context.Context) ([]cloudResource, error) {
-	return o.listFirewallsWithFilter(ctx, "items(name),nextPageToken", o.clusterIDFilter(), nil)
+	// The firewall rules that the destroyer is searching for here include a
+	// pattern before and after the cluster ID. Use a regular expression that allows
+	// wildcard values before and after the cluster ID.
+	filter := fmt.Sprintf("name eq .*%s.*", o.ClusterID)
+	return o.listFirewallsWithFilter(ctx, "items(name),nextPageToken", filter, nil)
 }
 
 // listFirewallsWithFilter lists firewall rules in the project that satisfy the filter criteria.