Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

fix: implement prebuild schedules methods for dbmem#18469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
evgeniy-scherbina merged 2 commits intomainfromyevhenii/prebuilds-scheduling-fix
Jun 20, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletionscoderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,8 +999,7 @@ func (s *MethodTestSuite) TestOrganization() {
PresetID: preset.ID,
}
check.Args(arg).
Asserts(rbac.ResourceTemplate, policy.ActionUpdate).
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
}))
s.Run("DeleteOrganizationMember", s.Subtest(func(db database.Store, check *expects) {
o := dbgen.Organization(s.T(), db, database.Organization{})
Expand DownExpand Up@@ -4942,8 +4941,7 @@ func (s *MethodTestSuite) TestPrebuilds() {
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)
Returns([]database.TemplateVersionPresetPrebuildSchedule{})
}))
s.Run("GetPresetsByTemplateVersionID", s.Subtest(func(db database.Store, check *expects) {
ctx := context.Background()
Expand Down
51 changes: 49 additions & 2 deletionscoderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ func New() database.Store {
parameterSchemas: make([]database.ParameterSchema, 0),
presets: make([]database.TemplateVersionPreset, 0),
presetParameters: make([]database.TemplateVersionPresetParameter, 0),
presetPrebuildSchedules: make([]database.TemplateVersionPresetPrebuildSchedule, 0),
provisionerDaemons: make([]database.ProvisionerDaemon, 0),
provisionerJobs: make([]database.ProvisionerJob, 0),
provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
Expand DownExpand Up@@ -299,6 +300,7 @@ type data struct {
telemetryItems []database.TelemetryItem
presets []database.TemplateVersionPreset
presetParameters []database.TemplateVersionPresetParameter
presetPrebuildSchedules []database.TemplateVersionPresetPrebuildSchedule
}

func tryPercentileCont(fs []float64, p float64) float64 {
Expand DownExpand Up@@ -2779,7 +2781,42 @@ func (q *FakeQuerier) GetAPIKeysLastUsedAfter(_ context.Context, after time.Time
}

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

var activeSchedules []database.TemplateVersionPresetPrebuildSchedule

// Create a map of active template version IDs for quick lookup
activeTemplateVersions := make(map[uuid.UUID]bool)
for _, template := range q.templates {
if !template.Deleted && template.Deprecated == "" {
activeTemplateVersions[template.ActiveVersionID] = true
}
}

// Create a map of presets for quick lookup
presetMap := make(map[uuid.UUID]database.TemplateVersionPreset)
for _, preset := range q.presets {
presetMap[preset.ID] = preset
}

// Filter preset prebuild schedules to only include those for active template versions
for _, schedule := range q.presetPrebuildSchedules {
// Look up the preset using the map
preset, exists := presetMap[schedule.PresetID]
if !exists {
continue
}

// Check if preset's template version is active
if !activeTemplateVersions[preset.TemplateVersionID] {
continue
}

activeSchedules = append(activeSchedules, schedule)
}

return activeSchedules, nil
}

// nolint:revive // It's not a control flag, it's a filter.
Expand DownExpand Up@@ -9201,7 +9238,17 @@ func (q *FakeQuerier) InsertPresetPrebuildSchedule(ctx context.Context, arg data
return database.TemplateVersionPresetPrebuildSchedule{}, err
}

return database.TemplateVersionPresetPrebuildSchedule{}, ErrUnimplemented
q.mutex.Lock()
defer q.mutex.Unlock()

presetPrebuildSchedule := database.TemplateVersionPresetPrebuildSchedule{
ID: uuid.New(),
PresetID: arg.PresetID,
CronExpression: arg.CronExpression,
DesiredInstances: arg.DesiredInstances,
}
q.presetPrebuildSchedules = append(q.presetPrebuildSchedules, presetPrebuildSchedule)
return presetPrebuildSchedule, nil
}

func (q *FakeQuerier) InsertProvisionerJob(_ context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp