Merge pull request #1582 from powerkimhub/fix/gcp-vpc-error-handling

cb-spider · web-flow · commit cb78e1372eba · 2025-09-24T16:51:38.000+09:00
[GCP] Fix VPC deletion failure by handling completed operation 404 errors
diff --git a/cloud-control-manager/cloud-driver/drivers/gcp/resources/VPCHandler.go b/cloud-control-manager/cloud-driver/drivers/gcp/resources/VPCHandler.go
@@ -333,6 +333,11 @@ func (vVPCHandler *GCPVPCHandler) WaitUntilComplete(resourceId string, isGlobalA
 			opSatus, err = vVPCHandler.Client.RegionOperations.Get(project, region, resourceId).Do()
 		}
 		if err != nil {
+			// Check if the operation is not found (404), which means it's already completed
+			if strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "notFound") {
+				cblogger.Infof("Operation %s not found, assuming it has already completed successfully.", resourceId)
+				return nil
+			}
 			return err
 		}
 		cblogger.Infof("==> Status : Progress : [%d] / [%s]", opSatus.Progress, opSatus.Status)

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,11 @@ func (vVPCHandler *GCPVPCHandler) WaitUntilComplete(resourceId string, isGlobalA`
`333`	`333`	`opSatus, err = vVPCHandler.Client.RegionOperations.Get(project, region, resourceId).Do()`
`334`	`334`	`}`
`335`	`335`	`if err != nil {`
	`336`	`+ // Check if the operation is not found (404), which means it's already completed`
	`337`	`+ if strings.Contains(err.Error(), "404") \|\| strings.Contains(err.Error(), "notFound") {`
	`338`	`+ cblogger.Infof("Operation %s not found, assuming it has already completed successfully.", resourceId)`
	`339`	`+ return nil`
	`340`	`+ }`
`336`	`341`	`return err`
`337`	`342`	`}`
`338`	`343`	`cblogger.Infof("==> Status : Progress : [%d] / [%s]", opSatus.Progress, opSatus.Status)`