Jun 19, 2025 · May 29, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetAPIKeysLastUsedAfter)(ctx, lastUsed)
 }

 func (q *querier) GetActivePresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate.All()); err != nil {
 return nil, err
 }
 return q.db.GetActivePresetPrebuildSchedules(ctx)
 }

 func (q *querier) GetActiveUserCount(ctx context.Context, includeSystem bool) (int64, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return 0, err
 return q.db.InsertPresetParameters(ctx, arg)
 }

 func (q *querier) InsertPresetPrebuildSchedule(ctx context.Context, arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule, error) {
 err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTemplate)
 if err != nil {
 return database.TemplateVersionPresetPrebuildSchedule{}, err
 }

 return q.db.InsertPresetPrebuildSchedule(ctx, arg)
 }

 func (q *querier) InsertProvisionerJob(ctx context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
 // TODO: Remove this once we have a proper rbac check for provisioner jobs.
 // Details in https://github.com/coder/coder/issues/16160
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 }
 check.Args(insertPresetParametersParams).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
 }))
 s.Run("InsertPresetPrebuildSchedule", s.Subtest(func(db database.Store, check *expects) {
 org := dbgen.Organization(s.T(), db, database.Organization{})
 user := dbgen.User(s.T(), db, database.User{})
 template := dbgen.Template(s.T(), db, database.Template{
 CreatedBy:      user.ID,
 OrganizationID: org.ID,
 })
 templateVersion := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
 TemplateID:     uuid.NullUUID{UUID: template.ID, Valid: true},
 OrganizationID: org.ID,
 CreatedBy:      user.ID,
 })
 preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
 TemplateVersionID: templateVersion.ID,
 Name:              "test",
 })
 arg := database.InsertPresetPrebuildScheduleParams{
 PresetID: preset.ID,
 }
 check.Args(arg).
 Asserts(rbac.ResourceTemplate, policy.ActionUpdate).
 ErrorsWithInMemDB(dbmem.ErrUnimplemented)
 }))
 s.Run("DeleteOrganizationMember", s.Subtest(func(db database.Store, check *expects) {
 o := dbgen.Organization(s.T(), db, database.Organization{})
 u := dbgen.User(s.T(), db, database.User{})
 Asserts(template.RBACObject(), policy.ActionRead).
 Returns(insertedParameters)
 }))
 s.Run("GetActivePresetPrebuildSchedules", s.Subtest(func(db database.Store, check *expects) {
 check.Args().
 Asserts(rbac.ResourceTemplate.All(), policy.ActionRead).
 Returns([]database.TemplateVersionPresetPrebuildSchedule{}).
 ErrorsWithInMemDB(dbmem.ErrUnimplemented)
 }))
 s.Run("GetPresetsByTemplateVersionID", s.Subtest(func(db database.Store, check *expects) {
 ctx := context.Background()
 org := dbgen.Organization(s.T(), db, database.Organization{})
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
 CreatedAt:           version.CreatedAt,
 DesiredInstances:    preset.DesiredInstances,
 InvalidateAfterSecs: preset.InvalidateAfterSecs,
 SchedulingTimezone:  preset.SchedulingTimezone,
 })
 }

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 CreatedAt:           takeFirst(seed.CreatedAt, dbtime.Now()),
 DesiredInstances:    seed.DesiredInstances,
 InvalidateAfterSecs: seed.InvalidateAfterSecs,
 SchedulingTimezone:  seed.SchedulingTimezone,
 })
 require.NoError(t, err, "insert preset")
 return preset
 }

 func PresetPrebuildSchedule(t testing.TB, db database.Store, seed database.InsertPresetPrebuildScheduleParams) database.TemplateVersionPresetPrebuildSchedule {
 schedule, err := db.InsertPresetPrebuildSchedule(genCtx, database.InsertPresetPrebuildScheduleParams{
 PresetID:         takeFirst(seed.PresetID, uuid.New()),
 CronExpression:   takeFirst(seed.CronExpression, "* 9-18 * * 1-5"),
 DesiredInstances: takeFirst(seed.DesiredInstances, 1),
 })
 require.NoError(t, err, "insert preset prebuild schedule")
 return schedule
 }

 func PresetParameter(t testing.TB, db database.Store, seed database.InsertPresetParametersParams) []database.TemplateVersionPresetParameter {
 parameters, err := db.InsertPresetParameters(genCtx, database.InsertPresetParametersParams{
 TemplateVersionPresetID: takeFirst(seed.TemplateVersionPresetID, uuid.New()),
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return apiKeys, nil
 }

 func (q *FakeQuerier) GetActivePresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule, error) {
 return nil, ErrUnimplemented
 }

 // nolint:revive // It's not a control flag, it's a filter.
 func (q *FakeQuerier) GetActiveUserCount(_ context.Context, includeSystem bool) (int64, error) {
 q.mutex.RLock()
 return presetParameters, nil
 }

 func (q *FakeQuerier) InsertPresetPrebuildSchedule(ctx context.Context, arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return database.TemplateVersionPresetPrebuildSchedule{}, err
 }

 return database.TemplateVersionPresetPrebuildSchedule{}, 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/000339_add_scheduling_to_presets.down.sql b/coderd/database/migrations/000339_add_scheduling_to_presets.down.sql
 -- Drop the prebuild schedules table
 DROP TABLE template_version_preset_prebuild_schedules;

 -- Remove scheduling_timezone column from template_version_presets table
 ALTER TABLE template_version_presets
 DROP COLUMN scheduling_timezone;
diff --git a/coderd/database/migrations/000339_add_scheduling_to_presets.up.sql b/coderd/database/migrations/000339_add_scheduling_to_presets.up.sql
 -- Add scheduling_timezone column to template_version_presets table
 ALTER TABLE template_version_presets
 ADD COLUMN scheduling_timezone TEXT DEFAULT '' NOT NULL;

 -- Add table for prebuild schedules
 CREATE TABLE template_version_preset_prebuild_schedules (
    id UUID PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
    preset_id UUID NOT NULL,
    cron_expression TEXT NOT NULL,
    desired_instances INTEGER NOT NULL,
    FOREIGN KEY (preset_id) REFERENCES template_version_presets (id) ON DELETE CASCADE
 );
diff --git a/coderd/database/migrations/testdata/fixtures/000339_add_scheduling_to_presets.up.sql b/coderd/database/migrations/testdata/fixtures/000339_add_scheduling_to_presets.up.sql
 INSERT INTO
 template_version_preset_prebuild_schedules (
 id,
 preset_id,
 cron_expression,
 desired_instances
 )
 VALUES (
 'e387cac1-9bf1-4fb6-8a34-db8cfb750dd0',
 '28b42cc0-c4fe-4907-a0fe-e4d20f1e9bfe',
 '* 8-18 * * 1-5',
 1
 );
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1686,6 +1686,13 @@ func (q *querier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed time.Tim
		return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetAPIKeysLastUsedAfter)(ctx, lastUsed)
		}

		func (q *querier) GetActivePresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate.All()); err != nil {
		return nil, err
		}
		return q.db.GetActivePresetPrebuildSchedules(ctx)
		}

		func (q *querier) GetActiveUserCount(ctx context.Context, includeSystem bool) (int64, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return 0, err
Expand DownExpand Up		@@ -3661,6 +3668,15 @@ func (q *querier) InsertPresetParameters(ctx context.Context, arg database.Inser
		return q.db.InsertPresetParameters(ctx, arg)
		}

		func (q *querier) InsertPresetPrebuildSchedule(ctx context.Context, arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule, error) {
		err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTemplate)
		if err != nil {
		return database.TemplateVersionPresetPrebuildSchedule{}, err
		}

		return q.db.InsertPresetPrebuildSchedule(ctx, arg)
		}

		func (q *querier) InsertProvisionerJob(ctx context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
		// TODO: Remove this once we have a proper rbac check for provisioner jobs.
		// Details in https://github.com/coder/coder/issues/16160
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -979,6 +979,29 @@ func (s *MethodTestSuite) TestOrganization() {
		}
		check.Args(insertPresetParametersParams).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
		}))
		s.Run("InsertPresetPrebuildSchedule", s.Subtest(func(db database.Store, check *expects) {
		org := dbgen.Organization(s.T(), db, database.Organization{})
		user := dbgen.User(s.T(), db, database.User{})
		template := dbgen.Template(s.T(), db, database.Template{
		CreatedBy: user.ID,
		OrganizationID: org.ID,
		})
		templateVersion := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
		TemplateID: uuid.NullUUID{UUID: template.ID, Valid: true},
		OrganizationID: org.ID,
		CreatedBy: user.ID,
		})
		preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
		TemplateVersionID: templateVersion.ID,
		Name: "test",
		})
		arg := database.InsertPresetPrebuildScheduleParams{
		PresetID: preset.ID,
		}
		check.Args(arg).
		Asserts(rbac.ResourceTemplate, policy.ActionUpdate).
		ErrorsWithInMemDB(dbmem.ErrUnimplemented)
		}))
		s.Run("DeleteOrganizationMember", s.Subtest(func(db database.Store, check *expects) {
		o := dbgen.Organization(s.T(), db, database.Organization{})
		u := dbgen.User(s.T(), db, database.User{})
Expand DownExpand Up		@@ -4916,6 +4939,12 @@ func (s *MethodTestSuite) TestPrebuilds() {
		Asserts(template.RBACObject(), policy.ActionRead).
		Returns(insertedParameters)
		}))
		s.Run("GetActivePresetPrebuildSchedules", s.Subtest(func(db database.Store, check *expects) {
		check.Args().
		Asserts(rbac.ResourceTemplate.All(), policy.ActionRead).
		Returns([]database.TemplateVersionPresetPrebuildSchedule{}).
		ErrorsWithInMemDB(dbmem.ErrUnimplemented)
		}))
		s.Run("GetPresetsByTemplateVersionID", s.Subtest(func(db database.Store, check *expects) {
		ctx := context.Background()
		org := dbgen.Organization(s.T(), db, database.Organization{})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -415,6 +415,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
		CreatedAt: version.CreatedAt,
		DesiredInstances: preset.DesiredInstances,
		InvalidateAfterSecs: preset.InvalidateAfterSecs,
		SchedulingTimezone: preset.SchedulingTimezone,
		})
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1302,11 +1302,22 @@ func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) d
		CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
		DesiredInstances: seed.DesiredInstances,
		InvalidateAfterSecs: seed.InvalidateAfterSecs,
		SchedulingTimezone: seed.SchedulingTimezone,
		})
		require.NoError(t, err, "insert preset")
		return preset
		}

		func PresetPrebuildSchedule(t testing.TB, db database.Store, seed database.InsertPresetPrebuildScheduleParams) database.TemplateVersionPresetPrebuildSchedule {
dannykopping marked this conversation as resolved. Show resolvedHide resolved
		schedule, err := db.InsertPresetPrebuildSchedule(genCtx, database.InsertPresetPrebuildScheduleParams{
		PresetID: takeFirst(seed.PresetID, uuid.New()),
		CronExpression: takeFirst(seed.CronExpression, "* 9-18 * * 1-5"),
		DesiredInstances: takeFirst(seed.DesiredInstances, 1),
		})
		require.NoError(t, err, "insert preset prebuild schedule")
		return schedule
		}

		func PresetParameter(t testing.TB, db database.Store, seed database.InsertPresetParametersParams) []database.TemplateVersionPresetParameter {
		parameters, err := db.InsertPresetParameters(genCtx, database.InsertPresetParametersParams{
		TemplateVersionPresetID: takeFirst(seed.TemplateVersionPresetID, uuid.New()),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2778,6 +2778,10 @@ func (q *FakeQuerier) GetAPIKeysLastUsedAfter(_ context.Context, after time.Time
		return apiKeys, nil
		}

		func (q *FakeQuerier) GetActivePresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule, error) {
		return nil, ErrUnimplemented
		}

		// nolint:revive // It's not a control flag, it's a filter.
		func (q *FakeQuerier) GetActiveUserCount(_ context.Context, includeSystem bool) (int64, error) {
		q.mutex.RLock()
Expand DownExpand Up		@@ -9191,6 +9195,15 @@ func (q *FakeQuerier) InsertPresetParameters(_ context.Context, arg database.Ins
		return presetParameters, nil
		}

		func (q *FakeQuerier) InsertPresetPrebuildSchedule(ctx context.Context, arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule, error) {
		err := validateDatabaseType(arg)
		if err != nil {
		return database.TemplateVersionPresetPrebuildSchedule{}, err
		}

		return database.TemplateVersionPresetPrebuildSchedule{}, 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
		@@ -0,0 +1,6 @@
		-- Drop the prebuild schedules table
		DROP TABLE template_version_preset_prebuild_schedules;

		-- Remove scheduling_timezone column from template_version_presets table
		ALTER TABLE template_version_presets
		DROP COLUMN scheduling_timezone;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,12 @@
		-- Add scheduling_timezone column to template_version_presets table
		ALTER TABLE template_version_presets
		ADD COLUMN scheduling_timezone TEXT DEFAULT '' NOT NULL;

		-- Add table for prebuild schedules
		CREATE TABLE template_version_preset_prebuild_schedules (
		id UUID PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
		preset_id UUID NOT NULL,
		cron_expression TEXT NOT NULL,
		desired_instances INTEGER NOT NULL,
		FOREIGN KEY (preset_id) REFERENCES template_version_presets (id) ON DELETE CASCADE
		);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,13 @@
		INSERT INTO
		template_version_preset_prebuild_schedules (
		id,
		preset_id,
		cron_expression,
		desired_instances
		)
		VALUES (
		'e387cac1-9bf1-4fb6-8a34-db8cfb750dd0',
		'28b42cc0-c4fe-4907-a0fe-e4d20f1e9bfe',
		'* 8-18 * * 1-5',
		1
		);