Fix startup timeout msg

kylecarbs · kylecarbs · commit aa687965c59b · 2023-09-25T20:53:35.000Z
diff --git a/agent/agentscripts/agentscripts_test.go b/agent/agentscripts/agentscripts_test.go
@@ -46,7 +46,7 @@ func TestTimeout(t *testing.T) {
 	runner := setup(t, nil)
 	defer runner.Close()
 	err := runner.Init([]codersdk.WorkspaceAgentScript{{
-		Script:  "sleep 3",
+		Script:  "sleep infinity",
 		Timeout: time.Millisecond,
 	}})
 	require.NoError(t, err)
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -201,6 +201,9 @@ func Agent(ctx context.Context, writer io.Writer, agentID uuid.UUID, opts AgentO
 			switch agent.LifecycleState {
 			case codersdk.WorkspaceAgentLifecycleReady:
 				sw.Complete(stage, agent.ReadyAt.Sub(*agent.StartedAt))
+			case codersdk.WorkspaceAgentLifecycleStartTimeout:
+				sw.Fail(stage, 0)
+				sw.Log(time.Time{}, codersdk.LogLevelWarn, "Warning: A startup script timed out and your workspace may be incomplete.")
 			case codersdk.WorkspaceAgentLifecycleStartError:
 				sw.Fail(stage, agent.ReadyAt.Sub(*agent.StartedAt))
 				// Use zero time (omitted) to separate these from the startup logs.
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
@@ -57,6 +57,31 @@ func TestAgent(t *testing.T) {
 				"For more information and troubleshooting, see",
 			},
 		},
+		{
+			name: "Start timeout",
+			opts: cliui.AgentOptions{
+				FetchInterval: time.Millisecond,
+			},
+			iter: []func(context.Context, *codersdk.WorkspaceAgent, chan []codersdk.WorkspaceAgentLog) error{
+				func(_ context.Context, agent *codersdk.WorkspaceAgent, _ chan []codersdk.WorkspaceAgentLog) error {
+					agent.Status = codersdk.WorkspaceAgentConnecting
+					return nil
+				},
+				func(_ context.Context, agent *codersdk.WorkspaceAgent, logs chan []codersdk.WorkspaceAgentLog) error {
+					agent.Status = codersdk.WorkspaceAgentConnected
+					agent.LifecycleState = codersdk.WorkspaceAgentLifecycleStartTimeout
+					agent.FirstConnectedAt = ptr.Ref(time.Now())
+					return nil
+				},
+			},
+			want: []string{
+				"⧗ Waiting for the workspace agent to connect",
+				"✔ Waiting for the workspace agent to connect",
+				"⧗ Running workspace agent startup scripts (non-blocking)",
+				"✘ Running workspace agent startup scripts (non-blocking)",
+				"Warning: A startup script timed out and your workspace may be incomplete.",
+			},
+		},
 		{
 			name: "Initial connection timeout",
 			opts: cliui.AgentOptions{
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -58,7 +58,7 @@ const (
 // Starting returns true if the agent is in the process of starting.
 func (l WorkspaceAgentLifecycle) Starting() bool {
 	switch l {
-	case WorkspaceAgentLifecycleCreated, WorkspaceAgentLifecycleStarting, WorkspaceAgentLifecycleStartTimeout:
+	case WorkspaceAgentLifecycleCreated, WorkspaceAgentLifecycleStarting:
 		return true
 	default:
 		return false
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -547,7 +547,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 			if resource.Mode == tfjson.DataResourceMode {
 				continue
 			}
-			if resource.Type == "coder_agent" || resource.Type == "coder_agent_instance" || resource.Type == "coder_app" || resource.Type == "coder_metadata" {
+			if resource.Type == "coder_script" || resource.Type == "coder_agent" || resource.Type == "coder_agent_instance" || resource.Type == "coder_app" || resource.Type == "coder_metadata" {
 				continue
 			}
 			label := convertAddressToLabel(resource.Address)

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error`
`547`	`547`	`if resource.Mode == tfjson.DataResourceMode {`
`548`	`548`	`continue`
`549`	`549`	`}`
`550`		`- if resource.Type == "coder_agent" \|\| resource.Type == "coder_agent_instance" \|\| resource.Type == "coder_app" \|\| resource.Type == "coder_metadata" {`
	`550`	`+ if resource.Type == "coder_script" \|\| resource.Type == "coder_agent" \|\| resource.Type == "coder_agent_instance" \|\| resource.Type == "coder_app" \|\| resource.Type == "coder_metadata" {`
`551`	`551`	`continue`
`552`	`552`	`}`
`553`	`553`	`label := convertAddressToLabel(resource.Address)`