fixup! Initial prototype of resources command

cmoog · cmoog · commit cbcbe0c1a38a · 2020-10-16T22:31:39.000-05:00
diff --git a/coder-sdk/org.go b/coder-sdk/org.go
@@ -6,36 +6,40 @@ import (
 	"time"
 )
 
-// Org describes an Organization in Coder
-type Org struct {
+// Organization describes an Organization in Coder
+type Organization struct {
 	ID      string             `json:"id"`
 	Name    string             `json:"name"`
 	Members []OrganizationUser `json:"members"`
 }
 
+// OrganizationUser user wraps the basic User type and adds data specific to the user's membership of an organization
 type OrganizationUser struct {
 	User
-	OrganizationRoles []Role    `json:"organization_roles"`
+	OrganizationRoles []OrganizationRole    `json:"organization_roles"`
 	RolesUpdatedAt    time.Time `json:"roles_updated_at"`
 }
 
-type Role string
+// OrganizationRole defines an organization OrganizationRole 
+type OrganizationRole string
 
+// The OrganizationRole enum values 
 const (
-	RoleOrgMember  Role = "organization-member"
-	RoleOrgAdmin   Role = "organization-admin"
-	RoleOrgManager Role = "organization-manager"
+	RoleOrgMember  OrganizationRole = "organization-member"
+	RoleOrgAdmin   OrganizationRole = "organization-admin"
+	RoleOrgManager OrganizationRole = "organization-manager"
 )
 
-// Orgs gets all Organizations
-func (c Client) Orgs(ctx context.Context) ([]Org, error) {
-	var orgs []Org
+// Organizations gets all Organizations
+func (c Client) Organizations(ctx context.Context) ([]Organization, error) {
+	var orgs []Organization
 	if err := c.requestBody(ctx, http.MethodGet, "/api/orgs", nil, &orgs); err != nil {
 		return nil, err
 	}
 	return orgs, nil
 }
 
+// OrgMembers get all members of the given organization
 func (c Client) OrgMembers(ctx context.Context, orgID string) ([]OrganizationUser, error) {
 	var members []OrganizationUser
 	if err := c.requestBody(ctx, http.MethodGet, "/api/orgs/"+orgID+"/members", nil, &members); err != nil {
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -12,9 +12,9 @@ import (
 // Helpers for working with the Coder Enterprise API.
 
 // lookupUserOrgs gets a list of orgs the user is apart of.
-func lookupUserOrgs(user *coder.User, orgs []coder.Org) []coder.Org {
+func lookupUserOrgs(user *coder.User, orgs []coder.Organization) []coder.Organization {
 	// NOTE: We don't know in advance how many orgs the user is in so we can't pre-alloc.
-	var userOrgs []coder.Org
+	var userOrgs []coder.Organization
 
 	for _, org := range orgs {
 		for _, member := range org.Members {
@@ -36,7 +36,7 @@ func getEnvs(ctx context.Context, client *coder.Client, email string) ([]coder.E
 		return nil, xerrors.Errorf("get user: %w", err)
 	}
 
-	orgs, err := client.Orgs(ctx)
+	orgs, err := client.Organizations(ctx)
 	if err != nil {
 		return nil, xerrors.Errorf("get orgs: %w", err)
 	}
diff --git a/internal/cmd/resourcemanager.go b/internal/cmd/resourcemanager.go
@@ -43,8 +43,8 @@ var resourceTop = &cobra.Command{
 			return err
 		}
 
-		orgs := make(map[string]coder.Org)
-		orglist, err := client.Orgs(ctx)
+		orgs := make(map[string]coder.Organization)
+		orglist, err := client.Organizations(ctx)
 		if err != nil {
 			return err
 		}
@@ -79,7 +79,7 @@ func resourcesFromEnv(env coder.Environment) resources {
 	}
 }
 
-func fmtEnvResources(env coder.Environment, orgs map[string]coder.Org) string {
+func fmtEnvResources(env coder.Environment, orgs map[string]coder.Organization) string {
 	return fmt.Sprintf("%s\t%s\t[org: %s]", env.Name, resourcesFromEnv(env), orgs[env.OrganizationID].Name)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ var resourceTop = &cobra.Command{`
`43`	`43`	`return err`
`44`	`44`	`}`
`45`	`45`
`46`		`- orgs := make(map[string]coder.Org)`
`47`		`- orglist, err := client.Orgs(ctx)`
	`46`	`+ orgs := make(map[string]coder.Organization)`
	`47`	`+ orglist, err := client.Organizations(ctx)`
`48`	`48`	`if err != nil {`
`49`	`49`	`return err`
`50`	`50`	`}`
`@@ -79,7 +79,7 @@ func resourcesFromEnv(env coder.Environment) resources {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`-func fmtEnvResources(env coder.Environment, orgs map[string]coder.Org) string {`
	`82`	`+func fmtEnvResources(env coder.Environment, orgs map[string]coder.Organization) string {`
`83`	`83`	`return fmt.Sprintf("%s\t%s\t[org: %s]", env.Name, resourcesFromEnv(env), orgs[env.OrganizationID].Name)`
`84`	`84`	`}`
`85`	`85`