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

Commit4af1d33

Browse files
test: integration test in-progress
1 parentbcfbb04 commit4af1d33

File tree

8 files changed

+176
-67
lines changed

8 files changed

+176
-67
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -512,9 +512,9 @@ func As(ctx context.Context, actor rbac.Subject) context.Context {
512512
// running the insertFunc. The insertFunc is expected to return the object that
513513
// was inserted.
514514
funcinsert[
515-
ObjectTypeany,
516-
ArgumentTypeany,
517-
Insertfunc(ctx context.Context,argArgumentType) (ObjectType,error),
515+
ObjectTypeany,
516+
ArgumentTypeany,
517+
Insertfunc(ctx context.Context,argArgumentType) (ObjectType,error),
518518
](
519519
logger slog.Logger,
520520
authorizer rbac.Authorizer,
@@ -525,9 +525,9 @@ func insert[
525525
}
526526

527527
funcinsertWithAction[
528-
ObjectTypeany,
529-
ArgumentTypeany,
530-
Insertfunc(ctx context.Context,argArgumentType) (ObjectType,error),
528+
ObjectTypeany,
529+
ArgumentTypeany,
530+
Insertfunc(ctx context.Context,argArgumentType) (ObjectType,error),
531531
](
532532
logger slog.Logger,
533533
authorizer rbac.Authorizer,
@@ -554,10 +554,10 @@ func insertWithAction[
554554
}
555555

556556
funcdeleteQ[
557-
ObjectType rbac.Objecter,
558-
ArgumentTypeany,
559-
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
560-
Deletefunc(ctx context.Context,argArgumentType)error,
557+
ObjectType rbac.Objecter,
558+
ArgumentTypeany,
559+
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
560+
Deletefunc(ctx context.Context,argArgumentType)error,
561561
](
562562
logger slog.Logger,
563563
authorizer rbac.Authorizer,
@@ -569,10 +569,10 @@ func deleteQ[
569569
}
570570

571571
funcupdateWithReturn[
572-
ObjectType rbac.Objecter,
573-
ArgumentTypeany,
574-
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
575-
UpdateQueryfunc(ctx context.Context,argArgumentType) (ObjectType,error),
572+
ObjectType rbac.Objecter,
573+
ArgumentTypeany,
574+
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
575+
UpdateQueryfunc(ctx context.Context,argArgumentType) (ObjectType,error),
576576
](
577577
logger slog.Logger,
578578
authorizer rbac.Authorizer,
@@ -583,10 +583,10 @@ func updateWithReturn[
583583
}
584584

585585
funcupdate[
586-
ObjectType rbac.Objecter,
587-
ArgumentTypeany,
588-
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
589-
Execfunc(ctx context.Context,argArgumentType)error,
586+
ObjectType rbac.Objecter,
587+
ArgumentTypeany,
588+
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
589+
Execfunc(ctx context.Context,argArgumentType)error,
590590
](
591591
logger slog.Logger,
592592
authorizer rbac.Authorizer,
@@ -604,9 +604,9 @@ func update[
604604
// user cannot read the resource. This is because the resource details are
605605
// required to run a proper authorization check.
606606
funcfetchWithAction[
607-
ArgumentTypeany,
608-
ObjectType rbac.Objecter,
609-
DatabaseFuncfunc(ctx context.Context,argArgumentType) (ObjectType,error),
607+
ArgumentTypeany,
608+
ObjectType rbac.Objecter,
609+
DatabaseFuncfunc(ctx context.Context,argArgumentType) (ObjectType,error),
610610
](
611611
logger slog.Logger,
612612
authorizer rbac.Authorizer,
@@ -637,9 +637,9 @@ func fetchWithAction[
637637
}
638638

639639
funcfetch[
640-
ArgumentTypeany,
641-
ObjectType rbac.Objecter,
642-
DatabaseFuncfunc(ctx context.Context,argArgumentType) (ObjectType,error),
640+
ArgumentTypeany,
641+
ObjectType rbac.Objecter,
642+
DatabaseFuncfunc(ctx context.Context,argArgumentType) (ObjectType,error),
643643
](
644644
logger slog.Logger,
645645
authorizer rbac.Authorizer,
@@ -652,10 +652,10 @@ func fetch[
652652
// from SQL 'exec' functions which only return an error.
653653
// See fetchAndQuery for more information.
654654
funcfetchAndExec[
655-
ObjectType rbac.Objecter,
656-
ArgumentTypeany,
657-
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
658-
Execfunc(ctx context.Context,argArgumentType)error,
655+
ObjectType rbac.Objecter,
656+
ArgumentTypeany,
657+
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
658+
Execfunc(ctx context.Context,argArgumentType)error,
659659
](
660660
logger slog.Logger,
661661
authorizer rbac.Authorizer,
@@ -678,10 +678,10 @@ func fetchAndExec[
678678
// **before** the query runs. The returns from the fetch are only used to
679679
// assert rbac. The final return of this function comes from the Query function.
680680
funcfetchAndQuery[
681-
ObjectType rbac.Objecter,
682-
ArgumentTypeany,
683-
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
684-
Queryfunc(ctx context.Context,argArgumentType) (ObjectType,error),
681+
ObjectType rbac.Objecter,
682+
ArgumentTypeany,
683+
Fetchfunc(ctx context.Context,argArgumentType) (ObjectType,error),
684+
Queryfunc(ctx context.Context,argArgumentType) (ObjectType,error),
685685
](
686686
logger slog.Logger,
687687
authorizer rbac.Authorizer,
@@ -715,9 +715,9 @@ func fetchAndQuery[
715715
// fetchWithPostFilter is like fetch, but works with lists of objects.
716716
// SQL filters are much more optimal.
717717
funcfetchWithPostFilter[
718-
ArgumentTypeany,
719-
ObjectType rbac.Objecter,
720-
DatabaseFuncfunc(ctx context.Context,argArgumentType) ([]ObjectType,error),
718+
ArgumentTypeany,
719+
ObjectType rbac.Objecter,
720+
DatabaseFuncfunc(ctx context.Context,argArgumentType) ([]ObjectType,error),
721721
](
722722
authorizer rbac.Authorizer,
723723
action policy.Action,
@@ -3625,7 +3625,7 @@ func (q *querier) InsertPresetParameters(ctx context.Context, arg database.Inser
36253625
returnq.db.InsertPresetParameters(ctx,arg)
36263626
}
36273627

3628-
func (q*querier)InsertPresetPrebuildSchedule(ctx context.Context,arg database.InsertPresetPrebuildScheduleParams) ([]database.TemplateVersionPresetPrebuildSchedule,error) {
3628+
func (q*querier)InsertPresetPrebuildSchedule(ctx context.Context,arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule,error) {
36293629
err:=q.authorizeContext(ctx,policy.ActionUpdate,rbac.ResourceTemplate)
36303630
iferr!=nil {
36313631
returnnil,err

‎coderd/database/dbgen/dbgen.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,11 +1259,23 @@ func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) d
12591259
CreatedAt:takeFirst(seed.CreatedAt,dbtime.Now()),
12601260
DesiredInstances:seed.DesiredInstances,
12611261
InvalidateAfterSecs:seed.InvalidateAfterSecs,
1262+
AutoscalingEnabled:seed.AutoscalingEnabled,
1263+
AutoscalingTimezone:seed.AutoscalingTimezone,
12621264
})
12631265
require.NoError(t,err,"insert preset")
12641266
returnpreset
12651267
}
12661268

1269+
funcPresetPrebuildSchedule(t testing.TB,db database.Store,seed database.InsertPresetPrebuildScheduleParams) database.TemplateVersionPresetPrebuildSchedule {
1270+
schedule,err:=db.InsertPresetPrebuildSchedule(genCtx, database.InsertPresetPrebuildScheduleParams{
1271+
PresetID:seed.PresetID,
1272+
CronExpression:seed.CronExpression,
1273+
Instances:seed.Instances,
1274+
})
1275+
require.NoError(t,err,"insert preset")
1276+
returnschedule
1277+
}
1278+
12671279
funcPresetParameter(t testing.TB,db database.Store,seed database.InsertPresetParametersParams) []database.TemplateVersionPresetParameter {
12681280
parameters,err:=db.InsertPresetParameters(genCtx, database.InsertPresetParametersParams{
12691281
TemplateVersionPresetID:takeFirst(seed.TemplateVersionPresetID,uuid.New()),

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9160,7 +9160,7 @@ func (q *FakeQuerier) InsertPresetParameters(_ context.Context, arg database.Ins
91609160
returnpresetParameters,nil
91619161
}
91629162

9163-
func (q*FakeQuerier)InsertPresetPrebuildSchedule(ctx context.Context,arg database.InsertPresetPrebuildScheduleParams) ([]database.TemplateVersionPresetPrebuildSchedule,error) {
9163+
func (q*FakeQuerier)InsertPresetPrebuildSchedule(ctx context.Context,arg database.InsertPresetPrebuildScheduleParams) (database.TemplateVersionPresetPrebuildSchedule,error) {
91649164
err:=validateDatabaseType(arg)
91659165
iferr!=nil {
91669166
returnnil,err

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 11 additions & 27 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/presets.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SELECT
2929
unnest(@values ::TEXT[])
3030
RETURNING*;
3131

32-
-- name: InsertPresetPrebuildSchedule :many
32+
-- name: InsertPresetPrebuildSchedule :one
3333
INSERT INTO template_version_preset_prebuild_schedules (
3434
preset_id,
3535
cron_expression,

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,91 @@ func TestMultiplePresetsPerTemplateVersion(t *testing.T) {
521521
}
522522
}
523523

524+
funcTestMultiplePresetsPerTemplateVersionV2(t*testing.T) {
525+
t.Parallel()
526+
527+
if!dbtestutil.WillUsePostgres() {
528+
t.Skip("This test requires postgres")
529+
}
530+
531+
//prebuildLatestTransition := database.WorkspaceTransitionStart
532+
//prebuildJobStatus := database.ProvisionerJobStatusRunning
533+
templateDeleted:=false
534+
535+
clock:=quartz.NewMock(t)
536+
ctx:=testutil.Context(t,testutil.WaitShort)
537+
cfg:= codersdk.PrebuildsConfig{}
538+
logger:=slogtest.Make(
539+
t,&slogtest.Options{IgnoreErrors:true},
540+
).Leveled(slog.LevelDebug)
541+
db,pubSub:=dbtestutil.NewDB(t)
542+
controller:=prebuilds.NewStoreReconciler(db,pubSub,cfg,logger,quartz.NewMock(t),prometheus.NewRegistry(),newNoopEnqueuer())
543+
544+
ownerID:=uuid.New()
545+
dbgen.User(t,db, database.User{
546+
ID:ownerID,
547+
})
548+
org,template:=setupTestDBTemplate(t,db,ownerID,templateDeleted)
549+
templateVersionID:=setupTestDBTemplateVersion(
550+
ctx,
551+
t,
552+
clock,
553+
db,
554+
pubSub,
555+
org.ID,
556+
ownerID,
557+
template.ID,
558+
)
559+
preset:=setupTestDBPresetWithAutoscaling(
560+
t,
561+
db,
562+
templateVersionID,
563+
4,
564+
uuid.New().String(),
565+
true,
566+
"UTC",
567+
)
568+
preset2:=setupTestDBPresetWithAutoscaling(
569+
t,
570+
db,
571+
templateVersionID,
572+
10,
573+
uuid.New().String(),
574+
true,
575+
"UTC",
576+
)
577+
578+
dbgen.PresetPrebuildSchedule(t,db, database.InsertPresetPrebuildScheduleParams{
579+
PresetID:preset.ID,
580+
CronExpression:"* 2-4 * * 1-5",
581+
Instances:2,
582+
})
583+
dbgen.PresetPrebuildSchedule(t,db, database.InsertPresetPrebuildScheduleParams{
584+
PresetID:preset.ID,
585+
CronExpression:"* 6-8 * * 1-5",
586+
Instances:3,
587+
})
588+
dbgen.PresetPrebuildSchedule(t,db, database.InsertPresetPrebuildScheduleParams{
589+
PresetID:preset.ID,
590+
CronExpression:"* 10-12 * * 1-5",
591+
Instances:4,
592+
})
593+
dbgen.PresetPrebuildSchedule(t,db, database.InsertPresetPrebuildScheduleParams{
594+
PresetID:preset.ID,
595+
CronExpression:"* 14-16 * * 1-5",
596+
Instances:5,
597+
})
598+
599+
err:=controller.ReconcileAll(ctx)
600+
require.NoError(t,err)
601+
602+
workspaces,err:=db.GetWorkspacesByTemplateID(ctx,template.ID)
603+
require.NoError(t,err)
604+
prebuildCount:=len(workspaces)
605+
606+
require.Equal(t,preset.DesiredInstances.Int32+preset2.DesiredInstances.Int32,int32(prebuildCount))// nolint:gosec
607+
}
608+
524609
funcTestInvalidPreset(t*testing.T) {
525610
t.Parallel()
526611

@@ -1538,6 +1623,34 @@ func setupTestDBTemplateVersion(
15381623
returntemplateVersion.ID
15391624
}
15401625

1626+
funcsetupTestDBPresetWithAutoscaling(
1627+
t*testing.T,
1628+
db database.Store,
1629+
templateVersionID uuid.UUID,
1630+
desiredInstancesint32,
1631+
presetNamestring,
1632+
autoscalingEnabledbool,
1633+
autoscalingTimezonestring,
1634+
) database.TemplateVersionPreset {
1635+
t.Helper()
1636+
preset:=dbgen.Preset(t,db, database.InsertPresetParams{
1637+
TemplateVersionID:templateVersionID,
1638+
Name:presetName,
1639+
DesiredInstances: sql.NullInt32{
1640+
Valid:true,
1641+
Int32:desiredInstances,
1642+
},
1643+
AutoscalingEnabled:autoscalingEnabled,
1644+
AutoscalingTimezone:autoscalingTimezone,
1645+
})
1646+
dbgen.PresetParameter(t,db, database.InsertPresetParametersParams{
1647+
TemplateVersionPresetID:preset.ID,
1648+
Names: []string{"test"},
1649+
Values: []string{"test"},
1650+
})
1651+
returnpreset
1652+
}
1653+
15411654
funcsetupTestDBPreset(
15421655
t*testing.T,
15431656
db database.Store,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp