Merge pull request #8111 from miyamotoh/enable-deploy-by-service-id

OCPBUGS-30641: Enable deploy by Service ID on PowerVS

Author: openshift-merge-bot[bot]

pkg/asset/installconfig/powervs/client.go

@@ -595,6 +595,7 @@ func (c *Client) GetVPCs(ctx context.Context, region string) ([]vpcv1.VPC, error
 // ListResourceGroups returns a list of resource groups.
 func (c *Client) ListResourceGroups(ctx context.Context) (*resourcemanagerv2.ResourceGroupList, error) {
 	listResourceGroupsOptions := c.managementAPI.NewListResourceGroupsOptions()
+	listResourceGroupsOptions.AccountID = &c.BXCli.User.Account
 
 	resourceGroups, _, err := c.managementAPI.ListResourceGroups(listResourceGroupsOptions)
 	if err != nil {
@@ -624,6 +625,7 @@ func (c *Client) ListServiceInstances(ctx context.Context) ([]string, error) {
 
 	// 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 nil, fmt.Errorf("failed to list resource groups: %w", err)
@@ -699,6 +701,7 @@ func (c *Client) ServiceInstanceGUIDToName(ctx context.Context, id string) (stri
 
 	// 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)

pkg/asset/installconfig/powervs/metadata.go

@@ -56,12 +56,10 @@ func (m *Metadata) AccountID(ctx context.Context) (string, error) {
 	}
 
 	if m.accountID == "" {
-		apiKeyDetails, err := m.client.GetAuthenticatorAPIKeyDetails(ctx)
-		if err != nil {
-			return "", err
+		if m.client.BXCli.User == nil || m.client.BXCli.User.Account == "" {
+			return "", fmt.Errorf("failed to get find account ID: %+v", m.client.BXCli.User)
 		}
-
-		m.accountID = *apiKeyDetails.AccountID
+		m.accountID = m.client.BXCli.User.Account
 	}
 
 	return m.accountID, nil