PowerVS: create install-config improvements

default to ~/.powervs, otherwise prompt for
    zone
    service instance id
    resource group (handle "Default" if a default group exists

https://issues.redhat.com/browse/MULTIARCH-2517

Author: hamzy

pkg/asset/installconfig/platformcredscheck.go

@@ -78,11 +78,7 @@ func (a *PlatformCredsCheck) Generate(dependencies asset.Parents) error {
 			return errors.Wrap(err, "creating IBM Cloud session")
 		}
 	case powervs.Name:
-		bxCli, err := powervsconfig.NewBxClient()
-		if err != nil {
-			return err
-		}
-		err = bxCli.NewPISession()
+		_, err = powervsconfig.NewClient()
 		if err != nil {
 			return errors.Wrap(err, "creating IBM Cloud session")
 		}

pkg/asset/installconfig/platformpermscheck.go

@@ -91,7 +91,7 @@ func (a *PlatformPermsCheck) Generate(dependencies asset.Parents) error {
 	case ibmcloud.Name:
 		// TODO: IBM[#90]: platformpermscheck
 	case powervs.Name:
-		bxCli, err := powervsconfig.NewBxClient()
+		bxCli, err := powervsconfig.NewBxClient(false)
 		if err != nil {
 			return err
 		}

pkg/asset/installconfig/platformprovisioncheck.go

@@ -131,14 +131,26 @@ func (a *PlatformProvisionCheck) Generate(dependencies asset.Parents) error {
 		if err != nil {
 			return err
 		}
+
 		err = powervsconfig.ValidatePreExistingDNS(client, ic.Config, ic.PowerVS)
 		if err != nil {
 			return err
 		}
+
 		err = powervsconfig.ValidateCustomVPCSetup(client, ic.Config)
 		if err != nil {
 			return err
 		}
+
+		err = powervsconfig.ValidateResourceGroup(client, ic.Config)
+		if err != nil {
+			return err
+		}
+
+		err = powervsconfig.ValidateServiceInstance(client, ic.Config)
+		if err != nil {
+			return err
+		}
 	case libvirt.Name, none.Name:
 		// no special provisioning requirements to check
 	case nutanix.Name:

pkg/asset/installconfig/powervs/client.go

@@ -37,11 +37,14 @@ type API interface {
 	GetAPIKey() string
 	SetVPCServiceURLForRegion(ctx context.Context, region string) error
 	GetVPCs(ctx context.Context, region string) ([]vpcv1.VPC, error)
+	ListResourceGroups(ctx context.Context) (*resourcemanagerv2.ResourceGroupList, error)
+	ListServiceInstances(ctx context.Context) ([]string, error)
 }
 
 // Client makes calls to the PowerVS API.
 type Client struct {
 	APIKey         string
+	BXCli          *BxClient
 	managementAPI  *resourcemanagerv2.ResourceManagerV2
 	controllerAPI  *resourcecontrollerv2.ResourceControllerV2
 	vpcAPI         *vpcv1.VpcV1
@@ -82,19 +85,47 @@ type DNSRecordResponse struct {
 
 // NewClient initializes a client with a session.
 func NewClient() (*Client, error) {
-	bxCli, err := NewBxClient()
+	bxCli, err := NewBxClient(false)
 	if err != nil {
 		return nil, err
 	}
 
 	client := &Client{
 		APIKey: bxCli.APIKey,
+		BXCli:  bxCli,
 	}
 
 	if err := client.loadSDKServices(); err != nil {
 		return nil, errors.Wrap(err, "failed to load IBM SDK services")
 	}
 
+	if bxCli.PowerVSResourceGroup == "Default" {
+		// Here we are initialized enough to handle a default resource group
+		ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Minute)
+		defer cancel()
+
+		resourceGroups, err := client.ListResourceGroups(ctx)
+		if err != nil {
+			return nil, errors.Wrap(err, "client.ListResourceGroups failed")
+		}
+		if resourceGroups == nil {
+			return nil, errors.New("client.ListResourceGroups returns nil")
+		}
+
+		found := false
+		for _, resourceGroup := range resourceGroups.Resources {
+			if resourceGroup.Default != nil && *resourceGroup.Default {
+				bxCli.PowerVSResourceGroup = *resourceGroup.Name
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			return nil, errors.New("no default resource group found")
+		}
+	}
+
 	return client, nil
 }
 
@@ -535,3 +566,83 @@ func (c *Client) GetVPCs(ctx context.Context, region string) ([]vpcv1.VPC, error
 
 	return vpcs.Vpcs, nil
 }
+
+// ListResourceGroups returns a list of resource groups.
+func (c *Client) ListResourceGroups(ctx context.Context) (*resourcemanagerv2.ResourceGroupList, error) {
+	listResourceGroupsOptions := c.managementAPI.NewListResourceGroupsOptions()
+
+	resourceGroups, _, err := c.managementAPI.ListResourceGroups(listResourceGroupsOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	return resourceGroups, err
+}
+
+const (
+	// resource Id for Power Systems Virtual Server in the Global catalog.
+	powerIAASResourceID = "abd259f0-9990-11e8-acc8-b9f54a8f1661"
+)
+
+// ListServiceInstances lists all service instances in the cloud.
+func (c *Client) ListServiceInstances(ctx context.Context) ([]string, error) {
+	var (
+		serviceInstances []string
+		options          *resourcecontrollerv2.ListResourceInstancesOptions
+		resources        *resourcecontrollerv2.ResourceInstancesList
+		err              error
+		perPage          int64 = 10
+		moreData               = true
+		nextURL          *string
+	)
+
+	options = c.controllerAPI.NewListResourceInstancesOptions()
+	options.SetResourceGroupID(c.BXCli.PowerVSResourceGroup)
+	// 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 nil, errors.Wrap(err, "Failed to list resource instance")
+		}
+
+		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 nil, errors.Wrap(err, "Failed to get instance")
+			}
+			if response != nil && response.StatusCode == http.StatusNotFound || response.StatusCode == http.StatusInternalServerError {
+				continue
+			}
+
+			if resourceInstance.Type != nil && *resourceInstance.Type == "service_instance" {
+				serviceInstances = append(serviceInstances, fmt.Sprintf("%s %s", *resource.Name, *resource.GUID))
+			}
+		}
+
+		// 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 nil, errors.Wrap(err, "Failed to GetQueryParam on start")
+		}
+		if nextURL == nil {
+			options.SetStart("")
+		} else {
+			options.SetStart(*nextURL)
+		}
+
+		moreData = *resources.RowsCount == perPage
+	}
+
+	return serviceInstances, nil
+}

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

@@ -9,12 +9,7 @@ import (
 // Platform collects powervs-specific configuration.
 func Platform() (*powervs.Platform, error) {
 
-	bxCli, err := NewBxClient()
-	if err != nil {
-		return nil, err
-	}
-
-	err = bxCli.NewPISession()
+	bxCli, err := NewBxClient(true)
 	if err != nil {
 		return nil, err
 	}
@@ -28,9 +23,11 @@ func Platform() (*powervs.Platform, error) {
 		p.ClusterOSImage = osOverride
 	}
 
-	p.Region = bxCli.PISession.Options.Region
-	p.Zone = bxCli.PISession.Options.Zone
-	p.UserID = bxCli.PISession.Options.UserAccount
+	p.Region = bxCli.Region
+	p.Zone = bxCli.Zone
+	p.UserID = bxCli.User.ID
+	p.ServiceInstanceID = bxCli.ServiceInstanceID
+	p.PowerVSResourceGroup = bxCli.PowerVSResourceGroup
 
 	return &p, nil
 }

pkg/asset/installconfig/powervs/platform.go

@@ -49,7 +49,7 @@ func IsKnownZone(region string, zone string) bool {
 }
 
 // GetRegion prompts the user to select a region and returns that region.
-func GetRegion() (string, error) {
+func GetRegion(defaultRegion string) (string, error) {
 	regions := knownRegions()
 
 	longRegions := make([]string, 0, len(regions))
@@ -72,12 +72,19 @@ func GetRegion() (string, error) {
 	}
 
 	var region string
+	li := sort.SearchStrings(shortRegions, defaultRegion)
+	if li == len(shortRegions) || shortRegions[li] != defaultRegion {
+		defaultRegion = ""
+	} else {
+		defaultRegion = longRegions[li]
+	}
 
 	err := survey.Ask([]*survey.Question{
 		{
 			Prompt: &survey.Select{
 				Message: "Region",
 				Help:    "The Power VS region to be used for installation.",
+				Default: defaultRegion,
 				Options: longRegions,
 			},
 			Validate: survey.ComposeValidators(survey.Required, func(ans interface{}) error {
@@ -99,9 +106,11 @@ func GetRegion() (string, error) {
 }
 
 // GetZone prompts the user for a zone given a zone.
-func GetZone(region string) (string, error) {
+func GetZone(region string, defaultZone string) (string, error) {
 	zones := knownZones(region)
-	defaultZone := zones[0]
+	if len(defaultZone) == 0 {
+		defaultZone = zones[0]
+	}
 
 	var zoneTransform survey.Transformer = func(ans interface{}) interface{} {
 		switch v := ans.(type) {