Trail build logs if follow enabled for envs edit

Faris Huskovic · Faris Huskovic · commit 4d4579382b53 · 2020-10-23T11:25:47.000-05:00
diff --git a/docs/coder.md b/docs/coder.md
@@ -2,10 +2,6 @@
 
 coder provides a CLI for working with an existing Coder Enterprise installation
 
-### Synopsis
-
-coder provides a CLI for working with an existing Coder Enterprise installation
-
 ### Options
 
 ```
diff --git a/docs/coder_login.md b/docs/coder_login.md
@@ -2,10 +2,6 @@
 
 Authenticate this client for future operations
 
-### Synopsis
-
-Authenticate this client for future operations
-
 ```
 coder login [Coder Enterprise URL eg. https://my.coder.domain/] [flags]
 ```
diff --git a/docs/coder_logout.md b/docs/coder_logout.md
@@ -2,10 +2,6 @@
 
 Remove local authentication credentials if any exist
 
-### Synopsis
-
-Remove local authentication credentials if any exist
-
 ```
 coder logout [flags]
 ```
diff --git a/docs/coder_secrets_ls.md b/docs/coder_secrets_ls.md
@@ -2,10 +2,6 @@
 
 List all secrets owned by the active user
 
-### Synopsis
-
-List all secrets owned by the active user
-
 ```
 coder secrets ls [flags]
 ```
diff --git a/docs/coder_secrets_rm.md b/docs/coder_secrets_rm.md
@@ -2,10 +2,6 @@
 
 Remove one or more secrets by name
 
-### Synopsis
-
-Remove one or more secrets by name
-
 ```
 coder secrets rm [...secret_name] [flags]
 ```
diff --git a/docs/coder_secrets_view.md b/docs/coder_secrets_view.md
@@ -2,10 +2,6 @@
 
 View a secret by name
 
-### Synopsis
-
-View a secret by name
-
 ```
 coder secrets view [secret_name] [flags]
 ```
diff --git a/docs/coder_sync.md b/docs/coder_sync.md
@@ -2,10 +2,6 @@
 
 Establish a one way directory sync to a Coder environment
 
-### Synopsis
-
-Establish a one way directory sync to a Coder environment
-
 ```
 coder sync [local directory] [<env name>:<remote directory>] [flags]
 ```
diff --git a/docs/coder_urls.md b/docs/coder_urls.md
@@ -2,10 +2,6 @@
 
 Interact with environment DevURLs
 
-### Synopsis
-
-Interact with environment DevURLs
-
 ### Options
 
 ```
diff --git a/docs/coder_urls_create.md b/docs/coder_urls_create.md
@@ -2,10 +2,6 @@
 
 Create a new devurl for an environment
 
-### Synopsis
-
-Create a new devurl for an environment
-
 ```
 coder urls create [env_name] [port] [--access <level>] [--name <name>] [flags]
 ```
diff --git a/docs/coder_urls_ls.md b/docs/coder_urls_ls.md
@@ -2,10 +2,6 @@
 
 List all DevURLs for an environment
 
-### Synopsis
-
-List all DevURLs for an environment
-
 ```
 coder urls ls [environment_name] [flags]
 ```
diff --git a/docs/coder_urls_rm.md b/docs/coder_urls_rm.md
@@ -2,10 +2,6 @@
 
 Remove a dev url
 
-### Synopsis
-
-Remove a dev url
-
 ```
 coder urls rm [environment_name] [port] [flags]
 ```
diff --git a/docs/coder_users.md b/docs/coder_users.md
@@ -2,10 +2,6 @@
 
 Interact with Coder user accounts
 
-### Synopsis
-
-Interact with Coder user accounts
-
 ### Options
 
 ```
diff --git a/docs/coder_users_ls.md b/docs/coder_users_ls.md
@@ -2,10 +2,6 @@
 
 list all user accounts
 
-### Synopsis
-
-list all user accounts
-
 ```
 coder users ls [flags]
 ```
diff --git a/go.mod b/go.mod
@@ -7,14 +7,14 @@ require (
 	cdr.dev/wsep v0.0.0-20200728013649-82316a09813f
 	github.com/briandowns/spinner v1.11.1
 	github.com/fatih/color v1.9.0
-	github.com/gorilla/websocket v1.4.1
+	github.com/gorilla/websocket v1.4.2
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
 	github.com/klauspost/compress v1.10.8 // indirect
 	github.com/manifoldco/promptui v0.7.0
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/rjeczalik/notify v0.9.2
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
diff --git a/go.sum b/go.sum
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -183,17 +183,18 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 				return xerrors.Errorf("create environment: %w", err)
 			}
 
-			clog.LogSuccess(
-				"creating environment...",
-				clog.BlankLine,
-				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, args[0]),
-			)
-
 			if follow {
+				clog.LogSuccess("creating environment...")
 				if err := trailBuildLogs(cmd.Context(), client, env.ID); err != nil {
 					return err
 				}
+				return nil
 			}
+
+			clog.LogSuccess("creating environment...",
+				clog.BlankLine,
+				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, env.Name),
+			)
 			return nil
 		},
 	}
@@ -293,8 +294,15 @@ coder envs edit back-end-env --disk 20`,
 				return xerrors.Errorf("failed to apply changes to environment: '%s'", envName)
 			}
 
-			clog.LogSuccess(
-				"applied changes to the environment, rebuilding...",
+			if follow {
+				clog.LogSuccess("applied changes to the environment, rebuilding...")
+				if err := trailBuildLogs(cmd.Context(), client, env.ID); err != nil {
+					return err
+				}
+				return nil
+			}
+
+			clog.LogSuccess("applied changes to the environment, rebuilding...",
 				clog.BlankLine,
 				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, envName),
 			)
