BUG: IBM Cloud Infra: Return existing VPC ID (#2141)

cjschaef · web-flow · commit 8885704aa7dc · 2025-01-21T23:04:37.000-08:00
Fix bug where an existing VPC ID that was found, was not being returned, resulting in attempts to recreate the VPC. Related: #2140
diff --git a/cloud/scope/vpc_cluster.go b/cloud/scope/vpc_cluster.go
@@ -496,12 +496,13 @@ func (s *VPCClusterScope) GetVPCID() (*string, error) {
 
 			// Check if the VPC was found and has an ID
 			if vpcDetails != nil && vpcDetails.ID != nil {
-				// Set VPC ID in Status to shortcut future lookups
+				// Set VPC ID in Status to shortcut future lookups, prior to returning the ID.
 				s.SetResourceStatus(infrav1beta2.ResourceTypeVPC, &infrav1beta2.ResourceStatus{
 					ID:    *vpcDetails.ID,
 					Name:  s.NetworkSpec().VPC.Name,
 					Ready: true,
 				})
+				return vpcDetails.ID, nil
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -496,12 +496,13 @@ func (s VPCClusterScope) GetVPCID() (string, error) {`
`496`	`496`
`497`	`497`	`// Check if the VPC was found and has an ID`
`498`	`498`	`if vpcDetails != nil && vpcDetails.ID != nil {`
`499`		`- // Set VPC ID in Status to shortcut future lookups`
	`499`	`+ // Set VPC ID in Status to shortcut future lookups, prior to returning the ID.`
`500`	`500`	`s.SetResourceStatus(infrav1beta2.ResourceTypeVPC, &infrav1beta2.ResourceStatus{`
`501`	`501`	`ID: *vpcDetails.ID,`
`502`	`502`	`Name: s.NetworkSpec().VPC.Name,`
`503`	`503`	`Ready: true,`
`504`	`504`	`})`
	`505`	`+ return vpcDetails.ID, nil`
`505`	`506`	`}`
`506`	`507`	`}`
`507`	`508`	`}`