PowerVS: Fix CAPI to use service instance

We should be passing in the ServiceInstance structure which handles
both pre-existing and CAPI created versions.  Also we did not properly
get the service instance GUID.

Author: hamzy

data/data/cluster-api/ibmcloud-infrastructure-components.yaml

@@ -67,6 +67,7 @@ type API interface {
 	// Service Instance
 	ListServiceInstances(ctx context.Context) ([]string, error)
 	ServiceInstanceGUIDToName(ctx context.Context, id string) (string, error)
+	ServiceInstanceNameToGUID(ctx context.Context, name string) (string, error)
 
 	// Security Group
 	ListSecurityGroupRules(ctx context.Context, securityGroupID string) (*vpcv1.SecurityGroupRuleCollection, error)
@@ -89,8 +90,10 @@ type Client struct {
 
 // cisServiceID is the Cloud Internet Services' catalog service ID.
 const (
-	cisServiceID = "75874a60-cb12-11e7-948e-37ac098eb1b9"
-	dnsServiceID = "b4ed8a30-936f-11e9-b289-1d079699cbe5"
+	cisServiceID          = "75874a60-cb12-11e7-948e-37ac098eb1b9"
+	dnsServiceID          = "b4ed8a30-936f-11e9-b289-1d079699cbe5"
+	serviceInstanceType   = "service_instance"
+	compositeInstanceType = "composite_instance"
 )
 
 // DNSZoneResponse represents a DNS zone response.
@@ -743,7 +746,7 @@ func (c *Client) ListServiceInstances(ctx context.Context) ([]string, error) {
 				continue
 			}
 
-			if resourceInstance.Type != nil && (*resourceInstance.Type == "service_instance" || *resourceInstance.Type == "composite_instance") {
+			if resourceInstance.Type != nil && (*resourceInstance.Type == serviceInstanceType || *resourceInstance.Type == compositeInstanceType) {
 				serviceInstances = append(serviceInstances, fmt.Sprintf("%s %s", *resource.Name, *resource.GUID))
 			}
 		}
@@ -819,7 +822,7 @@ func (c *Client) ServiceInstanceGUIDToName(ctx context.Context, id string) (stri
 				continue
 			}
 
-			if resourceInstance.Type != nil && (*resourceInstance.Type == "service_instance" || *resourceInstance.Type == "composite_instance") {
+			if resourceInstance.Type != nil && (*resourceInstance.Type == serviceInstanceType || *resourceInstance.Type == compositeInstanceType) {
 				if resourceInstance.GUID != nil && *resourceInstance.GUID == id {
 					if resourceInstance.Name == nil {
 						return "", nil
@@ -846,6 +849,87 @@ func (c *Client) ServiceInstanceGUIDToName(ctx context.Context, id string) (stri
 	return "", nil
 }
 
+// ServiceInstanceNameToGUID returns the name of the matching service instance GUID which was passed in.
+func (c *Client) ServiceInstanceNameToGUID(ctx context.Context, name string) (string, error) {
+	var (
+		options   *resourcecontrollerv2.ListResourceInstancesOptions
+		resources *resourcecontrollerv2.ResourceInstancesList
+		err       error
+		perPage   int64 = 10
+		moreData        = true
+		nextURL   *string
+		groupID   = c.BXCli.PowerVSResourceGroup
+	)
+
+	// If the user passes in a human readable group id, then we need to convert it to a UUID
+	listGroupOptions := c.managementAPI.NewListResourceGroupsOptions()
+	listGroupOptions.AccountID = &c.BXCli.User.Account
+	groups, _, err := c.managementAPI.ListResourceGroupsWithContext(ctx, listGroupOptions)
+	if err != nil {
+		return "", fmt.Errorf("failed to list resource groups: %w", err)
+	}
+	for _, group := range groups.Resources {
+		if *group.Name == groupID {
+			groupID = *group.ID
+		}
+	}
+
+	options = c.controllerAPI.NewListResourceInstancesOptions()
+	options.SetResourceGroupID(groupID)
+	// resource ID for Power Systems Virtual Server in the Global catalog
+	options.SetResourceID(powerIAASResourceID)
+	options.SetLimit(perPage)
+
+	for moreData {
+		resources, _, err = c.controllerAPI.ListResourceInstancesWithContext(ctx, options)
+		if err != nil {
+			return "", fmt.Errorf("failed to list resource instances: %w", err)
+		}
+
+		for _, resource := range resources.Resources {
+			var (
+				getResourceOptions *resourcecontrollerv2.GetResourceInstanceOptions
+				resourceInstance   *resourcecontrollerv2.ResourceInstance
+				response           *core.DetailedResponse
+			)
+
+			getResourceOptions = c.controllerAPI.NewGetResourceInstanceOptions(*resource.ID)
+
+			resourceInstance, response, err = c.controllerAPI.GetResourceInstance(getResourceOptions)
+			if err != nil {
+				return "", fmt.Errorf("failed to get instance: %w", err)
+			}
+			if response != nil && response.StatusCode == http.StatusNotFound || response.StatusCode == http.StatusInternalServerError {
+				continue
+			}
+
+			if resourceInstance.Type != nil && (*resourceInstance.Type == serviceInstanceType || *resourceInstance.Type == compositeInstanceType) {
+				if resourceInstance.Name != nil && *resourceInstance.Name == name {
+					if resourceInstance.GUID == nil {
+						return "", nil
+					}
+					return *resourceInstance.GUID, nil
+				}
+			}
+		}
+
+		// Based on: https://cloud.ibm.com/apidocs/resource-controller/resource-controller?code=go#list-resource-instances
+		nextURL, err = core.GetQueryParam(resources.NextURL, "start")
+		if err != nil {
+			return "", fmt.Errorf("failed to GetQueryParam on start: %w", err)
+		}
+		if nextURL == nil {
+			options.SetStart("")
+		} else {
+			options.SetStart(*nextURL)
+		}
+
+		moreData = *resources.RowsCount == perPage
+	}
+
+	return "", nil
+}
+
 // GetDatacenterCapabilities retrieves the capabilities of the specified datacenter.
 func (c *Client) GetDatacenterCapabilities(ctx context.Context, region string) (map[string]bool, error) {
 	var err error

pkg/asset/installconfig/powervs/client.go

@@ -42,7 +42,7 @@ func GenerateMachines(clusterID string, ic *types.InstallConfig, pool *types.Mac
 	image = fmt.Sprintf("rhcos-%s", clusterID)
 
 	if ic.PowerVS.ServiceInstanceGUID == "" {
-		serviceName := fmt.Sprintf("%s-iaas", clusterID)
+		serviceName := fmt.Sprintf("%s-power-iaas", clusterID)
 
 		service = capibm.IBMPowerVSResourceReference{
 			Name: &serviceName,

pkg/asset/installconfig/powervs/mock/powervsclient_generated.go

@@ -50,7 +50,7 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 	network = fmt.Sprintf("%s-network", clusterID.InfraID)
 
 	if installConfig.Config.PowerVS.ServiceInstanceGUID == "" {
-		serviceName := fmt.Sprintf("%s-iaas", clusterID.InfraID)
+		serviceName := fmt.Sprintf("%s-power-iaas", clusterID.InfraID)
 
 		service = capibm.IBMPowerVSResourceReference{
 			Name: &serviceName,
@@ -177,11 +177,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 			Namespace: capiutils.Namespace,
 		},
 		Spec: capibm.IBMPowerVSImageSpec{
-			ClusterName:       clusterID.InfraID,
-			ServiceInstanceID: installConfig.Config.PowerVS.ServiceInstanceGUID,
-			Bucket:            &bucket,
-			Object:            &object,
-			Region:            &vpcRegion,
+			ClusterName:     clusterID.InfraID,
+			ServiceInstance: &service,
+			Bucket:          &bucket,
+			Object:          &object,
+			Region:          &vpcRegion,
 		},
 	}
 

pkg/asset/machines/powervs/powervsmachines.go

@@ -294,6 +294,8 @@ func (p Provider) PostProvision(ctx context.Context, in clusterapi.PostProvision
 		refServiceInstance *capibm.IBMPowerVSResourceReference
 		sshKeyName         string
 		err                error
+		instanceID         *string
+		fieldType          string
 	)
 
 	// SAD: client in the Metadata struct is lowercase and therefore private
@@ -332,60 +334,45 @@ func (p Provider) PostProvision(ctx context.Context, in clusterapi.PostProvision
 		logrus.Debugf("PostProvision: CreateSSHKey: si id = %s, key = %s",
 			*refServiceInstance.ID,
 			in.InstallConfig.Config.SSHKey)
-
-		backoff := wait.Backoff{
-			Duration: 15 * time.Second,
-			Factor:   1.1,
-			Cap:      leftInContext(ctx),
-			Steps:    math.MaxInt32}
-		err = wait.ExponentialBackoffWithContext(ctx, backoff, func(context.Context) (bool, error) {
-			err2 := client.CreateSSHKey(ctx,
-				*refServiceInstance.ID,
-				*powerVSMachine.Status.Zone,
-				sshKeyName,
-				in.InstallConfig.Config.SSHKey)
-			if err2 == nil {
-				return true, nil
-			}
-			return false, err2
-		})
-		if err != nil {
-			return fmt.Errorf("failed to add SSH key for the workers(ID): %w", err)
-		}
+		instanceID = refServiceInstance.ID
+		fieldType = "ID"
 	case refServiceInstance.Name != nil:
 		logrus.Debugf("PostProvision: CreateSSHKey: si name = %s, key = %s",
 			*refServiceInstance.Name,
 			in.InstallConfig.Config.SSHKey)
-
-		vpc, err := client.GetVPCByName(ctx, *refServiceInstance.Name)
+		guid, err := client.ServiceInstanceNameToGUID(ctx, *refServiceInstance.Name)
 		if err != nil {
-			return fmt.Errorf("failed to find id for VPC name %s: %w",
+			return fmt.Errorf("failed to find id for ServiceInstance name %s: %w",
 				*refServiceInstance.Name,
 				err)
 		}
-
-		backoff := wait.Backoff{
-			Duration: 15 * time.Second,
-			Factor:   1.1,
-			Cap:      leftInContext(ctx),
-			Steps:    math.MaxInt32}
-		err = wait.ExponentialBackoffWithContext(ctx, backoff, func(context.Context) (bool, error) {
-			err2 := client.CreateSSHKey(ctx,
-				*vpc.ID,
-				*powerVSMachine.Status.Zone,
-				sshKeyName,
-				in.InstallConfig.Config.SSHKey)
-			if err2 == nil {
-				return true, nil
-			}
-			return false, err2
-		})
-		if err != nil {
-			return fmt.Errorf("failed to add SSH key for the workers(Name): %w", err)
-		}
+		logrus.Debugf("PostProvision: CreateSSHKey: guid = %s", guid)
+		instanceID = ptr.To(guid)
+		fieldType = "Name"
 	default:
 		return fmt.Errorf("could not handle powerVSMachine.Spec.ServiceInstance")
 	}
 
+	backoff := wait.Backoff{
+		Duration: 15 * time.Second,
+		Factor:   1.1,
+		Cap:      leftInContext(ctx),
+		Steps:    math.MaxInt32,
+	}
+	err = wait.ExponentialBackoffWithContext(ctx, backoff, func(context.Context) (bool, error) {
+		err2 := client.CreateSSHKey(ctx,
+			*instanceID,
+			*powerVSMachine.Status.Zone,
+			sshKeyName,
+			in.InstallConfig.Config.SSHKey)
+		if err2 == nil {
+			return true, nil
+		}
+		return false, err2
+	})
+	if err != nil {
+		return fmt.Errorf("failed to add SSH key for the workers(%s): %w", fieldType, err)
+	}
+
 	return nil
 }