Use instanceIDFromProviderID() function (#2302)

dulek · web-flow · commit 0514aba99539 · 2023-07-18T19:42:03.000-07:00
This commit makes sure that in all instances of reading Nova instance ID
from the `.Spec.ProviderID` field, we're using
`instanceIDFromProviderID()` function which is designed for that
purpose.
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -699,9 +699,9 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref
 		return "", err
 	}
 
-	instanceID := node.Spec.ProviderID
-	if ind := strings.LastIndex(instanceID, "/"); ind >= 0 {
-		instanceID = instanceID[(ind + 1):]
+	_, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)
+	if err != nil {
+		return "", fmt.Errorf("can't determine instance ID from ProviderID when autodetecting LB subnet: %w", err)
 	}
 
 	ports, err := getAttachedPorts(network, instanceID)

Original file line number	Diff line number	Diff line change
`@@ -699,9 +699,9 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref`
`699`	`699`	`return "", err`
`700`	`700`	`}`
`701`	`701`
`702`		`- instanceID := node.Spec.ProviderID`
`703`		`- if ind := strings.LastIndex(instanceID, "/"); ind >= 0 {`
`704`		`- instanceID = instanceID[(ind + 1):]`
	`702`	`+ _, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)`
	`703`	`+ if err != nil {`
	`704`	`+ return "", fmt.Errorf("can't determine instance ID from ProviderID when autodetecting LB subnet: %w", err)`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`ports, err := getAttachedPorts(network, instanceID)`