Cleaner: continue on error for PE and peering connections

.github/actions/clean-vpc/azure.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"strings"
@@ -23,16 +24,17 @@ func deleteAzureVPCBySubstr(ctx context.Context, subID, resourceGroupName, subst
 	if err != nil {
 		return false, fmt.Errorf("error fetching vnets: %v", err)
 	}
+	var allErr error
 	for _, vnet := range vnets.Values() {
 		if vnet.Name != nil && strings.HasPrefix(*vnet.Name, substr) {
 			log.Printf("deleting vnet %s", *vnet.Name)
 			_, err = vnetClient.Delete(ctx, resourceGroupName, *vnet.Name)
 			if err != nil {
-				log.Printf("error deleting vnet: %v", err)
+				allErr = errors.Join(allErr, fmt.Errorf("error deleting vnet: %v", err))
 				ok = false
 			}
 		}
 	}
 
-	return ok, nil
+	return ok, allErr
 }

.github/actions/clean-vpc/gcp.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -26,17 +27,18 @@ func deleteGCPVPCBySubstr(gcpProjectID, nameSubstr string) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("failed to list networks: %s", err)
 	}
+	var allErr error
 	for _, network := range networks.Items {
 		if strings.HasPrefix(network.Name, nameSubstr) {
 			log.Printf("deleting network %s", network.Name)
 			_, err = networkService.Delete(gcpProjectID, network.Name).Do()
 			if err != nil {
-				log.Printf(fmt.Sprintf("failed to delete network %s: %s", network.Name, err))
+				allErr = errors.Join(allErr, fmt.Errorf("failed to delete network %s: %s", network.Name, err))
 				ok = false
 			}
 		}
 	}
-	return ok, nil
+	return ok, allErr
 }
 
 func setGCPCredentials() error {

.github/actions/cleanup-pe/cleanall.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"strings"
@@ -25,6 +26,7 @@ func cleanAllAWSPE(region string, subnets []string) error {
 
 	svc := ec2.New(awsSession)
 
+	var allErr error
 	for _, subnet := range subnets {
 		subnetInput := &ec2.DescribeSubnetsInput{
 			Filters: []*ec2.Filter{{
@@ -61,7 +63,8 @@ func cleanAllAWSPE(region string, subnets []string) error {
 
 		err = deleteAWSPEsByID(svc, endpointIDs)
 		if err != nil {
-			return err
+			allErr = errors.Join(allErr, err)
+			continue
 		}
 
 		log.Printf("deleted %d AWS PEs in region %s", len(endpointIDs), region)
@@ -132,6 +135,7 @@ func cleanAllGCPPE(ctx context.Context, projectID, vpc, region string, subnets [
 
 	networkURL := formNetworkURL(vpc, projectID)
 
+	var allErr error
 	for _, subnet := range subnets {
 		subnetURL := formSubnetURL(region, subnet, projectID)
 
@@ -147,7 +151,8 @@ func cleanAllGCPPE(ctx context.Context, projectID, vpc, region string, subnets [
 			if forwardRule.Network == networkURL {
 				_, err = computeService.ForwardingRules.Delete(projectID, region, forwardRule.Name).Do()
 				if err != nil {
-					return fmt.Errorf("error while deleting forwarding rule: %v", err)
+					allErr = errors.Join(allErr, fmt.Errorf("error while deleting forwarding rule: %v", err))
+					continue
 				}
 
 				counter++
@@ -160,11 +165,11 @@ func cleanAllGCPPE(ctx context.Context, projectID, vpc, region string, subnets [
 		time.Sleep(time.Second * 20) // need to wait for GCP to delete the forwarding rule
 		err = deleteGCPAddressBySubnet(computeService, projectID, region, subnetURL)
 		if err != nil {
-			return fmt.Errorf("error while deleting GCP address: %v", err)
+			allErr = errors.Join(allErr, fmt.Errorf("error while deleting GCP address: %v", err))
 		}
 	}
 
-	return nil
+	return allErr
 }
 
 func deleteGCPAddressBySubnet(service *compute.Service, projectID, region, subnetURL string) error {
@@ -175,19 +180,21 @@ func deleteGCPAddressBySubnet(service *compute.Service, projectID, region, subne
 	}
 
 	counter := 0
+	var allErr error
 	for _, address := range addressList.Items {
 		if address.Subnetwork == subnetURL {
 			_, err = service.Addresses.Delete(projectID, region, address.Name).Do()
 			if err != nil {
-				return fmt.Errorf("error while deleting address: %v", err)
+				allErr = errors.Join(allErr, fmt.Errorf("error while deleting address: %v", err))
+				continue
 			}
 			counter++
 			log.Printf("successfully deleted GCP address: %s. subnet: %s", address.Name, address.Subnetwork)
 		}
 	}
 
 	log.Printf("deleted %d GCP addresses", counter)
-	return nil
+	return allErr
 }
 
 func formNetworkURL(network, projectID string) string {

.github/actions/cleanup-pe/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -58,22 +59,23 @@ func CleanAllPE() error {
 	gcpRegion := "europe-west1"
 	subscriptionID := os.Getenv("AZURE_SUBSCRIPTION_ID")
 
+	var allErr error
 	err := cleanAllAzurePE(ctx, groupNameAzure, subscriptionID, []string{subnet1Name, subnet2Name})
 	if err != nil {
-		return fmt.Errorf("error while cleaning all azure pe: %v", err)
+		allErr = errors.Join(allErr, fmt.Errorf("error while cleaning all azure pe: %v", err))
 	}
 
 	for _, awsRegion := range awsRegions {
 		errClean := cleanAllAWSPE(awsRegion, []string{subnet1Name, subnet2Name})
 		if errClean != nil {
-			return fmt.Errorf("error cleaning all aws PE. region %s. error: %v", awsRegion, errClean)
+			allErr = errors.Join(allErr, fmt.Errorf("error cleaning all aws PE. region %s. error: %v", awsRegion, errClean))
 		}
 	}
 
 	err = cleanAllGCPPE(ctx, googleProjectID, gcpVPCName, gcpRegion, []string{subnet1Name, subnet2Name})
 	if err != nil {
-		return fmt.Errorf("error while cleaning all gcp pe: %v", err)
+		allErr = errors.Join(allErr, fmt.Errorf("error while cleaning all gcp pe: %v", err))
 	}
 
-	return nil
+	return allErr
 }