Skip to content

Commit f973ca6

Browse files
fix bugs
1 parent 4f29df2 commit f973ca6

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

coderd/database/dbauthz/dbauthz.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2268,7 +2268,10 @@ func (q *querier) GetPresetParametersByTemplateVersionID(ctx context.Context, ar
22682268
}
22692269

22702270
func (q *querier) GetPresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule, error) {
2271-
panic("not implemented")
2271+
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate.All()); err != nil {
2272+
return nil, err
2273+
}
2274+
return q.db.GetPresetPrebuildSchedules(ctx)
22722275
}
22732276

22742277
func (q *querier) GetPresetsAtFailureLimit(ctx context.Context, hardLimit int64) ([]database.GetPresetsAtFailureLimitRow, error) {

coderd/database/dbmock/dbmock.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/prebuilds/global_snapshot.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package prebuilds
22

33
import (
4+
"encoding/json"
5+
"fmt"
46
"time"
57

68
"github.com/google/uuid"
@@ -51,10 +53,19 @@ func (s GlobalSnapshot) FilterByPreset(presetID uuid.UUID) (*PresetSnapshot, err
5153
return nil, xerrors.Errorf("no preset found with ID %q", presetID)
5254
}
5355

54-
prebuildSchedules := slice.Filter(s.PrebuildSchedules, func(preset database.TemplateVersionPresetPrebuildSchedule) bool {
55-
return preset.ID == presetID
56+
globalPrebuildSchedulesInJSON, err := json.Marshal(s.PrebuildSchedules)
57+
if err != nil {
58+
return nil, err
59+
}
60+
prebuildSchedules := slice.Filter(s.PrebuildSchedules, func(schedule database.TemplateVersionPresetPrebuildSchedule) bool {
61+
return schedule.PresetID == presetID
5662
})
5763

64+
localPrebuildSchedulesInJSON, err := json.Marshal(prebuildSchedules)
65+
if err != nil {
66+
return nil, err
67+
}
68+
q
5869
// Only include workspaces that have successfully started
5970
running := slice.Filter(s.RunningPrebuilds, func(prebuild database.GetRunningPrebuiltWorkspacesRow) bool {
6071
if !prebuild.CurrentPresetID.Valid {

coderd/prebuilds/preset_snapshot.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ func (p PresetSnapshot) CalculateState() *ReconciliationState {
151151
expired = int32(len(p.Expired))
152152

153153
if p.isActive() {
154-
desired, err := p.calculateDesiredInstances(time.Now())
154+
var err error
155+
desired, err = p.calculateDesiredInstances(time.Now())
155156
if err != nil {
156157
// TODO: handle error
157158
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy