Fix invitation types

Author: Tobias Fuhrimann

invitation.go

@@ -45,15 +45,15 @@ func invitationEntityTypeAndName(inv Invitation) (string, string) {
 	var entityType string
 	var entityName string
 	if inv.Entity.AccountID != "" {
-		entityType = "Billing Account"
+		entityType = "account"
 		entityName = inv.Entity.AccountName
 	}
 	if inv.Entity.OrganizationID != "" {
-		entityType = "Org            "
+		entityType = "organization"
 		entityName = inv.Entity.OrganizationName
 	}
 	if inv.Entity.SpaceID != "" {
-		entityType = "Space          "
+		entityType = "space"
 		entityName = fmt.Sprintf("%s / %s", inv.Entity.OrganizationName, inv.Entity.SpaceName)
 	}
 

invitations.go

@@ -30,7 +30,21 @@ func (p *AppCloudPlugin) Invitations(c plugin.CliConnection) error {
 	fmt.Println(bold("GUID                                   entity type       entity"))
 	for _, inv := range invitations {
 		entityType, entityName := invitationEntityTypeAndName(inv)
-		fmt.Printf("%s   %s   %s\n", inv.Metadata.GUID, entityType, entityName)
+		fmt.Printf("%s   %s   %s\n", inv.Metadata.GUID, formatEntityType(entityType), entityName)
 	}
 	return nil
 }
+
+// formatEntityType formats an entity name more nicely.
+func formatEntityType(t string) string {
+	switch t {
+	case "account":
+		return "Billing Account"
+	case "organization":
+		return "Org            "
+	case "space":
+		return "Space          "
+	default:
+		return "unknown        "
+	}
+}

invite_org_user.go

@@ -23,7 +23,7 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o
 		username = "you"
 	}
 
-	fmt.Printf("Inviting %s to org %s as %s\n...", cyanBold(invitee), cyanBold(orgName), cyanBold(username))
+	fmt.Printf("Inviting %s to org %s as %s...\n", cyanBold(invitee), cyanBold(orgName), cyanBold(username))
 
 	o, err := c.GetOrg(orgName)
 	if err != nil {