Fix non-blocking by default in agent

kylecarbs · kylecarbs · commit a21f0854e64a · 2023-09-18T15:14:17.000Z
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1465,6 +1465,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 		Architecture:             dbAgent.Architecture,
 		OperatingSystem:          dbAgent.OperatingSystem,
 		Scripts:                  scripts,
+		StartupScriptBehavior:    codersdk.WorkspaceAgentStartupScriptBehaviorNonBlocking,
 		LogsLength:               dbAgent.LogsLength,
 		LogsOverflowed:           dbAgent.LogsOverflowed,
 		LogSources:               logSources,
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -101,6 +101,7 @@ var WorkspaceAgentLifecycleOrder = []WorkspaceAgentLifecycle{
 // ready (can be overridden).
 //
 // Presently, non-blocking is the default, but this may change in the future.
+// Deprecated: `coder_script` allows configuration on a per-script basis.
 type WorkspaceAgentStartupScriptBehavior string
 
 const (
@@ -175,6 +176,11 @@ type WorkspaceAgent struct {
 	DisplayApps              []DisplayApp              `json:"display_apps"`
 	LogSources               []WorkspaceAgentLogSource `json:"log_sources"`
 	Scripts                  []WorkspaceAgentScript    `json:"scripts"`
+
+	// StartupScriptBehavior is a legacy field that is deprecated in favor
+	// of the `coder_script` resource. It's only referenced by old clients.
+	// Deprecated: Remove in the future!
+	StartupScriptBehavior WorkspaceAgentStartupScriptBehavior `json:"startup_script_behavior"`
 }
 
 type WorkspaceAgentLogSource struct {
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -234,6 +234,8 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 			// Support the legacy script attributes in the agent!
 			if attrs.StartupScript != "" {
 				agent.Scripts = append(agent.Scripts, &proto.Script{
+					// This is ▶️
+					Icon:             "/emojis/25b6.png",
 					LogPath:          "coder-startup-script.log",
 					DisplayName:      "Startup Script",
 					Script:           attrs.StartupScript,
@@ -243,6 +245,8 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 			}
 			if attrs.ShutdownScript != "" {
 				agent.Scripts = append(agent.Scripts, &proto.Script{
+					// This is ◀️
+					Icon:        "/emojis/25c0.png",
 					LogPath:     "coder-shutdown-script.log",
 					DisplayName: "Shutdown Script",
 					Script:      attrs.ShutdownScript,
