Oct 18, 2020 · Oct 17, 2020 · Oct 17, 2020 · Oct 17, 2020 · Oct 17, 2020 · Oct 17, 2020
diff --git a/ci/steps/gendocs.sh b/ci/steps/gendocs.sh
 cd "$(dirname "$0")"
 cd ../../

 rm -rf ./docs
 mkdir ./docs
 go run ./cmd/coder gen-docs ./docs

 # remove cobra footer from each file
 for filename in ./docs/*.md; do
  trimmed=$(head -n -1 "$filename")
  echo "$trimmed" >$filename
  echo "$trimmed" >$filename
 done


 if [[ ${CI-} && $(git ls-files --other --modified --exclude-standard) ]]; then
  echo "Documentation needs generation:"
  git -c color.ui=always status | grep --color=no '\e\[31m'
diff --git a/coder-sdk/env.go b/coder-sdk/env.go
 UserID           string           `json:"user_id"            tab:"-"`
 LastBuiltAt      time.Time        `json:"last_built_at"      tab:"-"`
 CPUCores         float32          `json:"cpu_cores"          tab:"CPUCores"`
 MemoryGBint          `json:"memory_gb"          tab:"MemoryGB"`
 MemoryGBfloat32          `json:"memory_gb"          tab:"MemoryGB"`
 DiskGB           int              `json:"disk_gb"            tab:"DiskGB"`
 GPUs             int              `json:"gpus"               tab:"GPUs"`
 Updating         bool             `json:"updating"           tab:"Updating"`
 return &env, nil
 }

 // Environments lists environments returned by the given filter.
 // TODO: add the filter options, explore performance issues
 func (c Client) Environments(ctx context.Context) ([]Environment, error) {
 var envs []Environment
 if err := c.requestBody(ctx, http.MethodGet, "/api/environments", nil, &envs); err != nil {
 return nil, err
 }
 return envs, nil
 }

 // EnvironmentsByOrganization gets the list of environments owned by the given user.
 func (c Client) EnvironmentsByOrganization(ctx context.Context, userID, orgID string) ([]Environment, error) {
 var envs []Environment
diff --git a/coder-sdk/org.go b/coder-sdk/org.go
 import (
 "context"
 "net/http"
 "time"
 )

 //Org describes an Organization in Coder
 typeOrg struct {
 ID      string `json:"id"`
 Name    string `json:"name"`
 Members []User `json:"members"`
 //Organization describes an Organization in Coder
 typeOrganization struct {
 ID      string`json:"id"`
 Name    string`json:"name"`
 Members []OrganizationUser `json:"members"`
 }

 // Orgs gets all Organizations
 func (c Client) Orgs(ctx context.Context) ([]Org, error) {
 var orgs []Org
 // OrganizationUser user wraps the basic User type and adds data specific to the user's membership of an organization
 type OrganizationUser struct {
 User
 OrganizationRoles []OrganizationRole `json:"organization_roles"`
 RolesUpdatedAt    time.Time          `json:"roles_updated_at"`
 }

 // OrganizationRole defines an organization OrganizationRole
 type OrganizationRole string

 // The OrganizationRole enum values
 const (
 RoleOrgMember  OrganizationRole = "organization-member"
 RoleOrgAdmin   OrganizationRole = "organization-admin"
 RoleOrgManager OrganizationRole = "organization-manager"
 )

 // 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 {
 return nil, err
 }
 return members, nil
 }
diff --git a/docs/coder.md b/docs/coder.md
 ### Options

 ```
  -h, --help   help for coder
  -h, --help      help for coder
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_completion.md b/docs/coder_completion.md
  -h, --help   help for completion
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_config-ssh.md b/docs/coder_config-ssh.md
      --remove            remove the auto-generated Coder Enterprise ssh config
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_envs.md b/docs/coder_envs.md
      --user string   Specify the user whose resources to target (default "me")
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_envs_ls.md b/docs/coder_envs_ls.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_envs_stop.md b/docs/coder_envs_stop.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_login.md b/docs/coder_login.md
  -h, --help   help for login
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_logout.md b/docs/coder_logout.md
  -h, --help   help for logout
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_secrets.md b/docs/coder_secrets.md
      --user string   Specify the user whose resources to target (default "me")
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_secrets_create.md b/docs/coder_secrets_create.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_secrets_ls.md b/docs/coder_secrets_ls.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_secrets_rm.md b/docs/coder_secrets_rm.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_secrets_view.md b/docs/coder_secrets_view.md

 ```
      --user string   Specify the user whose resources to target (default "me")
  -v, --verbose       show verbose output
 ```

 ### SEE ALSO
diff --git a/docs/coder_sh.md b/docs/coder_sh.md
  -h, --help   help for sh
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_sync.md b/docs/coder_sync.md
      --init   do initial transfer and exit
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_urls.md b/docs/coder_urls.md
  -h, --help   help for urls
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_urls_create.md b/docs/coder_urls_create.md
      --name string     DevURL name
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder urls](coder_urls.md) - Interact with environment DevURLs
diff --git a/docs/coder_urls_ls.md b/docs/coder_urls_ls.md
  -o, --output string   human|json (default "human")
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder urls](coder_urls.md) - Interact with environment DevURLs
diff --git a/docs/coder_urls_rm.md b/docs/coder_urls_rm.md
  -h, --help   help for rm
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder urls](coder_urls.md) - Interact with environment DevURLs
diff --git a/docs/coder_users.md b/docs/coder_users.md
  -h, --help   help for users
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
diff --git a/docs/coder_users_ls.md b/docs/coder_users_ls.md
  -o, --output string   human | json (default "human")
 ```

 ### Options inherited from parent commands

 ```
  -v, --verbose   show verbose output
 ```

 ### SEE ALSO

 * [coder users](coder_users.md) - Interact with Coder user accounts
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
 // 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 {
 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/cmd.go b/internal/cmd/cmd.go
 "github.com/spf13/cobra/doc"
 )

 // verbose is a global flag for specifying that a command should give verbose output
 var verbose bool = false

 // Make constructs the "coder" root command
 func Make() *cobra.Command {
 app := &cobra.Command{
 makeEnvsCommand(),
 makeSyncCmd(),
 makeURLCmd(),
 makeResourceCmd(),
 completionCmd,
 genDocs(app),
 )
 app.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "show verbose output")
 return app
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,15 +7,16 @@ echo "Generating docs..."
		cd "$(dirname "$0")"
		cd ../../

		rm -rf ./docs
		mkdir ./docs
		go run ./cmd/coder gen-docs ./docs

		# remove cobra footer from each file
		for filename in ./docs/*.md; do
		trimmed=$(head -n -1 "$filename")
		echo "$trimmed" >$filename
		echo "$trimmed" >$filename
		done


		if [[ ${CI-} && $(git ls-files --other --modified --exclude-standard) ]]; then
		echo "Documentation needs generation:"
		git -c color.ui=always status \| grep --color=no '\e\[31m'
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,7 @@ type Environment struct {
		UserID string `json:"user_id" tab:"-"`
		LastBuiltAt time.Time `json:"last_built_at" tab:"-"`
		CPUCores float32 `json:"cpu_cores" tab:"CPUCores"`
		MemoryGBint `json:"memory_gb" tab:"MemoryGB"`
		MemoryGBfloat32 `json:"memory_gb" tab:"MemoryGB"`
		DiskGB int `json:"disk_gb" tab:"DiskGB"`
		GPUs int `json:"gpus" tab:"GPUs"`
		Updating bool `json:"updating" tab:"Updating"`
Expand DownExpand Up		@@ -93,6 +93,16 @@ func (c Client) CreateEnvironment(ctx context.Context, orgID string, req CreateE
		return &env, nil
		}

		// Environments lists environments returned by the given filter.
		// TODO: add the filter options, explore performance issues
		func (c Client) Environments(ctx context.Context) ([]Environment, error) {
		var envs []Environment
		if err := c.requestBody(ctx, http.MethodGet, "/api/environments", nil, &envs); err != nil {
		return nil, err
		}
		return envs, nil
		}

		// EnvironmentsByOrganization gets the list of environments owned by the given user.
		func (c Client) EnvironmentsByOrganization(ctx context.Context, userID, orgID string) ([]Environment, error) {
		var envs []Environment
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,20 +3,47 @@ package coder
		import (
		"context"
		"net/http"
		"time"
		)

		//Org describes an Organization in Coder
		typeOrg struct {
		ID string `json:"id"`
		Name string `json:"name"`
		Members []User `json:"members"`
		//Organization describes an Organization in Coder
		typeOrganization struct {
		ID string`json:"id"`
		Name string`json:"name"`
		Members []OrganizationUser `json:"members"`
		}

		// Orgs gets all Organizations
		func (c Client) Orgs(ctx context.Context) ([]Org, error) {
		var orgs []Org
		// OrganizationUser user wraps the basic User type and adds data specific to the user's membership of an organization
		type OrganizationUser struct {
		User
		OrganizationRoles []OrganizationRole `json:"organization_roles"`
		RolesUpdatedAt time.Time `json:"roles_updated_at"`
		}

		// OrganizationRole defines an organization OrganizationRole
		type OrganizationRole string

		// The OrganizationRole enum values
		const (
		RoleOrgMember OrganizationRole = "organization-member"
		RoleOrgAdmin OrganizationRole = "organization-admin"
		RoleOrgManager OrganizationRole = "organization-manager"
		)

		// 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 {
		return nil, err
		}
		return members, nil
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,8 @@ coder provides a CLI for working with an existing Coder Enterprise installation
		### Options

		```
		-h, --help help for coder
		-h, --help help for coder
		-v, --verbose show verbose output
		```

		### SEE ALSO
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,6 +58,12 @@ MacOS:
		-h, --help help for completion
		```

		### Options inherited from parent commands

		```
		-v, --verbose show verbose output
		```

		### SEE ALSO

		* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,12 @@ coder config-ssh [flags]
		--remove remove the auto-generated Coder Enterprise ssh config
		```

		### Options inherited from parent commands

		```
		-v, --verbose show verbose output
		```

		### SEE ALSO

		* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,12 @@ Perform operations on the Coder environments owned by the active user.
		--user string Specify the user whose resources to target (default "me")
		```

		### Options inherited from parent commands

		```
		-v, --verbose show verbose output
		```

		### SEE ALSO

		* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,7 @@ coder envs ls [flags]

		```
		--user string Specify the user whose resources to target (default "me")
		-v, --verbose show verbose output
		```

		### SEE ALSO
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@ coder envs stop [environment_name] [flags]

		```
		--user string Specify the user whose resources to target (default "me")
		-v, --verbose show verbose output
		```

		### SEE ALSO
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,12 @@ coder login [Coder Enterprise URL eg. https://my.coder.domain/] [flags]
		-h, --help help for login
		```

		### Options inherited from parent commands

		```
		-v, --verbose show verbose output
		```

		### SEE ALSO

		* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation