Commitf973ca6

committed

fix bugs

1 parent4f29df2 commitf973ca6Copy full SHA for f973ca6

File tree

+34

-4

lines changed

+34

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2268,7 +2268,10 @@ func (q *querier) GetPresetParametersByTemplateVersionID(ctx context.Context, ar`
`2268`	`2268`	`}`
`2269`	`2269`
`2270`	`2270`	`func (q*querier)GetPresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule,error) {`
`2271`		`-panic("not implemented")`
	`2271`	`+iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceTemplate.All());err!=nil {`
	`2272`	`+returnnil,err`
	`2273`	`+}`
	`2274`	`+returnq.db.GetPresetPrebuildSchedules(ctx)`
`2272`	`2275`	`}`
`2273`	`2276`
`2274`	`2277`	`func (q*querier)GetPresetsAtFailureLimit(ctx context.Context,hardLimitint64) ([]database.GetPresetsAtFailureLimitRow,error) {`

Lines changed: 15 additions & 0 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package prebuilds`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"encoding/json"`
	`5`	`+"fmt"`
`4`	`6`	`"time"`
`5`	`7`
`6`	`8`	`"github.com/google/uuid"`
`@@ -51,10 +53,19 @@ func (s GlobalSnapshot) FilterByPreset(presetID uuid.UUID) (*PresetSnapshot, err`
`51`	`53`	`returnnil,xerrors.Errorf("no preset found with ID %q",presetID)`
`52`	`54`	`}`
`53`	`55`
`54`		`-prebuildSchedules:=slice.Filter(s.PrebuildSchedules,func(preset database.TemplateVersionPresetPrebuildSchedule)bool {`
`55`		`-returnpreset.ID==presetID`
	`56`	`+globalPrebuildSchedulesInJSON,err:=json.Marshal(s.PrebuildSchedules)`
	`57`	`+iferr!=nil {`
	`58`	`+returnnil,err`
	`59`	`+}`
	`60`	`+prebuildSchedules:=slice.Filter(s.PrebuildSchedules,func(schedule database.TemplateVersionPresetPrebuildSchedule)bool {`
	`61`	`+returnschedule.PresetID==presetID`
`56`	`62`	`})`
`57`	`63`
	`64`	`+localPrebuildSchedulesInJSON,err:=json.Marshal(prebuildSchedules)`
	`65`	`+iferr!=nil {`
	`66`	`+returnnil,err`
	`67`	`+}`
	`68`	`+q`
`58`	`69`	`// Only include workspaces that have successfully started`
`59`	`70`	`running:=slice.Filter(s.RunningPrebuilds,func(prebuild database.GetRunningPrebuiltWorkspacesRow)bool {`
`60`	`71`	`if!prebuild.CurrentPresetID.Valid {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,8 @@ func (p PresetSnapshot) CalculateState() *ReconciliationState {`
`151`	`151`	`expired=int32(len(p.Expired))`
`152`	`152`
`153`	`153`	`ifp.isActive() {`
`154`		`-desired,err:=p.calculateDesiredInstances(time.Now())`
	`154`	`+varerrerror`
	`155`	`+desired,err=p.calculateDesiredInstances(time.Now())`
`155`	`156`	`iferr!=nil {`
`156`	`157`	`// TODO: handle error`
`157`	`158`	`}`

Comments

(0)