From ac6db5edf9ef2f199a054e985e59b55a5d41aab4 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 9 Jul 2024 14:32:52 +0300 Subject: [PATCH] feat(cli): show information about --wait=no for ssh (#13847) Fixes #11923 --- cli/cliui/agent.go | 3 +++ cli/cliui/agent_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go index 0a4e53c591..a656fbd682 100644 --- 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 index 8cfa481e83..fb47c9f689 100644 --- 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", },