Fix linting issues

Author: Tobias Fuhrimann

backup.go

@@ -4,9 +4,8 @@ package main
 type Backup struct {
 	Metadata CFMetadata `json:"metadata"`
 	Entity   struct {
-		ServiceInstanceID string    `json:"service_instance_id"`
-		Status            string    `json:"status"`
-		Restores          []Restore `json:"restores"`
+		Status   string    `json:"status"`
+		Restores []Restore `json:"restores"`
 	} `json:"entity"`
 }
 

backups.go

@@ -62,7 +62,10 @@ func (p *AppCloudPlugin) Backups(c plugin.CliConnection, serviceInstanceName str
 
 			table.Add(b.Metadata.CreatedAt.Format(time.RFC3339), b.Metadata.GUID, formatStatus(overallStatus))
 		}
-		table.Print()
+		err := table.Print()
+		if err != nil {
+			return errors.Wrap(err, "Couldn't print table")
+		}
 	} else {
 		p.ui.Say("No backups found")
 	}

billing_account.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"net/url"
 	"strings"
@@ -14,24 +15,8 @@ import (
 // BillingAccount is an entity of the Swisscom Application Cloud which handles billing.
 type BillingAccount struct {
 	Metadata struct {
-		GUID      string `json:"guid"`
-		URL       string `json:"url"`
-		CreatedAt string `json:"created_at"`
-		UpdatedAt string `json:"updated_at"`
+		GUID string `json:"guid"`
 	} `json:"metadata"`
-	Entity struct {
-		Status           string `json:"status"`
-		StatusReasonData struct {
-			Code        string `json:"code"`
-			Description string `json:"description"`
-		} `json:"status_reason_data"`
-		Prohibited        bool   `json:"prohibited"`
-		Name              string `json:"name"`
-		CustomerNumber    string `json:"customer_number"`
-		CustomerType      string `json:"customer_type"`
-		OrganizationCount int    `json:"organization_count"`
-		MaxOrganizations  int    `json:"max_organizations"`
-	} `json:"entity"`
 }
 
 // BillingAccountResponse is a response from the server to a billing account request.
@@ -42,7 +27,7 @@ type BillingAccountResponse struct {
 
 // getBillingAccount retrieves a billing account by name.
 func getBillingAccount(c plugin.CliConnection, name string) (BillingAccount, error) {
-	accURL := url.QueryEscape("/custom/accounts?q=name:%s")
+	accURL := url.QueryEscape(fmt.Sprintf("/custom/accounts?q=name:%s", name))
 	resLines, err := c.CliCommandWithoutTerminalOutput("curl", accURL)
 
 	if err != nil {

billing_account_invitations.go

@@ -51,7 +51,10 @@ func (p *AppCloudPlugin) BillingAccountInvitations(c plugin.CliConnection, billi
 		for _, inv := range res.Resources {
 			table.Add(inv.Entity.Invitee, strings.Join(inv.Entity.Roles, ","), inv.Entity.Status)
 		}
-		table.Print()
+		err := table.Print()
+		if err != nil {
+			return errors.Wrap(err, "Couldn't print table")
+		}
 	} else {
 		p.ui.Say("No invitations found")
 	}

event.go

@@ -12,14 +12,6 @@ type Event struct {
 	Metadata CFMetadata `json:"metadata"`
 	Entity   struct {
 		Type      string `json:"type"`
-		Actor     string `json:"actor"`
-		ActorType string `json:"actor_type"`
 		ActorName string `json:"actor_name"`
-		Actee     string `json:"actee"`
-		ActeeType string `json:"actee_type"`
-		ActeeName string `json:"actee_name"`
-		TimeStamp string `json:"timestamp"`
-		SpaceGUID string `json:"space_guid"`
-		OrgGUID   string `json:"organization_guid"`
 	} `json:"entity"`
 }

invitation.go

@@ -9,14 +9,18 @@ import (
 	"github.com/pkg/errors"
 )
 
+// These are the different statuses an invitation can have.
+const (
+	StatusSent      = "SENT"
+	StatusConfirmed = "CONFIRMED"
+)
+
 // Invitation is an invitation a user received to join a specific entity.
 type Invitation struct {
 	Metadata CFMetadata `json:"metadata"`
 	Entity   struct {
 		Invitee          string   `json:"invitee"`
 		Roles            []string `json:"roles"`
-		ActorUsername    string   `json:"actor_username"`
-		ActorUserID      string   `json:"actor_user_id"`
 		AccountID        string   `json:"account_id"`
 		AccountName      string   `json:"account_name"`
 		OrganizationID   string   `json:"organization_id"`
@@ -87,9 +91,7 @@ func getAllInvitations(c plugin.CliConnection) ([]Invitation, error) {
 			return []Invitation{}, fmt.Errorf("Error response from server: %s", res.Description)
 		}
 
-		for _, i := range res.Resources {
-			invitations = append(invitations, i)
-		}
+		invitations = append(invitations, res.Resources...)
 	}
 
 	return invitations, nil

invitations.go

@@ -28,7 +28,10 @@ func (p *AppCloudPlugin) Invitations(c plugin.CliConnection) error {
 			entityType, entityName := invitationEntityTypeAndName(inv)
 			table.Add(inv.Metadata.GUID, formatEntityType(entityType), entityName)
 		}
-		table.Print()
+		err := table.Print()
+		if err != nil {
+			return errors.Wrap(err, "Couldn't print table")
+		}
 	} else {
 		p.ui.Say("No invitations found")
 	}

invite_billing_account_user.go

@@ -55,7 +55,7 @@ func (p *AppCloudPlugin) InviteBillingAccountUser(c plugin.CliConnection, invite
 		return errors.Wrap(err, "Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
+	if res.Entity.Status != StatusSent && res.Entity.Status != StatusConfirmed {
 		return errors.Wrap(err, "Couldn't send invitation")
 	}
 

invite_org_user.go

@@ -59,7 +59,7 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o
 		return errors.Wrap(err, "Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
+	if res.Entity.Status != StatusSent && res.Entity.Status != StatusConfirmed {
 		return errors.Wrap(err, "Couldn't send invitation")
 	}
 

invite_space_user.go

@@ -59,7 +59,7 @@ func (p *AppCloudPlugin) InviteSpaceUser(c plugin.CliConnection, invitee string,
 		return errors.Wrap(err, "Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
+	if res.Entity.Status != StatusSent && res.Entity.Status != StatusConfirmed {
 		return errors.Wrap(err, "Couldn't send invitation")
 	}