CORS-4260: Remove xpn only checks for firewall permissions

Author: barbacbd

pkg/infrastructure/gcp/clusterapi/clusterapi.go

@@ -261,15 +261,15 @@ func (p Provider) DestroyBootstrap(ctx context.Context, in clusterapi.BootstrapD
 	projectID := in.Metadata.GCP.ProjectID
 	if in.Metadata.GCP.NetworkProjectID != "" {
 		projectID = in.Metadata.GCP.NetworkProjectID
-
-		createFwRules, err := icgcp.HasPermissions(ctx, projectID, []string{icgcp.DeleteGCPFirewallPermission}, in.Metadata.GCP.ServiceEndpoints)
-		if err != nil {
-			return fmt.Errorf("failed to remove bootstrap firewall rules: %w", err)
-		}
-		if !createFwRules {
-			return nil
-		}
 	}
+	createFwRules, err := icgcp.HasPermissions(ctx, projectID, []string{icgcp.DeleteGCPFirewallPermission}, in.Metadata.GCP.ServiceEndpoints)
+	if err != nil {
+		return fmt.Errorf("failed to remove bootstrap firewall rules: %w", err)
+	}
+	if !createFwRules {
+		return nil
+	}
+
 	if err := removeBootstrapFirewallRules(ctx, in.Metadata.InfraID, projectID, in.Metadata.GCP.ServiceEndpoints); err != nil {
 		return fmt.Errorf("failed to remove bootstrap firewall rules: %w", err)
 	}

pkg/infrastructure/gcp/clusterapi/firewallrules.go

@@ -204,14 +204,13 @@ func createFirewallRules(ctx context.Context, in clusterapi.InfraReadyInput, net
 	projectID := in.InstallConfig.Config.Platform.GCP.ProjectID
 	if in.InstallConfig.Config.GCP.NetworkProjectID != "" {
 		projectID = in.InstallConfig.Config.GCP.NetworkProjectID
-
-		createFwRules, err := gcpconfig.HasPermissions(ctx, projectID, []string{gcpconfig.CreateGCPFirewallPermission}, in.InstallConfig.Config.GCP.ServiceEndpoints)
-		if err != nil {
-			return fmt.Errorf("failed to create cluster firewall rules: %w", err)
-		}
-		if !createFwRules {
-			return nil
-		}
+	}
+	createFwRules, err := gcpconfig.HasPermissions(ctx, projectID, []string{gcpconfig.CreateGCPFirewallPermission}, in.InstallConfig.Config.GCP.ServiceEndpoints)
+	if err != nil {
+		return fmt.Errorf("failed to create cluster firewall rules: %w", err)
+	}
+	if !createFwRules {
+		return nil
 	}
 
 	svc, err := gcpconfig.GetComputeService(ctx, in.InstallConfig.Config.GCP.ServiceEndpoints)
@@ -292,14 +291,13 @@ func createBootstrapFirewallRules(ctx context.Context, in clusterapi.InfraReadyI
 	projectID := in.InstallConfig.Config.Platform.GCP.ProjectID
 	if in.InstallConfig.Config.Platform.GCP.NetworkProjectID != "" {
 		projectID = in.InstallConfig.Config.Platform.GCP.NetworkProjectID
-
-		createFwRules, err := gcpconfig.HasPermissions(ctx, projectID, []string{gcpconfig.CreateGCPFirewallPermission}, in.InstallConfig.Config.GCP.ServiceEndpoints)
-		if err != nil {
-			return fmt.Errorf("failed to create bootstrap firewall rules: %w", err)
-		}
-		if !createFwRules {
-			return nil
-		}
+	}
+	createFwRules, err := gcpconfig.HasPermissions(ctx, projectID, []string{gcpconfig.CreateGCPFirewallPermission}, in.InstallConfig.Config.GCP.ServiceEndpoints)
+	if err != nil {
+		return fmt.Errorf("failed to create bootstrap firewall rules: %w", err)
+	}
+	if !createFwRules {
+		return nil
 	}
 
 	svc, err := gcpconfig.GetComputeService(ctx, in.InstallConfig.Config.GCP.ServiceEndpoints)