Apr 7, 2025 · Mar 12, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.InsertPresetParameters(ctx, arg)
 }

 func (q *querier) InsertPresetPrebuild(ctx context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return database.TemplateVersionPresetPrebuild{}, err
 }
 return q.db.InsertPresetPrebuild(ctx, arg)
 }

 // TODO: We need to create a ProvisionerJob resource type
 func (q *querier) InsertProvisionerJob(ctx context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
 // if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go

 func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) database.TemplateVersionPreset {
 preset, err := db.InsertPreset(genCtx, database.InsertPresetParams{
 TemplateVersionID: takeFirst(seed.TemplateVersionID, uuid.New()),
 Name:              takeFirst(seed.Name, testutil.GetRandomName(t)),
 CreatedAt:         takeFirst(seed.CreatedAt, dbtime.Now()),
 TemplateVersionID:   takeFirst(seed.TemplateVersionID, uuid.New()),
 Name:                takeFirst(seed.Name, testutil.GetRandomName(t)),
 CreatedAt:           takeFirst(seed.CreatedAt, dbtime.Now()),
 DesiredInstances:    seed.DesiredInstances,
 InvalidateAfterSecs: seed.InvalidateAfterSecs,
 })
 require.NoError(t, err, "insert preset")
 return preset
 return parameters
 }

 func PresetPrebuild(t testing.TB, db database.Store, seed database.InsertPresetPrebuildParams) database.TemplateVersionPresetPrebuild {
 prebuild, err := db.InsertPresetPrebuild(genCtx, database.InsertPresetPrebuildParams{
 ID:                  takeFirst(seed.ID, uuid.New()),
 PresetID:            takeFirst(seed.PresetID, uuid.New()),
 DesiredInstances:    takeFirst(seed.DesiredInstances, 1),
 InvalidateAfterSecs: 0,
 })
 require.NoError(t, err, "insert preset prebuild")
 return prebuild
 }

 func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
 timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
 JobID:     takeFirst(seed.JobID, uuid.New()),
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return presetParameters, nil
 }

 func (*FakeQuerier) InsertPresetPrebuild(_ context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return database.TemplateVersionPresetPrebuild{}, err
 }

 return database.TemplateVersionPresetPrebuild{}, ErrUnimplemented
 }

 func (q *FakeQuerier) InsertProvisionerJob(_ context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
 if err := validateDatabaseType(arg); err != nil {
 return database.ProvisionerJob{}, err
diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/foreign_key_constraint.go b/coderd/database/foreign_key_constraint.go
diff --git a/coderd/database/migrations/000303_preset_prebuilds.up.sql b/coderd/database/migrations/000303_preset_prebuilds.up.sql
 CREATE TABLE template_version_preset_prebuilds
 (
 id                    UUID PRIMARY KEY,
 preset_id             UUID NOT NULL,
 desired_instances     INT  NOT NULL,
 invalidate_after_secs INT  NULL DEFAULT 0,

 -- Deletion should never occur, but if we allow it we should check no prebuilds exist attached to this preset first.
 FOREIGN KEY (preset_id) REFERENCES template_version_presets (id) ON DELETE CASCADE
 );
 ALTER TABLE template_version_presets
    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/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
 UpdatedAt:      now,
 CreatedBy:      tmpl.CreatedBy,
 })
 preset := dbgen.Preset(t, db, database.InsertPresetParams{
 TemplateVersionID: tmplVersion.ID,
 Name:              "preset",
 })
 desiredInstances := 1
 if opts != nil {
 desiredInstances = opts.DesiredInstances
 }
 dbgen.PresetPrebuild(t, db, database.InsertPresetPrebuildParams{
 PresetID:         preset.ID,
 DesiredInstances: int32(desiredInstances),
 preset := dbgen.Preset(t, db, database.InsertPresetParams{
 TemplateVersionID: tmplVersion.ID,
 Name:              "preset",
 DesiredInstances: sql.NullInt32{
 Int32: int32(desiredInstances),
 Valid: true,
 },
 })

 return extTmplVersion{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3310,13 +3310,6 @@ func (q *querier) InsertPresetParameters(ctx context.Context, arg database.Inser
		return q.db.InsertPresetParameters(ctx, arg)
		}

		func (q *querier) InsertPresetPrebuild(ctx context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return database.TemplateVersionPresetPrebuild{}, err
		}
		return q.db.InsertPresetPrebuild(ctx, arg)
		}

		// TODO: We need to create a ProvisionerJob resource type
		func (q *querier) InsertProvisionerJob(ctx context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
		// if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1160,9 +1160,11 @@ func TelemetryItem(t testing.TB, db database.Store, seed database.TelemetryItem)

		func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) database.TemplateVersionPreset {
		preset, err := db.InsertPreset(genCtx, database.InsertPresetParams{
		TemplateVersionID: takeFirst(seed.TemplateVersionID, uuid.New()),
		Name: takeFirst(seed.Name, testutil.GetRandomName(t)),
		CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
		TemplateVersionID: takeFirst(seed.TemplateVersionID, uuid.New()),
		Name: takeFirst(seed.Name, testutil.GetRandomName(t)),
		CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
		DesiredInstances: seed.DesiredInstances,
		InvalidateAfterSecs: seed.InvalidateAfterSecs,
		})
		require.NoError(t, err, "insert preset")
		return preset
Expand All		@@ -1179,17 +1181,6 @@ func PresetParameter(t testing.TB, db database.Store, seed database.InsertPreset
		return parameters
		}

		func PresetPrebuild(t testing.TB, db database.Store, seed database.InsertPresetPrebuildParams) database.TemplateVersionPresetPrebuild {
		prebuild, err := db.InsertPresetPrebuild(genCtx, database.InsertPresetPrebuildParams{
		ID: takeFirst(seed.ID, uuid.New()),
		PresetID: takeFirst(seed.PresetID, uuid.New()),
		DesiredInstances: takeFirst(seed.DesiredInstances, 1),
		InvalidateAfterSecs: 0,
		})
		require.NoError(t, err, "insert preset prebuild")
		return prebuild
		}

		func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
		timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
		JobID: takeFirst(seed.JobID, uuid.New()),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8566,15 +8566,6 @@ func (q *FakeQuerier) InsertPresetParameters(_ context.Context, arg database.Ins
		return presetParameters, nil
		}

		func (*FakeQuerier) InsertPresetPrebuild(_ context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
		err := validateDatabaseType(arg)
		if err != nil {
		return database.TemplateVersionPresetPrebuild{}, err
		}

		return database.TemplateVersionPresetPrebuild{}, ErrUnimplemented
		}

		func (q *FakeQuerier) InsertProvisionerJob(_ context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
		if err := validateDatabaseType(arg); err != nil {
		return database.ProvisionerJob{}, err
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,13 +1,6 @@
		CREATE TABLE template_version_preset_prebuilds
		(
		id UUID PRIMARY KEY,
		preset_id UUID NOT NULL,
		desired_instances INT NOT NULL,
		invalidate_after_secs INT NULL DEFAULT 0,

		-- Deletion should never occur, but if we allow it we should check no prebuilds exist attached to this preset first.
		FOREIGN KEY (preset_id) REFERENCES template_version_presets (id) ON DELETE CASCADE
		);
		ALTER TABLE template_version_presets
		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);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3511,17 +3511,17 @@ func TestGetPresetsBackoff(t *testing.T) {
		UpdatedAt: now,
		CreatedBy: tmpl.CreatedBy,
		})
		preset := dbgen.Preset(t, db, database.InsertPresetParams{
		TemplateVersionID: tmplVersion.ID,
		Name: "preset",
		})
		desiredInstances := 1
		if opts != nil {
		desiredInstances = opts.DesiredInstances
		}
		dbgen.PresetPrebuild(t, db, database.InsertPresetPrebuildParams{
		PresetID: preset.ID,
		DesiredInstances: int32(desiredInstances),
		preset := dbgen.Preset(t, db, database.InsertPresetParams{
		TemplateVersionID: tmplVersion.ID,
		Name: "preset",
		DesiredInstances: sql.NullInt32{
		Int32: int32(desiredInstances),
		Valid: true,
		},
		})

		return extTmplVersion{
Expand Down