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

Commit4a057c8

Browse files
fixes
1 parentf27941a commit4a057c8

File tree

12 files changed

+59
-11
lines changed

12 files changed

+59
-11
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,9 @@ func (s *MethodTestSuite) TestOrganization() {
999999
insertPresetPrebuildScheduleParams:= database.InsertPresetPrebuildScheduleParams{
10001000
PresetID:preset.ID,
10011001
}
1002-
check.Args(insertPresetPrebuildScheduleParams).Asserts(rbac.ResourceTemplate,policy.ActionUpdate)
1002+
check.Args(insertPresetPrebuildScheduleParams).
1003+
Asserts(rbac.ResourceTemplate,policy.ActionUpdate).
1004+
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
10031005
}))
10041006
s.Run("DeleteOrganizationMember",s.Subtest(func(db database.Store,check*expects) {
10051007
o:=dbgen.Organization(s.T(),db, database.Organization{})
@@ -4935,6 +4937,12 @@ func (s *MethodTestSuite) TestPrebuilds() {
49354937
Asserts(template.RBACObject(),policy.ActionRead).
49364938
Returns(insertedParameters)
49374939
}))
4940+
s.Run("GetPresetPrebuildSchedules",s.Subtest(func(db database.Store,check*expects) {
4941+
check.Args().
4942+
Asserts(rbac.ResourceTemplate.All(),policy.ActionRead).
4943+
Returns([]database.TemplateVersionPresetPrebuildSchedule{}).
4944+
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
4945+
}))
49384946
s.Run("GetPresetsByTemplateVersionID",s.Subtest(func(db database.Store,check*expects) {
49394947
ctx:=context.Background()
49404948
org:=dbgen.Organization(s.T(),db, database.Organization{})

‎coderd/database/dbfake/dbfake.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
395395
CreatedAt:version.CreatedAt,
396396
DesiredInstances:preset.DesiredInstances,
397397
InvalidateAfterSecs:preset.InvalidateAfterSecs,
398+
AutoscalingEnabled:preset.AutoscalingEnabled,
399+
AutoscalingTimezone:preset.AutoscalingTimezone,
398400
})
399401
}
400402

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,7 +4370,7 @@ func (q *FakeQuerier) GetPresetParametersByTemplateVersionID(_ context.Context,
43704370
}
43714371

43724372
func (q*FakeQuerier)GetPresetPrebuildSchedules(ctx context.Context) ([]database.TemplateVersionPresetPrebuildSchedule,error) {
4373-
panic("not implemented")
4373+
returnnil,ErrUnimplemented
43744374
}
43754375

43764376
func (q*FakeQuerier)GetPresetsAtFailureLimit(ctx context.Context,hardLimitint64) ([]database.GetPresetsAtFailureLimitRow,error) {
@@ -9168,7 +9168,7 @@ func (q *FakeQuerier) InsertPresetPrebuildSchedule(ctx context.Context, arg data
91689168
return database.TemplateVersionPresetPrebuildSchedule{},err
91699169
}
91709170

9171-
panic("not implemented")
9171+
return database.TemplateVersionPresetPrebuildSchedule{},ErrUnimplemented
91729172
}
91739173

91749174
func (q*FakeQuerier)InsertProvisionerJob(_ context.Context,arg database.InsertProvisionerJobParams) (database.ProvisionerJob,error) {
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
INSERT INTO
2+
template_version_preset_prebuild_schedules (
3+
id,
4+
preset_id,
5+
cron_expression,
6+
instances
7+
)
8+
VALUES (
9+
'e387cac1-9bf1-4fb6-8a34-db8cfb750dd0',
10+
'28b42cc0-c4fe-4907-a0fe-e4d20f1e9bfe',
11+
'* 8-18 * * 1-5',
12+
1
13+
);

‎coderd/prebuilds/global_snapshot.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package prebuilds
22

33
import (
4-
"github.com/coder/quartz"
54
"time"
65

6+
"github.com/coder/quartz"
7+
78
"github.com/google/uuid"
89
"golang.org/x/xerrors"
910

‎coderd/prebuilds/preset_snapshot.go

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

33
import (
44
"fmt"
5-
"github.com/coder/coder/v2/coderd/schedule/cron"
6-
"golang.org/x/xerrors"
75
"slices"
86
"time"
97

8+
"golang.org/x/xerrors"
9+
10+
"github.com/coder/coder/v2/coderd/schedule/cron"
11+
1012
"github.com/google/uuid"
1113

1214
"github.com/coder/quartz"

‎coderd/schedule/cron/cron_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ func TestIsWithinRange(t *testing.T) {
170170
specstring
171171
at time.Time
172172
expectedWithinRangebool
173+
expectedErrorstring
173174
}{
174175
// "* 9-18 * * 1-5" should be interpreted as a continuous time range from 08:59:00 to 18:58:59, Monday through Friday
175176
{
@@ -238,13 +239,30 @@ func TestIsWithinRange(t *testing.T) {
238239
at:mustParseTime(t,time.RFC1123,"Sun, 08 Jun 2025 14:00:00 UTC"),
239240
expectedWithinRange:false,
240241
},
242+
{
243+
name:"Check that Sunday is supported with value 0",
244+
spec:"* 9-18 * * 0",
245+
at:mustParseTime(t,time.RFC1123,"Sun, 08 Jun 2025 14:00:00 UTC"),
246+
expectedWithinRange:true,
247+
},
248+
{
249+
name:"Check that value 7 is rejected as out of range",
250+
spec:"* 9-18 * * 7",
251+
at:mustParseTime(t,time.RFC1123,"Sun, 08 Jun 2025 14:00:00 UTC"),
252+
expectedError:"end of range (7) above maximum (6): 7",
253+
},
241254
}
242255

243256
for_,testCase:=rangetestCases {
244257
testCase:=testCase
245258
t.Run(testCase.name,func(t*testing.T) {
246259
t.Parallel()
247260
sched,err:=cron.Weekly(testCase.spec)
261+
iftestCase.expectedError!="" {
262+
require.Error(t,err)
263+
require.Contains(t,err.Error(),testCase.expectedError)
264+
return
265+
}
248266
require.NoError(t,err)
249267
withinRange:=sched.IsWithinRange(testCase.at)
250268
require.Equal(t,testCase.expectedWithinRange,withinRange)

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ func (c *StoreReconciler) executeReconciliationAction(ctx context.Context, logge
616616
// See https://blog.robertelder.org/causes-of-bit-flips-in-computer-memory/.
617617
// This is obviously not comprehensive protection against this sort of problem, but this is one essential check.
618618
// TODO: uncomment:
619-
//desired := ps.Preset.DesiredInstances.Int32
620-
//if action.Create > desired {
619+
//desired := ps.Preset.DesiredInstances.Int32
620+
//if action.Create > desired {
621621
//logger.Critical(ctx, "determined excessive count of prebuilds to create; clamping to desired count",
622622
//slog.F("create_count", action.Create), slog.F("desired_count", desired))
623623
//

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ func TestPrebuildAutoscaling(t *testing.T) {
640640

641641
// get workspace builds
642642
workspaces,err:=db.GetWorkspacesByTemplateID(ctx,template.ID)
643+
require.NoError(t,err)
643644
workspaceIDs:=make([]uuid.UUID,0,len(workspaces))
644645
for_,workspace:=rangeworkspaces {
645646
workspaceIDs=append(workspaceIDs,workspace.ID)

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ require (
101101
github.com/coder/quartzv0.2.1
102102
github.com/coder/retryv1.5.1
103103
github.com/coder/serpentv0.10.0
104-
// TODO: release new provider version andchange it
105-
github.com/coder/terraform-provider-coder/v2v2.5.3
104+
// TODO: release new provider version andset it here
105+
github.com/coder/terraform-provider-coder/v2v2.5.4-0.20250611180058-d61894db8492
106106
github.com/coder/websocketv1.8.13
107107
github.com/coder/wgtunnelv0.1.13-0.20240522110300-ade90dfb2da0
108108
github.com/coreos/go-oidc/v3v3.14.1
@@ -531,4 +531,4 @@ require (
531531
k8s.io/utilsv0.0.0-20241210054802-24370beab758// indirect
532532
)
533533

534-
replacegithub.com/coder/terraform-provider-coder/v2 =>/home/coder/terraform-provider-coder
534+
//replace github.com/coder/terraform-provider-coder/v2 => /home/coder/terraform-provider-coder

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,8 @@ github.com/coder/tailscale v1.1.1-0.20250422090654-5090e715905e h1:nope/SZfoLB9M
924924
github.com/coder/tailscalev1.1.1-0.20250422090654-5090e715905e/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
925925
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
926926
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
927+
github.com/coder/terraform-provider-coder/v2v2.5.4-0.20250611180058-d61894db8492 h1:1eh46YdTyNOamg2PmUqF8wAdkxLlRCqAivsds2+ZHbM=
928+
github.com/coder/terraform-provider-coder/v2v2.5.4-0.20250611180058-d61894db8492/go.mod h1:kqP2MW/OF5u3QBRPDt84vn1izKjncICFfv26nSb781I=
927929
github.com/coder/trivyv0.0.0-20250527170238-9416a59d7019 h1:MHkv/W7l9eRAN9gOG0qZ1TLRGWIIfNi92273vPAQ8Fs=
928930
github.com/coder/trivyv0.0.0-20250527170238-9416a59d7019/go.mod h1:eqk+w9RLBmbd/cB5XfPZFuVn77cf/A6fB7qmEVeSmXk=
929931
github.com/coder/websocketv1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=

‎provisioner/terraform/resources.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ func safeInt32Conversion(n int) int32 {
10101010
ifn>math.MaxInt32 {
10111011
returnmath.MaxInt32
10121012
}
1013+
// #nosec G115 - Safe conversion, as we have explicitly checked that the number does not exceed math.MaxInt32.
10131014
returnint32(n)
10141015
}
10151016

0 commit comments

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