Fix runtime bugs

Author: Tobias Fuhrimann

main.go

@@ -121,7 +121,7 @@ func (p *AppCloudPlugin) GetMetadata() plugin.PluginMetadata {
 				Name:     "resend-billing-account-invitation",
 				HelpText: "Resend an existing billing account invitation",
 				UsageDetails: plugin.Usage{
-					Usage: "resend-org-invitation USERNAME BILLING_ACCOUNT",
+					Usage: "resend-billing-account-invitation USERNAME BILLING_ACCOUNT",
 				},
 			},
 			{
@@ -135,7 +135,7 @@ func (p *AppCloudPlugin) GetMetadata() plugin.PluginMetadata {
 				Name:     "resend-space-invitation",
 				HelpText: "Resend an existing space invitation",
 				UsageDetails: plugin.Usage{
-					Usage: "resend-org-invitation USERNAME SPACE",
+					Usage: "resend-space-invitation USERNAME SPACE",
 				},
 			},
 
@@ -342,25 +342,27 @@ func (p *AppCloudPlugin) Run(cliConnection plugin.CliConnection, args []string)
 	case "ssl-certificates":
 		err = p.SSLCertificates(cliConnection)
 	case "create-ssl-certificate":
-		if len(args) < 2 {
+		if len(args) < 2 || len(args) > 4 {
 			fmt.Println("Incorrect Usage: the required argument DOMAIN was not provided")
 			return
 		}
 
-		fc, err := parseSSLCertificateArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseSSLCertificateArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: Organization option must be a string")
 			return
 		}
 
-		err = p.CreateSSLCertificate(cliConnection, args[2], fc.String("n"))
+		err = p.CreateSSLCertificate(cliConnection, args[1], fc.String("n"))
 	case "revoke-ssl-certificate":
 		if len(args) < 2 {
 			fmt.Println("Incorrect Usage: the required argument DOMAIN was not provided")
 			return
 		}
 
-		fc, err := parseSSLCertificateArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseSSLCertificateArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: HOSTNAME must be a string")
 			return
@@ -373,7 +375,8 @@ func (p *AppCloudPlugin) Run(cliConnection plugin.CliConnection, args []string)
 			return
 		}
 
-		fc, err := parseSSLCertificateArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseSSLCertificateArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: HOSTNAME must be a string")
 			return
@@ -386,7 +389,8 @@ func (p *AppCloudPlugin) Run(cliConnection plugin.CliConnection, args []string)
 			return
 		}
 
-		fc, err := parseSSLCertificateArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseSSLCertificateArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: HOSTNAME must be a string")
 			return
@@ -399,7 +403,8 @@ func (p *AppCloudPlugin) Run(cliConnection plugin.CliConnection, args []string)
 			return
 		}
 
-		fc, err := parseSSLCertificateArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseSSLCertificateArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: HOSTNAME must be a string")
 			return
@@ -409,7 +414,8 @@ func (p *AppCloudPlugin) Run(cliConnection plugin.CliConnection, args []string)
 
 	// Tree
 	case "tree":
-		fc, err := parseTreeArgs(args)
+		var fc flags.FlagContext
+		fc, err = parseTreeArgs(args)
 		if err != nil {
 			fmt.Println("Incorrect Usage: DEPTH must be an integer")
 			return

resend_billing_account_invitation.go

@@ -10,7 +10,7 @@ import (
 )
 
 // ResendBillingAccountInvitation resends an existing billing account invitation.
-func (p *AppCloudPlugin) ResendBillingAccountInvitation(c plugin.CliConnection, billingAccountName string, invitee string) error {
+func (p *AppCloudPlugin) ResendBillingAccountInvitation(c plugin.CliConnection, invitee string, billingAccountName string) error {
 	username, err := c.Username()
 	if err != nil {
 		username = "you"
@@ -51,6 +51,10 @@ func (p *AppCloudPlugin) ResendBillingAccountInvitation(c plugin.CliConnection,
 			if err != nil {
 				return errors.New("Couldn't read JSON response from server")
 			}
+
+			if invRes.ErrorCode != "" {
+				return errors.New(invRes.Description)
+			}
 		}
 	}
 

resend_org_invitation.go

@@ -10,7 +10,7 @@ import (
 )
 
 // ResendOrgInvitation resends an existing org invitation.
-func (p *AppCloudPlugin) ResendOrgInvitation(c plugin.CliConnection, orgName string, invitee string) error {
+func (p *AppCloudPlugin) ResendOrgInvitation(c plugin.CliConnection, invitee string, orgName string) error {
 	username, err := c.Username()
 	if err != nil {
 		username = "you"
@@ -51,6 +51,10 @@ func (p *AppCloudPlugin) ResendOrgInvitation(c plugin.CliConnection, orgName str
 			if err != nil {
 				return errors.New("Couldn't read JSON response from server")
 			}
+
+			if invRes.ErrorCode != "" {
+				return errors.New(invRes.Description)
+			}
 		}
 	}
 

resend_space_invitation.go

@@ -10,7 +10,7 @@ import (
 )
 
 // ResendSpaceInvitation resends an existing space invitation.
-func (p *AppCloudPlugin) ResendSpaceInvitation(c plugin.CliConnection, spaceName string, invitee string) error {
+func (p *AppCloudPlugin) ResendSpaceInvitation(c plugin.CliConnection, invitee string, spaceName string) error {
 	username, err := c.Username()
 	if err != nil {
 		username = "you"
@@ -51,6 +51,10 @@ func (p *AppCloudPlugin) ResendSpaceInvitation(c plugin.CliConnection, spaceName
 			if err != nil {
 				return errors.New("Couldn't read JSON response from server")
 			}
+
+			if invRes.ErrorCode != "" {
+				return errors.New(invRes.Description)
+			}
 		}
 	}