** New: Delete Target TCP Proxies

Author: barbacbd

pkg/destroy/gcp/backendservice.go

@@ -121,7 +121,11 @@ func (o *ClusterUninstaller) destroyBackendServices(ctx context.Context) error {
 			}
 		}
 		if items = o.getPendingItems("backendservice"); len(items) > 0 {
-			return fmt.Errorf("%d items pending", len(items))
+			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)
+				}
+			}
 		}
 	}
 	return nil

pkg/destroy/gcp/forwardingrule.go

@@ -90,7 +90,7 @@ func (o *ClusterUninstaller) listForwardingRulesWithFilter(ctx context.Context,
 }
 
 func (o *ClusterUninstaller) deleteForwardingRule(ctx context.Context, item cloudResource, scope resourceScope) error {
-	o.Logger.Debugf("Deleting forwarding rule %s", item.name)
+	o.Logger.Debugf("Deleting %s forwarding rule %s", scope, item.name)
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
 
@@ -110,7 +110,7 @@ func (o *ClusterUninstaller) deleteForwardingRule(ctx context.Context, item clou
 		o.resetRequestID(item.typeName, item.name)
 		return fmt.Errorf("failed to delete forwarding rule %s with error: %s: %w", item.name, operationErrorMessage(op), err)
 	}
-	if (err != nil && isNoOp(err)) || (op != nil && op.Status == "DONE") {
+	if op != nil && op.Status == "DONE" {
 		o.resetRequestID(item.typeName, item.name)
 		o.deletePendingItems(item.typeName, []cloudResource{item})
 		o.Logger.Infof("Deleted forwarding rule %s", item.name)
@@ -121,7 +121,7 @@ func (o *ClusterUninstaller) deleteForwardingRule(ctx context.Context, item clou
 // destroyForwardingRules removes all forwarding rules with a name prefixed
 // with the cluster's infra ID.
 func (o *ClusterUninstaller) destroyForwardingRules(ctx context.Context) error {
-	for _, scope := range []resourceScope{gcpGlobalResource, gcpRegionalResource} {
+	for _, scope := range []resourceScope{gcpRegionalResource, gcpGlobalResource} {
 		found, err := o.listForwardingRules(ctx, scope)
 		if err != nil {
 			return fmt.Errorf("failed to list forwarding rules: %w", err)
@@ -134,7 +134,11 @@ func (o *ClusterUninstaller) destroyForwardingRules(ctx context.Context) error {
 			}
 		}
 		if items = o.getPendingItems("forwardingrule"); len(items) > 0 {
-			return fmt.Errorf("%d items pending", len(items))
+			for _, item := range items {
+				if err := o.deleteForwardingRule(ctx, item, scope); err != nil {
+					return fmt.Errorf("error deleting pending forwarding rule %s: %w", item.name, err)
+				}
+			}
 		}
 	}
 	return nil

pkg/destroy/gcp/gcp.go

@@ -180,9 +180,10 @@ func (o *ClusterUninstaller) destroyCluster() (bool, error) {
 		{name: "Routes", execute: o.destroyRoutes},
 		{name: "Firewalls", execute: o.destroyFirewalls},
 		{name: "Addresses", execute: o.destroyAddresses},
+		{name: "Forwarding rules", execute: o.destroyForwardingRules},
 		{name: "Target Pools", execute: o.destroyTargetPools},
 		{name: "Instance groups", execute: o.destroyInstanceGroups},
-		{name: "Forwarding rules", execute: o.destroyForwardingRules},
+		{name: "Target TCP Proxies", execute: o.destroyTargetTCPProxies},
 		{name: "Backend services", execute: o.destroyBackendServices},
 		{name: "Health checks", execute: o.destroyHealthChecks},
 		{name: "HTTP Health checks", execute: o.destroyHTTPHealthChecks},

pkg/destroy/gcp/targetTCPProxies.go

@@ -0,0 +1,92 @@
+package gcp
+
+import (
+	"context"
+	"fmt"
+
+	"google.golang.org/api/compute/v1"
+	"google.golang.org/api/googleapi"
+
+	"github.com/openshift/installer/pkg/types/gcp"
+)
+
+func (o *ClusterUninstaller) listTargetTCPProxies(ctx context.Context) ([]cloudResource, error) {
+	return o.listTargetTCPProxiesWithFilter(ctx, "items(name),nextPageToken", o.clusterIDFilter(), nil)
+}
+
+// listTargetTCPProxiesWithFilter lists target TCP Proxies in the project that satisfy the filter criteria.
+func (o *ClusterUninstaller) listTargetTCPProxiesWithFilter(ctx context.Context, fields string, filter string, filterFunc func(list *compute.TargetTcpProxy) bool) ([]cloudResource, error) {
+	o.Logger.Debugf("Listing target tcp proxies")
+	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
+	defer cancel()
+	result := []cloudResource{}
+	req := o.computeSvc.TargetTcpProxies.List(o.ProjectID).Fields(googleapi.Field(fields))
+	if len(filter) > 0 {
+		req = req.Filter(filter)
+	}
+	err := req.Pages(ctx, func(list *compute.TargetTcpProxyList) error {
+		for _, item := range list.Items {
+			if filterFunc == nil || (filterFunc != nil && filterFunc(item)) {
+				o.Logger.Debugf("Found target TCP proxy: %s", item.Name)
+				result = append(result, cloudResource{
+					key:      item.Name,
+					name:     item.Name,
+					typeName: "targettcpproxy",
+					quota: []gcp.QuotaUsage{{
+						Metric: &gcp.Metric{
+							Service: gcp.ServiceComputeEngineAPI,
+							Limit:   "target_tcp_proxy",
+						},
+						Amount: 1,
+					}},
+				})
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to list target tcp proxies: %w", err)
+	}
+	return result, nil
+}
+
+func (o *ClusterUninstaller) deleteTargetTCPProxy(ctx context.Context, item cloudResource) error {
+	o.Logger.Debugf("Deleting target TCP Proxies %s", item.name)
+	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
+	defer cancel()
+	op, err := o.computeSvc.TargetTcpProxies.Delete(o.ProjectID, item.name).RequestId(o.requestID(item.typeName, item.name)).Context(ctx).Do()
+	if err != nil && !isNoOp(err) {
+		o.resetRequestID(item.typeName, item.name)
+		return fmt.Errorf("failed to delete target TCP proxy %s: %w", item.name, err)
+	}
+	if op != nil && op.Status == "DONE" && isErrorStatus(op.HttpErrorStatusCode) {
+		o.resetRequestID(item.typeName, item.name)
+		return fmt.Errorf("failed to delete target TCP proxy %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)
+		o.deletePendingItems(item.typeName, []cloudResource{item})
+		o.Logger.Infof("Deleted target TCP proxy %s", item.name)
+	}
+	return nil
+}
+
+// destroyTargetTCPProxies removes target tcp proxies with a name prefixed
+// with the cluster's infra ID.
+func (o *ClusterUninstaller) destroyTargetTCPProxies(ctx context.Context) error {
+	found, err := o.listTargetTCPProxies(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to list target TCP proxies: %w", err)
+	}
+	items := o.insertPendingItems("targettcpproxy", found)
+	for _, item := range items {
+		err := o.deleteTargetTCPProxy(ctx, item)
+		if err != nil {
+			o.errorTracker.suppressWarning(item.key, err, o.Logger)
+		}
+	}
+	if items = o.getPendingItems("targettcpproxy"); len(items) > 0 {
+		return fmt.Errorf("%d items pending", len(items))
+	}
+	return nil
+}