Add new columns to workspace agent table

coder · mafredri · Jan 24, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
commit df9944e3b0b2ec92991ea2b21237d8223622407d
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000091_add_workspace_agent_state.down.sql b/coderd/database/migrations/000091_add_workspace_agent_state.down.sql
@@ -1,3 +1,6 @@
+ALTER TABLE workspace_agents DROP COLUMN startup_script_timeout;
+ALTER TABLE workspace_agents DROP COLUMN delay_login_until_ready;
+
 ALTER TABLE workspace_agents DROP COLUMN lifecycle_state;
 
 DROP TYPE workspace_agent_lifecycle_state;
diff --git a/coderd/database/migrations/000091_add_workspace_agent_state.up.sql b/coderd/database/migrations/000091_add_workspace_agent_state.up.sql
@@ -1,5 +1,13 @@
 CREATE TYPE workspace_agent_lifecycle_state AS ENUM ('created', 'starting', 'start_timeout', 'start_error', 'ready');
 
 ALTER TABLE workspace_agents ADD COLUMN lifecycle_state workspace_agent_lifecycle_state NOT NULL DEFAULT 'created';
-
 COMMENT ON COLUMN workspace_agents.lifecycle_state IS 'The current lifecycle state of the workspace agent.';
+
+/* Set default values that conform to current behavior */
+/* Allow logins immediately after agent connect */
+ALTER TABLE workspace_agents ADD COLUMN delay_login_until_ready boolean NOT NULL DEFAULT false;
+COMMENT ON COLUMN workspace_agents.delay_login_until_ready IS 'If true, the agent will delay logins until it is ready (e.g. executing startup script has ended).';
+
+/* Disable startup script timeouts by default */
+ALTER TABLE workspace_agents ADD COLUMN startup_script_timeout_seconds int4 NOT NULL DEFAULT 0;
+COMMENT ON COLUMN workspace_agents.startup_script_timeout_seconds IS 'The number of seconds to wait for the startup script to complete. If the script does not complete within this time, the agent lifecycle will be marked as start_timeout.';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagents.sql b/coderd/database/queries/workspaceagents.sql
@@ -56,10 +56,12 @@ INSERT INTO
 		resource_metadata,
 		connection_timeout_seconds,
 		troubleshooting_url,
-		motd_file
+		motd_file,
+		delay_login_until_ready,
+		startup_script_timeout_seconds
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) RETURNING *;
 
 -- name: UpdateWorkspaceAgentConnectionByID :exec
 UPDATE

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -946,9 +946,11 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				String: prAgent.StartupScript,
 				Valid:  prAgent.StartupScript != "",
 			},
-			ConnectionTimeoutSeconds: prAgent.GetConnectionTimeoutSeconds(),
-			TroubleshootingURL:       prAgent.GetTroubleshootingUrl(),
-			MOTDFile:                 prAgent.GetMotdFile(),
+			ConnectionTimeoutSeconds:    prAgent.GetConnectionTimeoutSeconds(),
+			TroubleshootingURL:          prAgent.GetTroubleshootingUrl(),
+			MOTDFile:                    prAgent.GetMotdFile(),
+			DelayLoginUntilReady:        prAgent.GetDelayLoginUntilReady(),
+			StartupScriptTimeoutSeconds: prAgent.GetStartupScriptTimeoutSeconds(),
 		})
 		if err != nil {
 			return xerrors.Errorf("insert agent: %w", err)