fix: formatting

coder · SasSwart · Apr 3, 2025 · Mar 12, 2025 · Mar 13, 2025 · Mar 13, 2025
commit b0bf2202fc4f093721c79fae6732cbbc21f95f4a
diff --git a/coderd/database/migrations/000313_prebuilds.up.sql b/coderd/database/migrations/000313_prebuilds.up.sql
@@ -17,44 +17,44 @@ ORDER BY wb.workspace_id, wb.build_number DESC;
 -- (including lifecycle_state which indicates is agent ready or not) and corresponding preset_id for prebuild
 CREATE VIEW workspace_prebuilds AS
 WITH
-    -- All workspaces owned by the "prebuilds" user.
-    all_prebuilds AS (
+	-- All workspaces owned by the "prebuilds" user.
+	all_prebuilds AS (
 		SELECT w.id, w.name, w.template_id, w.created_at
 		FROM workspaces w
 		WHERE w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0' -- The system user responsible for prebuilds.
 	),
-    -- We can't rely on the template_version_preset_id in the workspace_builds table because this value is only set on the
-    -- initial workspace creation. Subsequent stop/start transitions will not have a value for template_version_preset_id,
-    -- and therefore we can't rely on (say) the latest build's chosen template_version_preset_id.
-    --
-    -- See https://github.com/coder/internal/issues/398
-    workspaces_with_latest_presets AS (
-        SELECT DISTINCT ON (workspace_id) workspace_id, template_version_preset_id
-        FROM workspace_builds
-        WHERE template_version_preset_id IS NOT NULL
-        ORDER BY workspace_id, build_number DESC
-    ),
+	-- We can't rely on the template_version_preset_id in the workspace_builds table because this value is only set on the
+	-- initial workspace creation. Subsequent stop/start transitions will not have a value for template_version_preset_id,
+	-- and therefore we can't rely on (say) the latest build's chosen template_version_preset_id.
+	--
+	-- See https://github.com/coder/internal/issues/398
+	workspaces_with_latest_presets AS (
+		SELECT DISTINCT ON (workspace_id) workspace_id, template_version_preset_id
+		FROM workspace_builds
+		WHERE template_version_preset_id IS NOT NULL
+		ORDER BY workspace_id, build_number DESC
+	),
 	-- workspaces_with_agents_status contains workspaces owned by the "prebuilds" user,
 	-- along with the readiness status of their agents.
 	-- A workspace is marked as 'ready' only if ALL of its agents are ready.
 	workspaces_with_agents_status AS (
 		SELECT w.id AS workspace_id,
-		       BOOL_AND(wa.lifecycle_state = 'ready'::workspace_agent_lifecycle_state) AS ready
+			BOOL_AND(wa.lifecycle_state = 'ready'::workspace_agent_lifecycle_state) AS ready
 		FROM workspaces w
 			INNER JOIN workspace_latest_builds wlb ON wlb.workspace_id = w.id
 			INNER JOIN workspace_resources wr ON wr.job_id = wlb.job_id
 			INNER JOIN workspace_agents wa ON wa.resource_id = wr.id
 		WHERE w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0' -- The system user responsible for prebuilds.
 		GROUP BY w.id
 	),
-    current_presets AS (SELECT w.id AS prebuild_id, wlp.template_version_preset_id
-                        FROM workspaces w
-                                 INNER JOIN workspaces_with_latest_presets wlp ON wlp.workspace_id = w.id
-                        WHERE w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0') -- The system user responsible for prebuilds.
+	current_presets AS (SELECT w.id AS prebuild_id, wlp.template_version_preset_id
+						FROM workspaces w
+							INNER JOIN workspaces_with_latest_presets wlp ON wlp.workspace_id = w.id
+						WHERE w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0') -- The system user responsible for prebuilds.
 SELECT p.id, p.name, p.template_id, p.created_at, COALESCE(a.ready, false) AS ready, cp.template_version_preset_id AS current_preset_id
 FROM all_prebuilds p
-         LEFT JOIN workspaces_with_agents_status a ON a.workspace_id = p.id
-         INNER JOIN current_presets cp ON cp.prebuild_id = p.id;
+		LEFT JOIN workspaces_with_agents_status a ON a.workspace_id = p.id
+		INNER JOIN current_presets cp ON cp.prebuild_id = p.id;
 
 CREATE VIEW workspace_prebuild_builds AS
 SELECT id, workspace_id, template_version_id, transition, job_id, template_version_preset_id, build_number

diff --git a/coderd/database/migrations/000314_preset_prebuilds.up.sql b/coderd/database/migrations/000314_preset_prebuilds.up.sql
@@ -1,6 +1,6 @@
 ALTER TABLE template_version_presets
-    ADD COLUMN desired_instances     INT NULL,
-    ADD COLUMN invalidate_after_secs INT NULL DEFAULT 0;
+	ADD COLUMN desired_instances     INT NULL,
+	ADD COLUMN invalidate_after_secs INT NULL DEFAULT 0;
 
 -- We should not be able to have presets with the same name for a particular template version.
 CREATE UNIQUE INDEX idx_unique_preset_name ON template_version_presets (name, template_version_id);
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/prebuilds.sql b/coderd/database/queries/prebuilds.sql
@@ -15,22 +15,23 @@ SELECT
 		t.deleted,
 		t.deprecated != ''          AS deprecated
 FROM templates t
-		 INNER JOIN template_versions tv ON tv.template_id = t.id
-		 INNER JOIN template_version_presets tvp ON tvp.template_version_id = tv.id
-		 INNER JOIN organizations o ON o.id = t.organization_id
+		INNER JOIN template_versions tv ON tv.template_id = t.id
+		INNER JOIN template_version_presets tvp ON tvp.template_version_id = tv.id
+		INNER JOIN organizations o ON o.id = t.organization_id
 WHERE tvp.desired_instances IS NOT NULL -- Consider only presets that have a prebuild configuration.
-  AND (t.id = sqlc.narg('template_id')::uuid OR sqlc.narg('template_id') IS NULL);
+	AND (t.id = sqlc.narg('template_id')::uuid OR sqlc.narg('template_id') IS NULL);
 
 -- name: GetRunningPrebuiltWorkspaces :many
-SELECT p.id,
-       p.name,
-       p.template_id,
-       b.template_version_id,
-       p.current_preset_id AS current_preset_id,
-       p.ready,
-       p.created_at
+SELECT
+		p.id,
+		p.name,
+		p.template_id,
+		b.template_version_id,
+		p.current_preset_id AS current_preset_id,
+		p.ready,
+		p.created_at
 FROM workspace_prebuilds p
-		 INNER JOIN workspace_latest_builds b ON b.workspace_id = p.id
+		INNER JOIN workspace_latest_builds b ON b.workspace_id = p.id
 WHERE (b.transition = 'start'::workspace_transition
 	AND b.job_status = 'succeeded'::provisioner_job_status);
 
@@ -39,14 +40,14 @@ WHERE (b.transition = 'start'::workspace_transition
 -- Prebuild considered in-progress if it's in the "starting", "stopping", or "deleting" state.
 SELECT t.id AS template_id, wpb.template_version_id, wpb.transition, COUNT(wpb.transition)::int AS count
 FROM workspace_latest_builds wlb
-         INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
-         -- We only need these counts for active template versions.
-         -- It doesn't influence whether we create or delete prebuilds
-         -- for inactive template versions. This is because we never create
-         -- prebuilds for inactive template versions, we always delete
-         -- running prebuilds for inactive template versions, and we ignore
-         -- prebuilds that are still building.
-         INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
+		INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
+		-- We only need these counts for active template versions.
+		-- It doesn't influence whether we create or delete prebuilds
+		-- for inactive template versions. This is because we never create
+		-- prebuilds for inactive template versions, we always delete
+		-- running prebuilds for inactive template versions, and we ignore
+		-- prebuilds that are still building.
+		INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
 WHERE wlb.job_status IN ('pending'::provisioner_job_status, 'running'::provisioner_job_status)
 GROUP BY t.id, wpb.template_version_id, wpb.transition;
 
@@ -69,37 +70,38 @@ WITH filtered_builds AS (
 	-- Only select builds which are for prebuild creations
 	SELECT wlb.template_version_id, wlb.created_at, tvp.id AS preset_id, wlb.job_status, tvp.desired_instances
 	FROM template_version_presets tvp
-			 INNER JOIN workspace_latest_builds wlb ON wlb.template_version_preset_id = tvp.id
-			 INNER JOIN workspaces w ON wlb.workspace_id = w.id
-             INNER JOIN template_versions tv ON wlb.template_version_id = tv.id
-             INNER JOIN templates t ON tv.template_id = t.id AND t.active_version_id = tv.id
+			INNER JOIN workspace_latest_builds wlb ON wlb.template_version_preset_id = tvp.id
+			INNER JOIN workspaces w ON wlb.workspace_id = w.id
+			INNER JOIN template_versions tv ON wlb.template_version_id = tv.id
+			INNER JOIN templates t ON tv.template_id = t.id AND t.active_version_id = tv.id
 	WHERE tvp.desired_instances IS NOT NULL -- Consider only presets that have a prebuild configuration.
-      AND wlb.transition = 'start'::workspace_transition
-      AND w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0'
+		AND wlb.transition = 'start'::workspace_transition
+		AND w.owner_id = 'c42fdf75-3097-471c-8c33-fb52454d81c0'
 ),
 time_sorted_builds AS (
-    -- Group builds by preset, then sort each group by created_at.
+	-- Group builds by preset, then sort each group by created_at.
 	SELECT fb.template_version_id, fb.created_at, fb.preset_id, fb.job_status, fb.desired_instances,
-	    ROW_NUMBER() OVER (PARTITION BY fb.preset_id ORDER BY fb.created_at DESC) as rn
+		ROW_NUMBER() OVER (PARTITION BY fb.preset_id ORDER BY fb.created_at DESC) as rn
 	FROM filtered_builds fb
 ),
 failed_count AS (
-    -- Count failed builds per preset in the given period
+	-- Count failed builds per preset in the given period
 	SELECT preset_id, COUNT(*) AS num_failed
 	FROM filtered_builds
 	WHERE job_status = 'failed'::provisioner_job_status
 		AND created_at >= @lookback::timestamptz
 	GROUP BY preset_id
 )
-SELECT tsb.template_version_id,
-	   tsb.preset_id,
-	   COALESCE(fc.num_failed, 0)::int  AS num_failed,
-	   MAX(tsb.created_at)::timestamptz AS last_build_at
+SELECT
+		tsb.template_version_id,
+		tsb.preset_id,
+		COALESCE(fc.num_failed, 0)::int  AS num_failed,
+		MAX(tsb.created_at)::timestamptz AS last_build_at
 FROM time_sorted_builds tsb
-		 LEFT JOIN failed_count fc ON fc.preset_id = tsb.preset_id
+		LEFT JOIN failed_count fc ON fc.preset_id = tsb.preset_id
 WHERE tsb.rn <= tsb.desired_instances -- Fetch the last N builds, where N is the number of desired instances; if any fail, we backoff
-  AND tsb.job_status = 'failed'::provisioner_job_status
-  AND created_at >= @lookback::timestamptz
+		AND tsb.job_status = 'failed'::provisioner_job_status
+		AND created_at >= @lookback::timestamptz
 GROUP BY tsb.template_version_id, tsb.preset_id, fc.num_failed;
 
 -- name: ClaimPrebuiltWorkspace :one
@@ -114,24 +116,24 @@ WHERE w.id IN (
 		INNER JOIN templates t ON p.template_id = t.id
 	WHERE (b.transition = 'start'::workspace_transition
 		AND b.job_status IN ('succeeded'::provisioner_job_status))
-	-- The prebuilds system should never try to claim a prebuild for an inactive template version.
-	-- Nevertheless, this filter is here as a defensive measure:
-	AND b.template_version_id = t.active_version_id
-	AND p.current_preset_id = @preset_id::uuid
-	AND p.ready
+		-- The prebuilds system should never try to claim a prebuild for an inactive template version.
+		-- Nevertheless, this filter is here as a defensive measure:
+		AND b.template_version_id = t.active_version_id
+		AND p.current_preset_id = @preset_id::uuid
+		AND p.ready
 	LIMIT 1 FOR UPDATE OF p SKIP LOCKED -- Ensure that a concurrent request will not select the same prebuild.
 )
 RETURNING w.id, w.name;
 
 -- name: GetPrebuildMetrics :many
 SELECT
-    t.name as template_name,
-    tvp.name as preset_name,
+	t.name as template_name,
+	tvp.name as preset_name,
 		o.name as organization_name,
-    COUNT(*) as created_count,
-    COUNT(*) FILTER (WHERE pj.job_status = 'failed'::provisioner_job_status) as failed_count,
-    COUNT(*) FILTER (
-			 WHERE w.owner_id != 'c42fdf75-3097-471c-8c33-fb52454d81c0'::uuid -- The system user responsible for prebuilds.
+	COUNT(*) as created_count,
+	COUNT(*) FILTER (WHERE pj.job_status = 'failed'::provisioner_job_status) as failed_count,
+	COUNT(*) FILTER (
+			WHERE w.owner_id != 'c42fdf75-3097-471c-8c33-fb52454d81c0'::uuid -- The system user responsible for prebuilds.
 		) as claimed_count
 FROM workspaces w
 INNER JOIN workspace_prebuild_builds wpb ON wpb.workspace_id = w.id

diff --git a/coderd/database/queries/presets.sql b/coderd/database/queries/presets.sql
@@ -52,5 +52,5 @@ WHERE
 -- name: GetPresetByID :one
 SELECT tvp.*, tv.template_id, tv.organization_id FROM
 	template_version_presets tvp
-		INNER JOIN template_versions tv ON tvp.template_version_id = tv.id
+	INNER JOIN template_versions tv ON tvp.template_version_id = tv.id
 WHERE tvp.id = @preset_id;