feat(cli): show information about --wait=no for ssh (#13847)

mafredri · web-flow · commit ac6db5edf9ef · 2024-07-09T14:32:52.000+03:00
Fixes #11923
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -137,6 +137,9 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
 				stage += " (non-blocking)"
 			}
 			sw.Start(stage)
+			if follow {
+				sw.Log(time.Time{}, codersdk.LogLevelInfo, "==> ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.")
+			}
 
 			err = func() error { // Use func because of defer in for loop.
 				logStream, logsCloser, err := opts.FetchLogs(ctx, agent.ID, 0, follow)
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
@@ -226,6 +226,7 @@ func TestAgent(t *testing.T) {
 			},
 			want: []string{
 				"⧗ Running workspace agent startup scripts",
+				"ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.",
 				"testing: Hello world",
 				"Bye now",
 				"✔ Running workspace agent startup scripts",
@@ -255,6 +256,7 @@ func TestAgent(t *testing.T) {
 			},
 			want: []string{
 				"⧗ Running workspace agent startup scripts",
+				"ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.",
 				"Hello world",
 				"✘ Running workspace agent startup scripts",
 				"Warning: A startup script exited with an error and your workspace may be incomplete.",
@@ -306,6 +308,7 @@ func TestAgent(t *testing.T) {
 			},
 			want: []string{
 				"⧗ Running workspace agent startup scripts",
+				"ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.",
 				"Hello world",
 				"✔ Running workspace agent startup scripts",
 			},

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO`
`137`	`137`	`stage += " (non-blocking)"`
`138`	`138`	`}`
`139`	`139`	`sw.Start(stage)`
	`140`	`+ if follow {`
	`141`	`+ sw.Log(time.Time{}, codersdk.LogLevelInfo, "==> ℹ︎ To connect immediately, reconnect with --wait=no or CODER_SSH_WAIT=no, see --help for more information.")`
	`142`	`+ }`
`140`	`143`
`141`	`144`	`err = func() error { // Use func because of defer in for loop.`
`142`	`145`	`logStream, logsCloser, err := opts.FetchLogs(ctx, agent.ID, 0, follow)`