Unhide coder envs rm command

cmoog · cmoog · commit a7d03208f8b8 · 2020-10-29T11:58:55.000-05:00
diff --git a/internal/clog/error.go b/internal/clog/error.go
@@ -78,19 +78,6 @@ func LogWarn(header string, lines ...string) {
 	}.String())
 }
 
-// Warn creates an error with the level "warning".
-func Warn(header string, lines ...string) CLIError {
-	return CLIError{
-		CLIMessage: CLIMessage{
-			Color:  color.FgYellow,
-			Level:  "warning",
-			Header: header,
-			Lines:  lines,
-		},
-		error: errors.New(header),
-	}
-}
-
 // Error creates an error with the level "error".
 func Error(header string, lines ...string) CLIError {
 	return CLIError{
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -33,7 +33,7 @@ func newClient() (*coder.Client, error) {
 
 	u, err := url.Parse(rawURL)
 	if err != nil {
-		return nil, xerrors.Errorf("url misformatted: %w try runing \"coder login\" with a valid URL", err)
+		return nil, xerrors.Errorf("url malformed: %w try runing \"coder login\" with a valid URL", err)
 	}
 
 	c := &coder.Client{
@@ -54,12 +54,12 @@ func newClient() (*coder.Client, error) {
 	}
 
 	if !version.VersionsMatch(apiVersion) {
-		clog.Log(clog.Warn(
+		clog.LogWarn(
 			"version mismatch detected",
 			fmt.Sprintf("coder-cli version: %s", version.Version),
 			fmt.Sprintf("Coder API version: %s", apiVersion), clog.BlankLine,
 			clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),
-		))
+		)
 	}
 
 	return c, nil
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -326,8 +326,8 @@ coder envs edit back-end-env --disk 20`,
 		},
 	}
 	cmd.Flags().StringVarP(&org, "org", "o", "", "name of the organization the environment should be created under.")
-	cmd.Flags().StringVarP(&img, "image", "i", "", "name of the image you wan't the environment to be based off of.")
-	cmd.Flags().StringVarP(&tag, "tag", "t", "latest", "image tag of the image you wan't to base the environment off of.")
+	cmd.Flags().StringVarP(&img, "image", "i", "", "name of the image you want the environment to be based off of.")
+	cmd.Flags().StringVarP(&tag, "tag", "t", "latest", "image tag of the image you want to base the environment off of.")
 	cmd.Flags().Float32P("cpu", "c", cpuCores, "The number of cpu cores the environment should be provisioned with.")
 	cmd.Flags().Float32P("memory", "m", memGB, "The amount of RAM an environment should be provisioned with.")
 	cmd.Flags().IntP("disk", "d", diskGB, "The amount of disk storage an environment should be provisioned with.")
@@ -339,10 +339,9 @@ coder envs edit back-end-env --disk 20`,
 func rmEnvsCommand(user *string) *cobra.Command {
 	var force bool
 	cmd := &cobra.Command{
-		Use:    "rm [...environment_names]",
-		Short:  "remove Coder environments by name",
-		Hidden: true,
-		Args:   cobra.MinimumNArgs(1),
+		Use:   "rm [...environment_names]",
+		Short: "remove Coder environments by name",
+		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 			client, err := newClient()
@@ -355,7 +354,10 @@ func rmEnvsCommand(user *string) *cobra.Command {
 					IsConfirm: true,
 				}
 				if _, err := confirm.Run(); err != nil {
-					return err
+					return clog.Fatal(
+						"failed to confirm prompt", clog.BlankLine,
+						clog.Tipf(`use "--force" to rebuild without a confirmation prompt`),
+					)
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func newClient() (*coder.Client, error) {`
`33`	`33`
`34`	`34`	`u, err := url.Parse(rawURL)`
`35`	`35`	`if err != nil {`
`36`		`- return nil, xerrors.Errorf("url misformatted: %w try runing \"coder login\" with a valid URL", err)`
	`36`	`+ return nil, xerrors.Errorf("url malformed: %w try runing \"coder login\" with a valid URL", err)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`c := &coder.Client{`
`@@ -54,12 +54,12 @@ func newClient() (*coder.Client, error) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if !version.VersionsMatch(apiVersion) {`
`57`		`- clog.Log(clog.Warn(`
	`57`	`+ clog.LogWarn(`
`58`	`58`	`"version mismatch detected",`
`59`	`59`	`fmt.Sprintf("coder-cli version: %s", version.Version),`
`60`	`60`	`fmt.Sprintf("Coder API version: %s", apiVersion), clog.BlankLine,`
`61`	`61`	`clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),`
`62`		`- ))`
	`62`	`+ )`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return c, nil`