From 1ffbf6bc90f5316dd67b013c72a4aff4820c21db Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 25 Mar 2021 10:45:50 -0500 Subject: [PATCH 1/3] Add name field to create-from-config --- internal/cmd/envs.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go index 88bd3a58..048a5b62 100644 --- a/internal/cmd/envs.go +++ b/internal/cmd/envs.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "io/ioutil" - "net/url" "cdr.dev/coder-cli/coder-sdk" "cdr.dev/coder-cli/internal/coderutil" @@ -300,6 +299,7 @@ func createEnvFromRepoCmd() *cobra.Command { filepath string org string providerName string + envName string ) cmd := &cobra.Command{ @@ -308,8 +308,8 @@ func createEnvFromRepoCmd() *cobra.Command { Long: "Create a new Coder environment from a config file.", Hidden: true, Example: `# create a new environment from git repository template -coder envs create-from-config --repo-url github.com/cdr/m --branch my-branch -coder envs create-from-config -f coder.yaml`, +coder envs create-from-config --name="dev-env" --repo-url github.com/cdr/m --branch my-branch +coder envs create-from-config --name="dev-env" -f coder.yaml`, RunE: func(cmd *cobra.Command, args []string) error { ctx := cmd.Context() @@ -318,13 +318,6 @@ coder envs create-from-config -f coder.yaml`, return err } - if repo != "" { - _, err = url.Parse(repo) - if err != nil { - return xerrors.Errorf("'repo' must be a valid url: %w", err) - } - } - orgs, err := getUserOrgs(ctx, client, coder.Me) if err != nil { return err @@ -388,6 +381,7 @@ coder envs create-from-config -f coder.yaml`, TemplateID: version.TemplateID, ResourcePoolID: provider.ID, Namespace: provider.DefaultNamespace, + Name: envName, }) if err != nil { return handleAPIError(err) @@ -414,6 +408,7 @@ coder envs create-from-config -f coder.yaml`, cmd.Flags().StringVarP(&repo, "repo-url", "r", "", "URL of the git repository to pull the config from. Config file must live in '.coder/coder.yaml'.") cmd.Flags().BoolVar(&follow, "follow", false, "follow buildlog after initiating rebuild") cmd.Flags().StringVar(&providerName, "provider", "", "name of Workspace Provider with which to create the environment") + cmd.Flags().StringVar(&envName, "name", "", "name of the environment to be created") return cmd } From dbc1e3b3a6291a0de5027444734a4e5f8ccc0670 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 25 Mar 2021 10:52:35 -0500 Subject: [PATCH 2/3] Add helpful error if no name provided --- internal/cmd/envs.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go index 048a5b62..e7c78d34 100644 --- a/internal/cmd/envs.go +++ b/internal/cmd/envs.go @@ -308,11 +308,18 @@ func createEnvFromRepoCmd() *cobra.Command { Long: "Create a new Coder environment from a config file.", Hidden: true, Example: `# create a new environment from git repository template -coder envs create-from-config --name="dev-env" --repo-url github.com/cdr/m --branch my-branch +coder envs create-from-config --name="dev-env" --repo-url github.com/cdr/m --ref my-branch coder envs create-from-config --name="dev-env" -f coder.yaml`, RunE: func(cmd *cobra.Command, args []string) error { ctx := cmd.Context() + if envName == "" { + return clog.Error("Must provide a environment name.", + clog.BlankLine, + clog.Tipf("Use --name= to name your enviornment"), + ) + } + client, err := newClient(ctx) if err != nil { return err From 47bb90aa31f5e6e8173bb9475d30544b0c6be162 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Thu, 25 Mar 2021 10:55:59 -0500 Subject: [PATCH 3/3] Mis-spelled --- internal/cmd/envs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go index e7c78d34..ab0b6e47 100644 --- a/internal/cmd/envs.go +++ b/internal/cmd/envs.go @@ -316,7 +316,7 @@ coder envs create-from-config --name="dev-env" -f coder.yaml`, if envName == "" { return clog.Error("Must provide a environment name.", clog.BlankLine, - clog.Tipf("Use --name= to name your enviornment"), + clog.Tipf("Use --name= to name your environment"), ) }