diff --git a/coderd/database/migrations/000292_system_user.down.sql b/coderd/database/migrations/000293_system_user.down.sql similarity index 100% rename from coderd/database/migrations/000292_system_user.down.sql rename to coderd/database/migrations/000293_system_user.down.sql diff --git a/coderd/database/migrations/000292_system_user.up.sql b/coderd/database/migrations/000293_system_user.up.sql similarity index 100% rename from coderd/database/migrations/000292_system_user.up.sql rename to coderd/database/migrations/000293_system_user.up.sql diff --git a/coderd/database/migrations/000293_prebuilds.down.sql b/coderd/database/migrations/000294_prebuilds.down.sql similarity index 100% rename from coderd/database/migrations/000293_prebuilds.down.sql rename to coderd/database/migrations/000294_prebuilds.down.sql diff --git a/coderd/database/migrations/000293_prebuilds.up.sql b/coderd/database/migrations/000294_prebuilds.up.sql similarity index 100% rename from coderd/database/migrations/000293_prebuilds.up.sql rename to coderd/database/migrations/000294_prebuilds.up.sql diff --git a/coderd/database/migrations/000294_preset_prebuilds.down.sql b/coderd/database/migrations/000295_preset_prebuilds.down.sql similarity index 100% rename from coderd/database/migrations/000294_preset_prebuilds.down.sql rename to coderd/database/migrations/000295_preset_prebuilds.down.sql diff --git a/coderd/database/migrations/000294_preset_prebuilds.up.sql b/coderd/database/migrations/000295_preset_prebuilds.up.sql similarity index 100% rename from coderd/database/migrations/000294_preset_prebuilds.up.sql rename to coderd/database/migrations/000295_preset_prebuilds.up.sql diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 87c5b44e20..75560ffec4 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -5398,18 +5398,18 @@ func (q *sqlQuerier) GetParameterSchemasByJobID(ctx context.Context, jobID uuid. const claimPrebuild = `-- name: ClaimPrebuild :one UPDATE workspaces w SET owner_id = $1::uuid, - name = $2::text, - updated_at = NOW() + name = $2::text, + updated_at = NOW() WHERE w.id IN (SELECT p.id - FROM workspace_prebuilds p - INNER JOIN workspace_latest_build b ON b.workspace_id = p.id - INNER JOIN provisioner_jobs pj ON b.job_id = pj.id - INNER JOIN templates t ON p.template_id = t.id - WHERE (b.transition = 'start'::workspace_transition - AND pj.job_status IN ('succeeded'::provisioner_job_status)) - AND b.template_version_id = t.active_version_id - ORDER BY random() - LIMIT 1 FOR UPDATE OF p SKIP LOCKED) + FROM workspace_prebuilds p + INNER JOIN workspace_latest_build b ON b.workspace_id = p.id + INNER JOIN provisioner_jobs pj ON b.job_id = pj.id + INNER JOIN templates t ON p.template_id = t.id + WHERE (b.transition = 'start'::workspace_transition + AND pj.job_status IN ('succeeded'::provisioner_job_status)) + AND b.template_version_id = t.active_version_id + ORDER BY random() + LIMIT 1 FOR UPDATE OF p SKIP LOCKED) RETURNING w.id, w.name ` @@ -5433,81 +5433,102 @@ func (q *sqlQuerier) ClaimPrebuild(ctx context.Context, arg ClaimPrebuildParams) const getTemplatePrebuildState = `-- name: GetTemplatePrebuildState :many WITH - -- All prebuilds currently running - running_prebuilds AS (SELECT p.template_id, - b.template_version_id, - COUNT(*) AS count, - STRING_AGG(p.id::text, ',') AS ids - FROM workspace_prebuilds p - INNER JOIN workspace_latest_build b ON b.workspace_id = p.id - INNER JOIN provisioner_jobs pj ON b.job_id = pj.id - INNER JOIN templates t ON p.template_id = t.id - WHERE (b.transition = 'start'::workspace_transition - -- if a deletion job fails, the workspace will still be running - OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status, - 'unknown'::provisioner_job_status)) - GROUP BY p.template_id, b.template_version_id), - -- All templates which have been configured for prebuilds (any version) - templates_with_prebuilds AS (SELECT t.id AS template_id, - tv.id AS template_version_id, - tv.id = t.active_version_id AS using_active_version, - tvpp.desired_instances, - 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 template_version_preset_prebuilds tvpp ON tvpp.preset_id = tvp.id - WHERE t.id = $1::uuid - GROUP BY t.id, tv.id, tvpp.id), - -- Jobs relating to prebuilds current in-flight - prebuilds_in_progress AS (SELECT wpb.template_version_id, wpb.transition, COUNT(wpb.transition) AS count - FROM workspace_latest_build wlb - INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id - INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id - WHERE pj.job_status NOT IN - ('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status, - 'failed'::provisioner_job_status) - GROUP BY wpb.template_version_id, wpb.transition) + -- All prebuilds currently running + running_prebuilds AS (SELECT p.template_id, + b.template_version_id, + tvp_curr.id AS current_preset_id, + tvp_desired.id AS desired_preset_id, + COUNT(*) AS count, + STRING_AGG(p.id::text, ',') AS ids + FROM workspace_prebuilds p + INNER JOIN workspace_latest_build b ON b.workspace_id = p.id + INNER JOIN provisioner_jobs pj ON b.job_id = pj.id + INNER JOIN templates t ON p.template_id = t.id + LEFT JOIN template_version_presets tvp_curr + ON tvp_curr.id = b.template_version_preset_id + LEFT JOIN template_version_presets tvp_desired + ON tvp_desired.template_version_id = t.active_version_id + WHERE (b.transition = 'start'::workspace_transition + -- if a deletion job fails, the workspace will still be running + OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status, + 'unknown'::provisioner_job_status)) + AND (tvp_curr.name = tvp_desired.name + OR tvp_desired.id IS NULL) + GROUP BY p.template_id, b.template_version_id, tvp_curr.id, + tvp_desired.id), + -- All templates which have been configured for prebuilds (any version) + templates_with_prebuilds AS (SELECT t.id AS template_id, + tv.id AS template_version_id, + tv.id = t.active_version_id AS using_active_version, + tvpp.preset_id, + tvp.name, + MAX(tvpp.desired_instances) AS desired_instances, + 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 template_version_preset_prebuilds tvpp ON tvpp.preset_id = tvp.id + WHERE t.id = $1::uuid + GROUP BY t.id, tv.id, tvpp.preset_id, tvp.name), + -- Jobs relating to prebuilds current in-flight + prebuilds_in_progress AS (SELECT wpb.template_version_id, wpb.transition, COUNT(wpb.transition) AS count + FROM workspace_latest_build wlb + INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id + INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id + WHERE pj.job_status NOT IN + ('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status, + 'failed'::provisioner_job_status) + GROUP BY wpb.template_version_id, wpb.transition) SELECT t.template_id, - t.template_version_id, - t.using_active_version AS is_active, - MAX(CASE - WHEN p.template_version_id = t.template_version_id THEN p.ids - ELSE '' END)::text AS running_prebuild_ids, - COALESCE(MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END), - 0)::int AS actual, -- running prebuilds for active version - MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)::int AS desired, -- we only care about the active version's desired instances - COALESCE(MAX(CASE - WHEN p.template_version_id = t.template_version_id AND t.using_active_version = false - THEN p.count - ELSE 0 END), - 0)::int AS outdated, -- running prebuilds for inactive version - COALESCE(GREATEST( - (MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END)::int - - MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)), - 0), - 0) ::int AS extraneous, -- extra running prebuilds for active version - COALESCE(MAX(CASE WHEN pip.transition = 'start'::workspace_transition THEN pip.count ELSE 0 END), - 0)::int AS starting, - COALESCE(MAX(CASE - WHEN pip.transition = 'stop'::workspace_transition THEN pip.count - ELSE 0 END), - 0)::int AS stopping, -- not strictly needed, since prebuilds should never be left if a "stopped" state, but useful to know - COALESCE(MAX(CASE WHEN pip.transition = 'delete'::workspace_transition THEN pip.count ELSE 0 END), - 0)::int AS deleting, - t.deleted AS template_deleted, - t.deprecated AS template_deprecated + t.template_version_id, + t.preset_id, + t.using_active_version AS is_active, + MAX(CASE + WHEN p.template_version_id = t.template_version_id THEN p.ids + ELSE '' END)::text AS running_prebuild_ids, + COALESCE(MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END), + 0)::int AS actual, -- running prebuilds for active version + MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)::int AS desired, -- we only care about the active version's desired instances + COALESCE(MAX(CASE + WHEN p.template_version_id = t.template_version_id AND + t.using_active_version = false + THEN p.count + ELSE 0 END), + 0)::int AS outdated, -- running prebuilds for inactive version + COALESCE(GREATEST( + (MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END)::int + - + MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)), + 0), + 0) ::int AS extraneous, -- extra running prebuilds for active version + COALESCE(MAX(CASE + WHEN pip.transition = 'start'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS starting, + COALESCE(MAX(CASE + WHEN pip.transition = 'stop'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS stopping, -- not strictly needed, since prebuilds should never be left if a "stopped" state, but useful to know + COALESCE(MAX(CASE + WHEN pip.transition = 'delete'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS deleting, + t.deleted::bool AS template_deleted, + t.deprecated::bool AS template_deprecated FROM templates_with_prebuilds t - LEFT JOIN running_prebuilds p ON p.template_version_id = t.template_version_id - LEFT JOIN prebuilds_in_progress pip ON pip.template_version_id = t.template_version_id -GROUP BY t.using_active_version, t.template_id, t.template_version_id, p.count, p.ids, - p.template_version_id, t.deleted, t.deprecated + LEFT JOIN running_prebuilds p + ON (p.template_version_id = t.template_version_id AND p.current_preset_id = t.preset_id) + LEFT JOIN prebuilds_in_progress pip ON pip.template_version_id = t.template_version_id +WHERE (t.using_active_version = TRUE + OR p.count > 0) +GROUP BY t.template_id, t.template_version_id, t.preset_id, t.using_active_version, t.deleted, t.deprecated ` type GetTemplatePrebuildStateRow struct { TemplateID uuid.UUID `db:"template_id" json:"template_id"` TemplateVersionID uuid.UUID `db:"template_version_id" json:"template_version_id"` + PresetID uuid.UUID `db:"preset_id" json:"preset_id"` IsActive bool `db:"is_active" json:"is_active"` RunningPrebuildIds string `db:"running_prebuild_ids" json:"running_prebuild_ids"` Actual int32 `db:"actual" json:"actual"` @@ -5533,6 +5554,7 @@ func (q *sqlQuerier) GetTemplatePrebuildState(ctx context.Context, templateID uu if err := rows.Scan( &i.TemplateID, &i.TemplateVersionID, + &i.PresetID, &i.IsActive, &i.RunningPrebuildIds, &i.Actual, diff --git a/coderd/database/queries/prebuilds.sql b/coderd/database/queries/prebuilds.sql index 642403bf9c..ea729d3ee9 100644 --- a/coderd/database/queries/prebuilds.sql +++ b/coderd/database/queries/prebuilds.sql @@ -1,92 +1,112 @@ -- name: GetTemplatePrebuildState :many WITH - -- All prebuilds currently running - running_prebuilds AS (SELECT p.template_id, - b.template_version_id, - COUNT(*) AS count, - STRING_AGG(p.id::text, ',') AS ids - FROM workspace_prebuilds p - INNER JOIN workspace_latest_build b ON b.workspace_id = p.id - INNER JOIN provisioner_jobs pj ON b.job_id = pj.id - INNER JOIN templates t ON p.template_id = t.id - WHERE (b.transition = 'start'::workspace_transition - -- if a deletion job fails, the workspace will still be running - OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status, - 'unknown'::provisioner_job_status)) - GROUP BY p.template_id, b.template_version_id), - -- All templates which have been configured for prebuilds (any version) - templates_with_prebuilds AS (SELECT t.id AS template_id, - tv.id AS template_version_id, - tv.id = t.active_version_id AS using_active_version, - tvpp.desired_instances, - 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 template_version_preset_prebuilds tvpp ON tvpp.preset_id = tvp.id - WHERE t.id = @template_id::uuid - GROUP BY t.id, tv.id, tvpp.id), - -- Jobs relating to prebuilds current in-flight - prebuilds_in_progress AS (SELECT wpb.template_version_id, wpb.transition, COUNT(wpb.transition) AS count - FROM workspace_latest_build wlb - INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id - INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id - WHERE pj.job_status NOT IN - ('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status, - 'failed'::provisioner_job_status) - GROUP BY wpb.template_version_id, wpb.transition) + -- All prebuilds currently running + running_prebuilds AS (SELECT p.template_id, + b.template_version_id, + tvp_curr.id AS current_preset_id, + tvp_desired.id AS desired_preset_id, + COUNT(*) AS count, + STRING_AGG(p.id::text, ',') AS ids + FROM workspace_prebuilds p + INNER JOIN workspace_latest_build b ON b.workspace_id = p.id + INNER JOIN provisioner_jobs pj ON b.job_id = pj.id + INNER JOIN templates t ON p.template_id = t.id + LEFT JOIN template_version_presets tvp_curr + ON tvp_curr.id = b.template_version_preset_id + LEFT JOIN template_version_presets tvp_desired + ON tvp_desired.template_version_id = t.active_version_id + WHERE (b.transition = 'start'::workspace_transition + -- if a deletion job fails, the workspace will still be running + OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status, + 'unknown'::provisioner_job_status)) + AND (tvp_curr.name = tvp_desired.name + OR tvp_desired.id IS NULL) + GROUP BY p.template_id, b.template_version_id, tvp_curr.id, + tvp_desired.id), + -- All templates which have been configured for prebuilds (any version) + templates_with_prebuilds AS (SELECT t.id AS template_id, + tv.id AS template_version_id, + tv.id = t.active_version_id AS using_active_version, + tvpp.preset_id, + tvp.name, + MAX(tvpp.desired_instances) AS desired_instances, + 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 template_version_preset_prebuilds tvpp ON tvpp.preset_id = tvp.id + WHERE t.id = @template_id::uuid + GROUP BY t.id, tv.id, tvpp.preset_id, tvp.name), + -- Jobs relating to prebuilds current in-flight + prebuilds_in_progress AS (SELECT wpb.template_version_id, wpb.transition, COUNT(wpb.transition) AS count + FROM workspace_latest_build wlb + INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id + INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id + WHERE pj.job_status NOT IN + ('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status, + 'failed'::provisioner_job_status) + GROUP BY wpb.template_version_id, wpb.transition) SELECT t.template_id, - t.template_version_id, - t.using_active_version AS is_active, - MAX(CASE - WHEN p.template_version_id = t.template_version_id THEN p.ids - ELSE '' END)::text AS running_prebuild_ids, - COALESCE(MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END), - 0)::int AS actual, -- running prebuilds for active version - MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)::int AS desired, -- we only care about the active version's desired instances - COALESCE(MAX(CASE - WHEN p.template_version_id = t.template_version_id AND t.using_active_version = false - THEN p.count - ELSE 0 END), - 0)::int AS outdated, -- running prebuilds for inactive version - COALESCE(GREATEST( - (MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END)::int - - MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)), - 0), - 0) ::int AS extraneous, -- extra running prebuilds for active version - COALESCE(MAX(CASE WHEN pip.transition = 'start'::workspace_transition THEN pip.count ELSE 0 END), - 0)::int AS starting, - COALESCE(MAX(CASE - WHEN pip.transition = 'stop'::workspace_transition THEN pip.count - ELSE 0 END), - 0)::int AS stopping, -- not strictly needed, since prebuilds should never be left if a "stopped" state, but useful to know - COALESCE(MAX(CASE WHEN pip.transition = 'delete'::workspace_transition THEN pip.count ELSE 0 END), - 0)::int AS deleting, - t.deleted AS template_deleted, - t.deprecated AS template_deprecated + t.template_version_id, + t.preset_id, + t.using_active_version AS is_active, + MAX(CASE + WHEN p.template_version_id = t.template_version_id THEN p.ids + ELSE '' END)::text AS running_prebuild_ids, + COALESCE(MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END), + 0)::int AS actual, -- running prebuilds for active version + MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)::int AS desired, -- we only care about the active version's desired instances + COALESCE(MAX(CASE + WHEN p.template_version_id = t.template_version_id AND + t.using_active_version = false + THEN p.count + ELSE 0 END), + 0)::int AS outdated, -- running prebuilds for inactive version + COALESCE(GREATEST( + (MAX(CASE WHEN t.using_active_version THEN p.count ELSE 0 END)::int + - + MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END)), + 0), + 0) ::int AS extraneous, -- extra running prebuilds for active version + COALESCE(MAX(CASE + WHEN pip.transition = 'start'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS starting, + COALESCE(MAX(CASE + WHEN pip.transition = 'stop'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS stopping, -- not strictly needed, since prebuilds should never be left if a "stopped" state, but useful to know + COALESCE(MAX(CASE + WHEN pip.transition = 'delete'::workspace_transition THEN pip.count + ELSE 0 END), + 0)::int AS deleting, + t.deleted::bool AS template_deleted, + t.deprecated::bool AS template_deprecated FROM templates_with_prebuilds t - LEFT JOIN running_prebuilds p ON p.template_version_id = t.template_version_id - LEFT JOIN prebuilds_in_progress pip ON pip.template_version_id = t.template_version_id -GROUP BY t.using_active_version, t.template_id, t.template_version_id, p.count, p.ids, - p.template_version_id, t.deleted, t.deprecated; + LEFT JOIN running_prebuilds p + ON (p.template_version_id = t.template_version_id AND p.current_preset_id = t.preset_id) + LEFT JOIN prebuilds_in_progress pip ON pip.template_version_id = t.template_version_id +WHERE (t.using_active_version = TRUE + OR p.count > 0) +GROUP BY t.template_id, t.template_version_id, t.preset_id, t.using_active_version, t.deleted, t.deprecated; -- name: ClaimPrebuild :one -- TODO: rewrite to use named CTE instead? UPDATE workspaces w SET owner_id = @new_user_id::uuid, - name = @new_name::text, - updated_at = NOW() + name = @new_name::text, + updated_at = NOW() WHERE w.id IN (SELECT p.id - FROM workspace_prebuilds p - INNER JOIN workspace_latest_build b ON b.workspace_id = p.id - INNER JOIN provisioner_jobs pj ON b.job_id = pj.id - INNER JOIN templates t ON p.template_id = t.id - WHERE (b.transition = 'start'::workspace_transition - AND pj.job_status IN ('succeeded'::provisioner_job_status)) - AND b.template_version_id = t.active_version_id - ORDER BY random() - LIMIT 1 FOR UPDATE OF p SKIP LOCKED) + FROM workspace_prebuilds p + INNER JOIN workspace_latest_build b ON b.workspace_id = p.id + INNER JOIN provisioner_jobs pj ON b.job_id = pj.id + INNER JOIN templates t ON p.template_id = t.id + WHERE (b.transition = 'start'::workspace_transition + AND pj.job_status IN ('succeeded'::provisioner_job_status)) + AND b.template_version_id = t.active_version_id + ORDER BY random() + LIMIT 1 FOR UPDATE OF p SKIP LOCKED) RETURNING w.id, w.name; -- name: InsertPresetPrebuild :one diff --git a/coderd/prebuilds/controller.go b/coderd/prebuilds/controller.go index 08a2e23c59..e4f6130961 100644 --- a/coderd/prebuilds/controller.go +++ b/coderd/prebuilds/controller.go @@ -300,7 +300,7 @@ func (c Controller) reconcileTemplate(ctx context.Context, template database.Tem var lastErr multierror.Error for _, state := range versionStates { - vlogger := logger.With(slog.F("template_version_id", state.TemplateVersionID)) + vlogger := logger.With(slog.F("template_version_id", state.TemplateVersionID), slog.F("preset_id", state.PresetID)) actions, err := c.calculateActions(innerCtx, template, state) if err != nil { @@ -334,14 +334,14 @@ func (c Controller) reconcileTemplate(ctx context.Context, template database.Tem // TODO: probably need to split these to have a transaction each... rolling back would lead to an // inconsistent state if 1 of n creations/deletions fail. for _, id := range actions.createIDs { - if err := c.createPrebuild(ownerCtx, db, id, template); err != nil { + if err := c.createPrebuild(ownerCtx, db, id, template, state.PresetID); err != nil { vlogger.Error(ctx, "failed to create prebuild", slog.Error(err)) lastErr.Errors = append(lastErr.Errors, err) } } for _, id := range actions.deleteIDs { - if err := c.deletePrebuild(ownerCtx, db, id, template); err != nil { + if err := c.deletePrebuild(ownerCtx, db, id, template, state.PresetID); err != nil { vlogger.Error(ctx, "failed to delete prebuild", slog.Error(err)) lastErr.Errors = append(lastErr.Errors, err) } @@ -360,7 +360,7 @@ func (c Controller) reconcileTemplate(ctx context.Context, template database.Tem return nil } -func (c Controller) createPrebuild(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template) error { +func (c Controller) createPrebuild(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template, presetID uuid.UUID) error { name, err := generateName() if err != nil { return xerrors.Errorf("failed to generate unique prebuild ID: %w", err) @@ -389,22 +389,24 @@ func (c Controller) createPrebuild(ctx context.Context, db database.Store, prebu return xerrors.Errorf("get workspace by ID: %w", err) } - c.logger.Info(ctx, "attempting to create prebuild", slog.F("name", name), slog.F("workspace_id", prebuildID.String())) + c.logger.Info(ctx, "attempting to create prebuild", slog.F("name", name), + slog.F("workspace_id", prebuildID.String()), slog.F("preset_id", presetID.String())) - return c.provision(ctx, db, prebuildID, template, database.WorkspaceTransitionStart, workspace) + return c.provision(ctx, db, prebuildID, template, presetID, database.WorkspaceTransitionStart, workspace) } -func (c Controller) deletePrebuild(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template) error { +func (c Controller) deletePrebuild(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template, presetID uuid.UUID) error { workspace, err := db.GetWorkspaceByID(ctx, prebuildID) if err != nil { return xerrors.Errorf("get workspace by ID: %w", err) } - c.logger.Info(ctx, "attempting to delete prebuild", slog.F("workspace_id", prebuildID.String())) + c.logger.Info(ctx, "attempting to delete prebuild", + slog.F("workspace_id", prebuildID.String()), slog.F("preset_id", presetID.String())) - return c.provision(ctx, db, prebuildID, template, database.WorkspaceTransitionDelete, workspace) + return c.provision(ctx, db, prebuildID, template, presetID, database.WorkspaceTransitionDelete, workspace) } -func (c Controller) provision(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template, transition database.WorkspaceTransition, workspace database.Workspace) error { +func (c Controller) provision(ctx context.Context, db database.Store, prebuildID uuid.UUID, template database.Template, presetID uuid.UUID, transition database.WorkspaceTransition, workspace database.Workspace) error { tvp, err := db.GetPresetParametersByTemplateVersionID(ctx, template.ActiveVersionID) if err != nil { return xerrors.Errorf("fetch preset details: %w", err) @@ -412,6 +414,11 @@ func (c Controller) provision(ctx context.Context, db database.Store, prebuildID var params []codersdk.WorkspaceBuildParameter for _, param := range tvp { + // TODO: don't fetch in the first place. + if param.TemplateVersionPresetID != presetID { + continue + } + params = append(params, codersdk.WorkspaceBuildParameter{ Name: param.Name, Value: param.Value, @@ -423,7 +430,8 @@ func (c Controller) provision(ctx context.Context, db database.Store, prebuildID Initiator(PrebuildOwnerUUID). ActiveVersion(). VersionID(template.ActiveVersionID). - MarkPrebuild() + MarkPrebuild(). + TemplateVersionPresetID(presetID) // We only inject the required params when the prebuild is being created. // This mirrors the behaviour of regular workspace deletion (see cli/delete.go). @@ -450,7 +458,8 @@ func (c Controller) provision(ctx context.Context, db database.Store, prebuildID } c.logger.Info(ctx, "prebuild job scheduled", slog.F("transition", transition), - slog.F("prebuild_id", prebuildID.String()), slog.F("job_id", provisionerJob.ID)) + slog.F("prebuild_id", prebuildID.String()), slog.F("preset_id", presetID.String()), + slog.F("job_id", provisionerJob.ID)) return nil }