@@ -3654,8 +3654,8 @@ type createPrebuiltWorkspaceOpts struct {
3654
3654
}
3655
3655
3656
3656
func createPrebuiltWorkspace (
3657
- t * testing.T ,
3658
3657
ctx context.Context ,
3658
+ t * testing.T ,
3659
3659
db database.Store ,
3660
3660
tmpl database.Template ,
3661
3661
extTmplVersion templateVersionWithPreset ,
@@ -3831,7 +3831,7 @@ func TestWorkspacePrebuildsView(t *testing.T) {
3831
3831
3832
3832
tmpl := createTemplate (t , db , orgID , userID )
3833
3833
tmplV1 := createTmplVersionAndPreset (t , db , tmpl , tmpl .ActiveVersionID , now , nil )
3834
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3834
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3835
3835
readyAgents : tc .readyAgents ,
3836
3836
notReadyAgents : tc .notReadyAgents ,
3837
3837
})
@@ -3877,7 +3877,7 @@ func TestGetPresetsBackoff(t *testing.T) {
3877
3877
3878
3878
tmpl := createTemplate (t , db , orgID , userID )
3879
3879
tmplV1 := createTmplVersionAndPreset (t , db , tmpl , tmpl .ActiveVersionID , now , nil )
3880
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3880
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3881
3881
failedJob : true ,
3882
3882
})
3883
3883
@@ -3905,13 +3905,13 @@ func TestGetPresetsBackoff(t *testing.T) {
3905
3905
3906
3906
tmpl := createTemplate (t , db , orgID , userID )
3907
3907
tmplV1 := createTmplVersionAndPreset (t , db , tmpl , tmpl .ActiveVersionID , now , nil )
3908
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3908
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3909
3909
failedJob : true ,
3910
3910
})
3911
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3911
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3912
3912
failedJob : true ,
3913
3913
})
3914
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3914
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3915
3915
failedJob : true ,
3916
3916
})
3917
3917
@@ -3939,16 +3939,16 @@ func TestGetPresetsBackoff(t *testing.T) {
3939
3939
3940
3940
tmpl := createTemplate (t , db , orgID , userID )
3941
3941
tmplV1 := createTmplVersionAndPreset (t , db , tmpl , uuid .New (), now , nil )
3942
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3942
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV1 , orgID , now , & createPrebuiltWorkspaceOpts {
3943
3943
failedJob : true ,
3944
3944
})
3945
3945
3946
3946
// Active Version
3947
3947
tmplV2 := createTmplVersionAndPreset (t , db , tmpl , tmpl .ActiveVersionID , now , nil )
3948
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV2 , orgID , now , & createPrebuiltWorkspaceOpts {
3948
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV2 , orgID , now , & createPrebuiltWorkspaceOpts {
3949
3949
failedJob : true ,
3950
3950
})
3951
- createPrebuiltWorkspace (t , ctx , db , tmpl , tmplV2 , orgID , now , & createPrebuiltWorkspaceOpts {
3951
+ createPrebuiltWorkspace (ctx , t , db , tmpl , tmplV2 , orgID , now , & createPrebuiltWorkspaceOpts {
3952
3952
failedJob : true ,
3953
3953
})
3954
3954
@@ -3976,13 +3976,13 @@ func TestGetPresetsBackoff(t *testing.T) {
3976
3976
3977
3977
tmpl1 := createTemplate (t , db , orgID , userID )
3978
3978
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , nil )
3979
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
3979
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
3980
3980
failedJob : true ,
3981
3981
})
3982
3982
3983
3983
tmpl2 := createTemplate (t , db , orgID , userID )
3984
3984
tmpl2V1 := createTmplVersionAndPreset (t , db , tmpl2 , tmpl2 .ActiveVersionID , now , nil )
3985
- createPrebuiltWorkspace (t , ctx , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
3985
+ createPrebuiltWorkspace (ctx , t , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
3986
3986
failedJob : true ,
3987
3987
})
3988
3988
@@ -4018,33 +4018,33 @@ func TestGetPresetsBackoff(t *testing.T) {
4018
4018
4019
4019
tmpl1 := createTemplate (t , db , orgID , userID )
4020
4020
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , nil )
4021
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4021
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4022
4022
failedJob : true ,
4023
4023
})
4024
4024
4025
4025
tmpl2 := createTemplate (t , db , orgID , userID )
4026
4026
tmpl2V1 := createTmplVersionAndPreset (t , db , tmpl2 , tmpl2 .ActiveVersionID , now , nil )
4027
- createPrebuiltWorkspace (t , ctx , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4027
+ createPrebuiltWorkspace (ctx , t , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4028
4028
failedJob : true ,
4029
4029
})
4030
- createPrebuiltWorkspace (t , ctx , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4030
+ createPrebuiltWorkspace (ctx , t , db , tmpl2 , tmpl2V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4031
4031
failedJob : true ,
4032
4032
})
4033
4033
4034
4034
tmpl3 := createTemplate (t , db , orgID , userID )
4035
4035
tmpl3V1 := createTmplVersionAndPreset (t , db , tmpl3 , uuid .New (), now , nil )
4036
- createPrebuiltWorkspace (t , ctx , db , tmpl3 , tmpl3V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4036
+ createPrebuiltWorkspace (ctx , t , db , tmpl3 , tmpl3V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4037
4037
failedJob : true ,
4038
4038
})
4039
4039
4040
4040
tmpl3V2 := createTmplVersionAndPreset (t , db , tmpl3 , tmpl3 .ActiveVersionID , now , nil )
4041
- createPrebuiltWorkspace (t , ctx , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4041
+ createPrebuiltWorkspace (ctx , t , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4042
4042
failedJob : true ,
4043
4043
})
4044
- createPrebuiltWorkspace (t , ctx , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4044
+ createPrebuiltWorkspace (ctx , t , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4045
4045
failedJob : true ,
4046
4046
})
4047
- createPrebuiltWorkspace (t , ctx , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4047
+ createPrebuiltWorkspace (ctx , t , db , tmpl3 , tmpl3V2 , orgID , now , & createPrebuiltWorkspaceOpts {
4048
4048
failedJob : true ,
4049
4049
})
4050
4050
@@ -4108,9 +4108,9 @@ func TestGetPresetsBackoff(t *testing.T) {
4108
4108
tmpl1 := createTemplate (t , db , orgID , userID )
4109
4109
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , nil )
4110
4110
successfulJobOpts := createPrebuiltWorkspaceOpts {}
4111
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4112
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4113
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4111
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4112
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4113
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4114
4114
4115
4115
backoffs , err := db .GetPresetsBackoff (ctx , now .Add (- time .Hour ))
4116
4116
require .NoError (t , err )
@@ -4141,8 +4141,8 @@ func TestGetPresetsBackoff(t *testing.T) {
4141
4141
failedJob : false ,
4142
4142
createdAt : now .Add (- 1 * time .Minute ),
4143
4143
}
4144
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & failedJobOpts )
4145
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4144
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & failedJobOpts )
4145
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & successfulJobOpts )
4146
4146
4147
4147
backoffs , err := db .GetPresetsBackoff (ctx , now .Add (- time .Hour ))
4148
4148
require .NoError (t , err )
@@ -4165,19 +4165,19 @@ func TestGetPresetsBackoff(t *testing.T) {
4165
4165
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , & tmplVersionOpts {
4166
4166
DesiredInstances : 3 ,
4167
4167
})
4168
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4168
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4169
4169
failedJob : true ,
4170
4170
createdAt : now .Add (- 4 * time .Minute ),
4171
4171
})
4172
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4172
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4173
4173
failedJob : false ,
4174
4174
createdAt : now .Add (- 3 * time .Minute ),
4175
4175
})
4176
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4176
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4177
4177
failedJob : false ,
4178
4178
createdAt : now .Add (- 2 * time .Minute ),
4179
4179
})
4180
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4180
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4181
4181
failedJob : false ,
4182
4182
createdAt : now .Add (- 1 * time .Minute ),
4183
4183
})
@@ -4203,15 +4203,15 @@ func TestGetPresetsBackoff(t *testing.T) {
4203
4203
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , & tmplVersionOpts {
4204
4204
DesiredInstances : 3 ,
4205
4205
})
4206
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4206
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4207
4207
failedJob : true ,
4208
4208
createdAt : now .Add (- 3 * time .Minute ),
4209
4209
})
4210
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4210
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4211
4211
failedJob : false ,
4212
4212
createdAt : now .Add (- 2 * time .Minute ),
4213
4213
})
4214
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4214
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4215
4215
failedJob : false ,
4216
4216
createdAt : now .Add (- 1 * time .Minute ),
4217
4217
})
@@ -4245,23 +4245,23 @@ func TestGetPresetsBackoff(t *testing.T) {
4245
4245
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , & tmplVersionOpts {
4246
4246
DesiredInstances : 3 ,
4247
4247
})
4248
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4248
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4249
4249
failedJob : true ,
4250
4250
createdAt : now .Add (- lookbackPeriod - time .Minute ), // earlier than lookback period - skipped
4251
4251
})
4252
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4252
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4253
4253
failedJob : true ,
4254
4254
createdAt : now .Add (- 4 * time .Minute ), // within lookback period - counted as failed job
4255
4255
})
4256
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4256
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4257
4257
failedJob : true ,
4258
4258
createdAt : now .Add (- 3 * time .Minute ), // within lookback period - counted as failed job
4259
4259
})
4260
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4260
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4261
4261
failedJob : false ,
4262
4262
createdAt : now .Add (- 2 * time .Minute ),
4263
4263
})
4264
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4264
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4265
4265
failedJob : false ,
4266
4266
createdAt : now .Add (- 1 * time .Minute ),
4267
4267
})
@@ -4295,27 +4295,27 @@ func TestGetPresetsBackoff(t *testing.T) {
4295
4295
tmpl1V1 := createTmplVersionAndPreset (t , db , tmpl1 , tmpl1 .ActiveVersionID , now , & tmplVersionOpts {
4296
4296
DesiredInstances : 6 ,
4297
4297
})
4298
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4298
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4299
4299
failedJob : true ,
4300
4300
createdAt : now .Add (- lookbackPeriod - time .Minute ), // earlier than lookback period - skipped
4301
4301
})
4302
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4302
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4303
4303
failedJob : true ,
4304
4304
createdAt : now .Add (- 4 * time .Minute ),
4305
4305
})
4306
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4306
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4307
4307
failedJob : true ,
4308
4308
createdAt : now .Add (- 0 * time .Minute ),
4309
4309
})
4310
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4310
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4311
4311
failedJob : true ,
4312
4312
createdAt : now .Add (- 3 * time .Minute ),
4313
4313
})
4314
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4314
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4315
4315
failedJob : true ,
4316
4316
createdAt : now .Add (- 1 * time .Minute ),
4317
4317
})
4318
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4318
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4319
4319
failedJob : true ,
4320
4320
createdAt : now .Add (- 2 * time .Minute ),
4321
4321
})
@@ -4352,7 +4352,7 @@ func TestGetPresetsBackoff(t *testing.T) {
4352
4352
DesiredInstances : 1 ,
4353
4353
})
4354
4354
4355
- createPrebuiltWorkspace (t , ctx , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4355
+ createPrebuiltWorkspace (ctx , t , db , tmpl1 , tmpl1V1 , orgID , now , & createPrebuiltWorkspaceOpts {
4356
4356
failedJob : true ,
4357
4357
createdAt : now .Add (- lookbackPeriod - time .Minute ), // earlier than lookback period - skipped
4358
4358
})
0 commit comments