Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

chore: rename instances of Coder Enterprise to Coder #304

Merged
merged 1 commit into from
Mar 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![build](https://github.com/cdr/coder-cli/workflows/build/badge.svg)
[![Go Report Card](https://goreportcard.com/badge/cdr.dev/coder-cli)](https://goreportcard.com/report/cdr.dev/coder-cli)

`coder` is a command line utility for Coder Enterprise.
`coder` is a command line utility for Coder.

To report bugs and request features, please [open an issue](https://github.com/cdr/coder-cli/issues/new).

Expand Down
2 changes: 1 addition & 1 deletion coder-sdk/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coder-sdk

`coder-sdk` is a Go client library for [Coder Enterprise](https://coder.com).
`coder-sdk` is a Go client library for [Coder](https://coder.com).
It is not yet stable and therefore we do not recommend depending on the current state of its public APIs.

## Usage
Expand Down
14 changes: 7 additions & 7 deletions coder-sdk/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ const (
AuthProviderOIDC AuthProviderType = "oidc"
)

// ConfigAuth describes the authentication configuration for a Coder Enterprise deployment.
// ConfigAuth describes the authentication configuration for a Coder deployment.
type ConfigAuth struct {
ProviderType *AuthProviderType `json:"provider_type"`
OIDC *ConfigOIDC `json:"oidc"`
SAML *ConfigSAML `json:"saml"`
}

// ConfigOIDC describes the OIDC configuration for single-signon support in Coder Enterprise.
// ConfigOIDC describes the OIDC configuration for single-signon support in Coder.
type ConfigOIDC struct {
ClientID *string `json:"client_id"`
ClientSecret *string `json:"client_secret"`
Expand All @@ -38,26 +38,26 @@ type ConfigSAML struct {
PublicKeyCertificate *string `json:"public_key_certificate"`
}

// ConfigOAuthBitbucketServer describes the Bitbucket integration configuration for a Coder Enterprise deployment.
// ConfigOAuthBitbucketServer describes the Bitbucket integration configuration for a Coder deployment.
type ConfigOAuthBitbucketServer struct {
BaseURL string `json:"base_url" diff:"oauth.bitbucket_server.base_url"`
}

// ConfigOAuthGitHub describes the Github integration configuration for a Coder Enterprise deployment.
// ConfigOAuthGitHub describes the Github integration configuration for a Coder deployment.
type ConfigOAuthGitHub struct {
BaseURL string `json:"base_url"`
ClientID string `json:"client_id"`
ClientSecret string `json:"client_secret"`
}

// ConfigOAuthGitLab describes the GitLab integration configuration for a Coder Enterprise deployment.
// ConfigOAuthGitLab describes the GitLab integration configuration for a Coder deployment.
type ConfigOAuthGitLab struct {
BaseURL string `json:"base_url"`
ClientID string `json:"client_id" `
ClientSecret string `json:"client_secret"`
}

// ConfigOAuth describes the aggregate git integration configuration for a Coder Enterprise deployment.
// ConfigOAuth describes the aggregate git integration configuration for a Coder deployment.
type ConfigOAuth struct {
BitbucketServer ConfigOAuthBitbucketServer `json:"bitbucket_server"`
GitHub ConfigOAuthGitHub `json:"github"`
Expand Down Expand Up @@ -96,7 +96,7 @@ type configSetupMode struct {
SetupMode bool `json:"setup_mode"`
}

// SiteSetupModeEnabled fetches the current setup_mode state of a Coder Enterprise deployment.
// SiteSetupModeEnabled fetches the current setup_mode state of a Coder deployment.
func (c *DefaultClient) SiteSetupModeEnabled(ctx context.Context) (bool, error) {
var conf configSetupMode
if err := c.requestBody(ctx, http.MethodGet, "/api/private/config/setup-mode", nil, &conf); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion coder-sdk/doc.go
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Package coder provides simple APIs for integrating Go applications with Coder Enterprise.
// Package coder provides simple APIs for integrating Go applications with Coder.
package coder
6 changes: 3 additions & 3 deletions coder-sdk/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type Client interface {
// PutSiteConfigOAuth sets the sitewide git provider OAuth configuration.
PutSiteConfigOAuth(ctx context.Context, req ConfigOAuth) error

// SiteSetupModeEnabled fetches the current setup_mode state of a Coder Enterprise deployment.
// SiteSetupModeEnabled fetches the current setup_mode state of a Coder deployment.
SiteSetupModeEnabled(ctx context.Context) (bool, error)

// SiteConfigExtensionMarketplace fetches the extension marketplace configuration.
Expand Down Expand Up @@ -160,7 +160,7 @@ type Client interface {
// UpdateOrganization applys a partial update of an Organization resource.
UpdateOrganization(ctx context.Context, orgID string, req UpdateOrganizationReq) error

// CreateOrganization creates a new Organization in Coder Enterprise.
// CreateOrganization creates a new Organization in Coder.
CreateOrganization(ctx context.Context, req CreateOrganizationReq) error

// DeleteOrganization deletes an organization.
Expand Down Expand Up @@ -190,7 +190,7 @@ type Client interface {
// ImageTagByID fetch an image tag by ID.
ImageTagByID(ctx context.Context, imageID, tagID string) (*ImageTag, error)

// CreateAPIToken creates a new APIToken for making authenticated requests to Coder Enterprise.
// CreateAPIToken creates a new APIToken for making authenticated requests to Coder.
CreateAPIToken(ctx context.Context, userID string, req CreateAPITokenReq) (string, error)

// APITokens fetches all APITokens owned by the given user.
Expand Down
2 changes: 1 addition & 1 deletion coder-sdk/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type CreateOrganizationReq struct {
MemoryProvisioningRate float32 `json:"memory_provisioning_rate"`
}

// CreateOrganization creates a new Organization in Coder Enterprise.
// CreateOrganization creates a new Organization in Coder.
func (c *DefaultClient) CreateOrganization(ctx context.Context, req CreateOrganizationReq) error {
return c.requestBody(ctx, http.MethodPost, "/api/v0/orgs", req, nil)
}
Expand Down
4 changes: 2 additions & 2 deletions coder-sdk/tokens.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"
)

// APIToken describes a Coder Enterprise APIToken resource for use in API requests.
// APIToken describes a Coder APIToken resource for use in API requests.
type APIToken struct {
ID string `json:"id"`
Name string `json:"name"`
Expand All @@ -24,7 +24,7 @@ type createAPITokenResp struct {
Key string `json:"key"`
}

// CreateAPIToken creates a new APIToken for making authenticated requests to Coder Enterprise.
// CreateAPIToken creates a new APIToken for making authenticated requests to Coder.
func (c *DefaultClient) CreateAPIToken(ctx context.Context, userID string, req CreateAPITokenReq) (token string, _ error) {
var resp createAPITokenResp
err := c.requestBody(ctx, http.MethodPost, "/api/v0/api-keys/"+userID, req, &resp)
Expand Down
2 changes: 1 addition & 1 deletion coder-sdk/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type User struct {
UpdatedAt time.Time `json:"updated_at" table:"-"`
}

// Role defines a Coder Enterprise permissions role group.
// Role defines a Coder permissions role group.
type Role string

// Site Roles.
Expand Down
2 changes: 1 addition & 1 deletion docs/coder.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## coder

coder provides a CLI for working with an existing Coder Enterprise installation
coder provides a CLI for working with an existing Coder installation

### Options

Expand Down
2 changes: 1 addition & 1 deletion docs/coder_completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ MacOS:

### SEE ALSO

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

6 changes: 3 additions & 3 deletions docs/coder_config-ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ coder config-ssh [flags]
### Options

```
--filepath string overide the default path of your ssh config file (default "~/.ssh/config")
--filepath string override the default path of your ssh config file (default "~/.ssh/config")
-h, --help help for config-ssh
--remove remove the auto-generated Coder Enterprise ssh config
--remove remove the auto-generated Coder ssh config
```

### Options inherited from parent commands
Expand All @@ -26,5 +26,5 @@ coder config-ssh [flags]

### SEE ALSO

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

2 changes: 1 addition & 1 deletion docs/coder_envs.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Perform operations on the Coder environments owned by the active user.

### SEE ALSO

* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
* [coder](coder.md) - coder provides a CLI for working with an existing Coder installation
* [coder envs create](coder_envs_create.md) - create a new environment.
* [coder envs edit](coder_envs_edit.md) - edit an existing environment and initiate a rebuild.
* [coder envs ls](coder_envs_ls.md) - list all environments owned by the active user
Expand Down
2 changes: 1 addition & 1 deletion docs/coder_images.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Manage existing images and/or import new ones.

### SEE ALSO

* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
* [coder](coder.md) - coder provides a CLI for working with an existing Coder installation
* [coder images ls](coder_images_ls.md) - list all images available to the active user

4 changes: 2 additions & 2 deletions docs/coder_login.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Authenticate this client for future operations

```
coder login [Coder Enterprise URL eg. https://my.coder.domain/] [flags]
coder login [Coder URL eg. https://my.coder.domain/] [flags]
```

### Options
Expand All @@ -20,5 +20,5 @@ coder login [Coder Enterprise URL eg. https://my.coder.domain/] [flags]

### SEE ALSO

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

2 changes: 1 addition & 1 deletion docs/coder_logout.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ coder logout [flags]

### SEE ALSO

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

2 changes: 1 addition & 1 deletion docs/coder_ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ coder ssh my-dev pwd

### SEE ALSO

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

2 changes: 1 addition & 1 deletion docs/coder_sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ coder sync [local directory] [<env name>:<remote directory>] [flags]

### SEE ALSO

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

2 changes: 1 addition & 1 deletion docs/coder_tokens.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Statically authenticate using the token value with the `CODER_TOKEN` and `CODER_

### SEE ALSO

* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
* [coder](coder.md) - coder provides a CLI for working with an existing Coder installation
* [coder tokens create](coder_tokens_create.md) - create generates a new API token and prints it to stdout
* [coder tokens ls](coder_tokens_ls.md) - show the user's active API tokens
* [coder tokens regen](coder_tokens_regen.md) - regenerate an API token by its unique ID and print the new token to stdout
Expand Down
2 changes: 1 addition & 1 deletion docs/coder_urls.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Interact with environment DevURLs

### SEE ALSO

* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
* [coder](coder.md) - coder provides a CLI for working with an existing Coder installation
* [coder urls create](coder_urls_create.md) - Create a new devurl for an environment
* [coder urls ls](coder_urls_ls.md) - List all DevURLs for an environment
* [coder urls rm](coder_urls_rm.md) - Remove a dev url
Expand Down
2 changes: 1 addition & 1 deletion docs/coder_users.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ Interact with Coder user accounts

### SEE ALSO

* [coder](coder.md) - coder provides a CLI for working with an existing Coder Enterprise installation
* [coder](coder.md) - coder provides a CLI for working with an existing Coder installation
* [coder users ls](coder_users_ls.md) - list all user accounts

2 changes: 1 addition & 1 deletion internal/cmd/ceapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"cdr.dev/coder-cli/pkg/clog"
)

// Helpers for working with the Coder Enterprise API.
// Helpers for working with the Coder API.

// lookupUserOrgs gets a list of orgs the user is apart of.
func lookupUserOrgs(user *coder.User, orgs []coder.Organization) []coder.Organization {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var verbose bool = false
func Make() *cobra.Command {
app := &cobra.Command{
Use: "coder",
Short: "coder provides a CLI for working with an existing Coder Enterprise installation",
Short: "coder provides a CLI for working with an existing Coder installation",
SilenceErrors: true,
SilenceUsage: true,
DisableAutoGenTag: true,
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/configssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

const sshStartToken = "# ------------START-CODER-ENTERPRISE-----------"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can change these, but some of the code looks for this token, so we'll have to handle both cases (old heading and new heading) and I'm not sure if it's worth it

const sshStartMessage = `# The following has been auto-generated by "coder config-ssh"
# to make accessing your Coder Enterprise environments easier.
# to make accessing your Coder environments easier.
#
# To remove this blob, run:
#
Expand All @@ -43,8 +43,8 @@ func configSSHCmd() *cobra.Command {
Long: "Inject the proper OpenSSH configuration into your local SSH config file.",
RunE: configSSH(&configpath, &remove),
}
cmd.Flags().StringVar(&configpath, "filepath", filepath.Join("~", ".ssh", "config"), "overide the default path of your ssh config file")
cmd.Flags().BoolVar(&remove, "remove", false, "remove the auto-generated Coder Enterprise ssh config")
cmd.Flags().StringVar(&configpath, "filepath", filepath.Join("~", ".ssh", "config"), "override the default path of your ssh config file")
cmd.Flags().BoolVar(&remove, "remove", false, "remove the auto-generated Coder ssh config")

return cmd
}
Expand Down Expand Up @@ -74,7 +74,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
currentConfig, didRemoveConfig := removeOldConfig(currentConfig)
if *remove {
if !didRemoveConfig {
return xerrors.Errorf("the Coder Enterprise ssh configuration section could not be safely deleted or does not exist")
return xerrors.Errorf("the Coder ssh configuration section could not be safely deleted or does not exist")
}

err = writeStr(*configpath, currentConfig)
Expand Down Expand Up @@ -110,7 +110,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
}

if !sshAvailable(envsWithProviders) {
return xerrors.New("SSH is disabled or not available for any environments in your Coder Enterprise deployment.")
return xerrors.New("SSH is disabled or not available for any environments in your Coder deployment.")
}

newConfig := makeNewConfigs(user.Username, envsWithProviders, privateKeyFilepath)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

func loginCmd() *cobra.Command {
return &cobra.Command{
Use: "login [Coder Enterprise URL eg. https://my.coder.domain/]",
Use: "login [Coder URL eg. https://my.coder.domain/]",
Short: "Authenticate this client for future operations",
Args: xcobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/sync/sync.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Package sync contains logic for establishing a file sync between a local machine and a Coder Enterprise environment.
// Package sync contains logic for establishing a file sync between a local machine and a Coder environment.
package sync

import (
Expand Down