bugfix: fix invite-billing-account-user and billing-account-invitations (#5)

Author: cloudmarius

.gitignore

@@ -1,2 +1,3 @@
 /appcloud-cf-cli-plugin
 /appcloud-cf-cli-plugin.exe
+bin

Makefile

@@ -0,0 +1,8 @@
+.PHONY: build
+
+build:
+	GOOS=linux   GOARCH=386   go build -o bin/appcloud-cf-cli-plugin_linux32
+	GOOS=linux   GOARCH=amd64 go build -o bin/appcloud-cf-cli-plugin_linux64
+	GOOS=darwin  GOARCH=amd64 go build -o bin/appcloud-cf-cli-plugin_osx
+	GOOS=windows GOARCH=386   go build -o bin/appcloud-cf-cli-plugin_win32.exe
+	GOOS=windows GOARCH=amd64 go build -o bin/appcloud-cf-cli-plugin_win64.exe

internal/appcloud/appcloud.go

@@ -102,7 +102,7 @@ func (p *Plugin) GetMetadata() plugin.PluginMetadata {
 			},
 			{
 				Name:     "invite-billing-account-user",
-				HelpText: "Invite a user to a billing account as an 'accountOwner'",
+				HelpText: `Invite a user to a billing account as an 'account owner'. The account can be specified by number (e.g.: F26AADDL00) or full name`,
 				UsageDetails: plugin.Usage{
 					Usage: "invite-org-user USERNAME BILLING_ACCOUNT",
 				},
@@ -157,7 +157,7 @@ func (p *Plugin) GetMetadata() plugin.PluginMetadata {
 				UsageDetails: plugin.Usage{
 					Usage: "create-ssl-certificate DOMAIN [--hostname HOSTNAME] [--key-type KEY_TYPE]",
 					Options: map[string]string{
-						"-hostname, -n": "Hostname for the HTTP route",
+						"-hostname, -n":  "Hostname for the HTTP route",
 						"-key-type, -kt": "Key type for the certificate (e.g. RSA, ECDSA)",
 					},
 				},

internal/appcloud/billing_account.go

@@ -18,26 +18,33 @@ type BillingAccount struct {
 }
 
 // BillingAccountResponse is a response from the server to a billing account request.
-type BillingAccountResponse struct {
-	BillingAccount
+type BillingAccountsResponse struct {
+	BillingAccounts []BillingAccount `json:"resources"`
 	ServerResponseError
 }
 
-// getBillingAccount retrieves a billing account by name.
+// getBillingAccount retrieves a billing account by name or number.
 func getBillingAccount(c plugin.CliConnection, name string) (BillingAccount, error) {
-	accURL := url.QueryEscape(fmt.Sprintf("/custom/accounts?q=name:%s", name))
+	expression := url.QueryEscape("name_number:" + name)
+	accURL := fmt.Sprintf("/custom/accounts?q=%s", expression)
 	resLines, err := c.CliCommandWithoutTerminalOutput("curl", accURL)
 
 	if err != nil {
 		return BillingAccount{}, errors.Wrap(err, "Billing Account not found")
 	}
 
 	resString := strings.Join(resLines, "")
-	var res BillingAccountResponse
+	var res BillingAccountsResponse
 	err = json.Unmarshal([]byte(resString), &res)
 	if err != nil {
 		return BillingAccount{}, errors.Wrap(err, "Couldn't read JSON response from server")
 	}
 
-	return res.BillingAccount, nil
+	if len(res.BillingAccounts) == 0 {
+		return BillingAccount{}, errors.New("Billing account not found")
+	} else if len(res.BillingAccounts) > 1 {
+		return BillingAccount{}, errors.New("Multiple billing accounts found - retry with the account's number or full name")
+	}
+
+	return res.BillingAccounts[0], nil
 }

internal/appcloud/billing_account_invitations.go

@@ -17,11 +17,11 @@ func (p *Plugin) BillingAccountInvitations(c plugin.CliConnection, billingAccoun
 		return errors.Wrap(err, "Couldn't get your username")
 	}
 
-	p.ui.Say("Gettings invitations to billing account %s as %s...", terminal.EntityNameColor(billingAccountName), terminal.EntityNameColor(un))
+	p.ui.Say("Getting invitations for billing account %s as %s...", terminal.EntityNameColor(billingAccountName), terminal.EntityNameColor(un))
 
 	ba, err := getBillingAccount(c, billingAccountName)
 	if err != nil {
-		return errors.Wrap(err, "Billing account not found")
+		return err
 	}
 
 	url := fmt.Sprintf("/custom/accounts/%s/invitations", ba.Metadata.GUID)

internal/appcloud/invite_billing_account_user.go

@@ -27,13 +27,13 @@ func (p *Plugin) InviteBillingAccountUser(c plugin.CliConnection, invitee string
 
 	ba, err := getBillingAccount(c, billingAccountName)
 	if err != nil {
-		return errors.Wrap(err, "Billing Account not found")
+		return err
 	}
 
 	args := InviteBillingAccountUserRequest{
 		Invitee:   invitee,
 		AccountID: ba.Metadata.GUID,
-		Roles:     []string{"accountOwner"},
+		Roles:     []string{"OWNER"},
 	}
 	argsData, err := json.Marshal(args)
 	if err != nil {