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

Validate hostname, name, and cluster address on wsp create #277

Merged
merged 3 commits into from
Mar 10, 2021
Merged
Show file tree
Hide file tree
Changes from 2 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
13 changes: 12 additions & 1 deletion coder-sdk/workspace_providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ const (
WorkspaceProviderReady WorkspaceProviderStatus = "ready"
)

// WorkspaceProviderType represents the type of workspace provider.
type WorkspaceProviderType string

// Workspace Provider types.
const (
WorkspaceProviderKubernetes WorkspaceProviderType = "kubernetes"
)

// WorkspaceProviderByID fetches a workspace provider entity by its unique ID.
func (c *DefaultClient) WorkspaceProviderByID(ctx context.Context, id string) (*KubernetesProvider, error) {
var wp KubernetesProvider
Expand All @@ -63,7 +71,10 @@ func (c *DefaultClient) WorkspaceProviders(ctx context.Context) (*WorkspaceProvi

// CreateWorkspaceProviderReq defines the request parameters for creating a new workspace provider entity.
type CreateWorkspaceProviderReq struct {
Name string `json:"name"`
Name string `json:"name"`
Type WorkspaceProviderType `json:"type"`
Hostname string `json:"hostname"`
ClusterAddress string `json:"cluster_address"`
}

// CreateWorkspaceProviderRes defines the response from creating a new workspace provider entity.
Expand Down
25 changes: 19 additions & 6 deletions internal/cmd/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"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"
)
Expand All @@ -29,13 +28,18 @@ func providersCmd() *cobra.Command {
}

func createProviderCmd() *cobra.Command {
var (
name string
hostname string
clusterAddress string
)
cmd := &cobra.Command{
Use: "create [workspace_provider_name]",
Use: "create --name=[name] --hostname=[hostname] --clusterAddress=[clusterAddress]",
Copy link
Contributor

Choose a reason for hiding this comment

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

for consistency we may want to do name as a required positional argument, similar to coder envs create

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`,

coder providers create --name=my-provider --hostname=provider.example.com --clusterAddress=255.255.255.255`,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()

Expand All @@ -44,9 +48,11 @@ coder providers create my-new-workspace-provider`,
return err
}

// ExactArgs(1) ensures our name value can't panic on an out of bounds.
createReq := &coder.CreateWorkspaceProviderReq{
Name: args[0],
Name: name,
Type: coder.WorkspaceProviderKubernetes,
Hostname: hostname,
ClusterAddress: clusterAddress,
}

wp, err := client.CreateWorkspaceProvider(ctx, *createReq)
Expand All @@ -63,6 +69,13 @@ coder providers create my-new-workspace-provider`,
return nil
},
}

cmd.Flags().StringVar(&name, "name", "", "workspace provider name")
cmd.Flags().StringVar(&hostname, "hostname", "", "workspace provider hostname")
cmd.Flags().StringVar(&clusterAddress, "clusterAddress", "", "kubernetes cluster apiserver endpoint")
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we've been doing cluster-address

_ = cmd.MarkFlagRequired("name")
_ = cmd.MarkFlagRequired("hostname")
_ = cmd.MarkFlagRequired("clusterAdress")
return cmd
}

Expand Down