This repository was archived by the owner on Aug 30, 2024. It is now read-only.
- Notifications
You must be signed in to change notification settings - Fork18
Add commands for workspace providers#238
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
1 change: 0 additions & 1 deletion.golangci.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -39,7 +39,6 @@ linters: | ||
| - structcheck | ||
| - stylecheck | ||
| - typecheck | ||
| - nolintlint | ||
| - rowserrcheck | ||
| - scopelint | ||
65 changes: 0 additions & 65 deletionscoder-sdk/resourcepools.go
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
80 changes: 80 additions & 0 deletionscoder-sdk/workspace_providers.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package coder | ||
| import ( | ||
| "context" | ||
| "net/http" | ||
| ) | ||
| // WorkspaceProvider defines an entity capable of deploying and acting as an ingress for Coder environments. | ||
| type WorkspaceProvider struct { | ||
| ID string `json:"id" table:"-"` | ||
| Name string `json:"name" table:"Name"` | ||
| Status WorkspaceProviderStatus `json:"status" table:"Status"` | ||
| Local bool `json:"local" table:"-"` | ||
| ClusterAddress string `json:"cluster_address" table:"Cluster Address"` | ||
| DefaultNamespace string `json:"default_namespace" table:"Namespace"` | ||
| StorageClass string `json:"storage_class" table:"Storage Class"` | ||
| ClusterDomainSuffix string `json:"cluster_domain_suffix" table:"Cluster Domain Suffix"` | ||
| EnvproxyAccessURL string `json:"envproxy_access_url" validate:"required" table:"Access URL"` | ||
| DevurlHost string `json:"devurl_host" table:"Devurl Host"` | ||
| SSHEnabled bool `json:"ssh_enabled" table:"SSH Enabled"` | ||
| NamespaceWhitelist []string `json:"namespace_whitelist" table:"Namespace Allowlist"` | ||
| OrgWhitelist []string `json:"org_whitelist" table:"-"` | ||
| } | ||
| // WorkspaceProviderStatus represents the configuration state of a workspace provider. | ||
| type WorkspaceProviderStatus string | ||
| // Workspace Provider statuses. | ||
| const ( | ||
| WorkspaceProviderPending WorkspaceProviderStatus = "pending" | ||
| WorkspaceProviderReady WorkspaceProviderStatus = "ready" | ||
| ) | ||
| // WorkspaceProviderByID fetches a workspace provider entity by its unique ID. | ||
| func (c *Client) WorkspaceProviderByID(ctx context.Context, id string) (*WorkspaceProvider, error) { | ||
| var wp WorkspaceProvider | ||
| err := c.requestBody(ctx, http.MethodGet, "/api/private/resource-pools/"+id, nil, &wp) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &wp, nil | ||
| } | ||
| // WorkspaceProviders fetches all workspace providers known to the Coder control plane. | ||
| func (c *Client) WorkspaceProviders(ctx context.Context) ([]WorkspaceProvider, error) { | ||
| var providers []WorkspaceProvider | ||
| err := c.requestBody(ctx, http.MethodGet, "/api/private/resource-pools", nil, &providers) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return providers, nil | ||
| } | ||
| // CreateWorkspaceProviderReq defines the request parameters for creating a new workspace provider entity. | ||
| type CreateWorkspaceProviderReq struct { | ||
| Name string `json:"name"` | ||
| } | ||
| // CreateWorkspaceProviderRes defines the response from creating a new workspace provider entity. | ||
| type CreateWorkspaceProviderRes struct { | ||
| ID string `json:"id" table:"ID"` | ||
| Name string `json:"name" table:"Name"` | ||
| Status WorkspaceProviderStatus `json:"status" table:"Status"` | ||
| EnvproxyToken string `json:"envproxy_token" table:"Envproxy Token"` | ||
| } | ||
| // CreateWorkspaceProvider creates a new WorkspaceProvider entity. | ||
| func (c *Client) CreateWorkspaceProvider(ctx context.Context, req CreateWorkspaceProviderReq) (*CreateWorkspaceProviderRes, error) { | ||
| var res CreateWorkspaceProviderRes | ||
| err := c.requestBody(ctx, http.MethodPost, "/api/private/resource-pools", req, &res) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &res, nil | ||
| } | ||
| // DeleteWorkspaceProviderByID deletes a workspace provider entity from the Coder control plane. | ||
| func (c *Client) DeleteWorkspaceProviderByID(ctx context.Context, id string) error { | ||
| return c.requestBody(ctx, http.MethodDelete, "/api/private/resource-pools/"+id, nil, nil) | ||
| } |
1 change: 1 addition & 0 deletionsinternal/cmd/cmd.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
24 changes: 12 additions & 12 deletionsinternal/cmd/configssh.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletionsinternal/cmd/providers.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package cmd | ||
| import ( | ||
| "fmt" | ||
| "github.com/spf13/cobra" | ||
| "golang.org/x/xerrors" | ||
| "cdr.dev/coder-cli/coder-sdk" | ||
| "cdr.dev/coder-cli/internal/x/xcobra" | ||
| "cdr.dev/coder-cli/pkg/clog" | ||
| "cdr.dev/coder-cli/pkg/tablewriter" | ||
| ) | ||
| func providersCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "providers", | ||
| Short: "Interact with Coder workspace providers", | ||
| Long: "Perform operations on the Coder Workspace Providers for the platform.", | ||
| Hidden: true, | ||
| } | ||
| cmd.AddCommand( | ||
| createProviderCmd(), | ||
| listProviderCmd(), | ||
| deleteProviderCmd(), | ||
| ) | ||
| return cmd | ||
| } | ||
| func createProviderCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "create [workspace_provider_name]", | ||
| Short: "create a new workspace provider.", | ||
| Args: xcobra.ExactArgs(1), | ||
| Long: "Create a new Coder workspace provider.", | ||
| Example: `# create a new workspace provider in a pending state | ||
| coder providers create my-new-workspace-provider`, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| ctx := cmd.Context() | ||
| client, err := newClient(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // ExactArgs(1) ensures our name value can't panic on an out of bounds. | ||
| createReq := &coder.CreateWorkspaceProviderReq{ | ||
| Name: args[0], | ||
| } | ||
| wp, err := client.CreateWorkspaceProvider(ctx, *createReq) | ||
| if err != nil { | ||
| return xerrors.Errorf("create workspace provider: %w", err) | ||
| } | ||
| err = tablewriter.WriteTable(1, func(i int) interface{} { | ||
| return *wp | ||
| }) | ||
| if err != nil { | ||
| return xerrors.Errorf("write table: %w", err) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| return cmd | ||
| } | ||
| func listProviderCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "ls", | ||
| Short: "list workspace providers.", | ||
| Long: "List all Coder workspace providers.", | ||
| Example: `# list workspace providers | ||
| coder providers ls`, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| ctx := cmd.Context() | ||
| client, err := newClient(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| wps, err := client.WorkspaceProviders(ctx) | ||
| if err != nil { | ||
| return xerrors.Errorf("list workspace providers: %w", err) | ||
| } | ||
| err = tablewriter.WriteTable(len(wps), func(i int) interface{} { | ||
| return wps[i] | ||
| }) | ||
| if err != nil { | ||
| return xerrors.Errorf("write table: %w", err) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| return cmd | ||
| } | ||
| func deleteProviderCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "rm [workspace_provider_name]", | ||
| Short: "remove a workspace provider.", | ||
| Long: "Remove an existing Coder workspace provider by name.", | ||
| Example: `# remove an existing workspace provider by name | ||
| coder providers rm my-workspace-provider`, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| ctx := cmd.Context() | ||
| client, err := newClient(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| wps, err := client.WorkspaceProviders(ctx) | ||
| if err != nil { | ||
| return xerrors.Errorf("listing workspace providers: %w", err) | ||
| } | ||
| egroup := clog.LoggedErrGroup() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. ❤️ | ||
| for _, wpName := range args { | ||
| name := wpName | ||
| egroup.Go(func() error { | ||
| var id string | ||
| for _, wp := range wps { | ||
| if wp.Name == name { | ||
| id = wp.ID | ||
| } | ||
| } | ||
| if id == "" { | ||
| return clog.Error( | ||
| fmt.Sprintf(`failed to remove workspace provider "%s"`, name), | ||
| clog.Causef(`no workspace provider found by name "%s"`, name), | ||
| ) | ||
| } | ||
| err = client.DeleteWorkspaceProviderByID(ctx, id) | ||
| if err != nil { | ||
| return clog.Error( | ||
| fmt.Sprintf(`failed to remove workspace provider "%s"`, name), | ||
| clog.Causef(err.Error()), | ||
| ) | ||
| } | ||
| clog.LogSuccess(fmt.Sprintf(`removed workspace provider with name "%s"`, name)) | ||
| return nil | ||
| }) | ||
| } | ||
| return egroup.Wait() | ||
| }, | ||
| } | ||
| return cmd | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.