Skip to content

Commit 031aeb6

Browse files
committed
fix: tests
1 parent 98e623a commit 031aeb6

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

coderd/wsbuilder/wsbuilder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ func (b *Builder) getProvisionerTags() (map[string]string, error) {
670670
tags[name] = value
671671
}
672672

673-
// FIXME evaluate and merge workspace tags
673+
// TODO: Take "workspaceTags", evaluate expressions using parameters, update "tags" map
674674
log.Println(workspaceTags, parameterNames, parameterValues)
675675

676676
return tags, nil

coderd/wsbuilder/wsbuilder_test.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ func TestBuilder_ActiveVersion(t *testing.T) {
225225
withActiveVersion(nil),
226226
withLastBuildNotFound,
227227
withParameterSchemas(activeJobID, nil),
228+
withWorkspaceTags(activeVersionID, nil),
228229
// previous rich parameters are not queried because there is no previous build.
229230

230231
// Outputs
@@ -306,6 +307,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
306307
withLastBuildFound,
307308
withRichParameters(initialBuildParameters),
308309
withParameterSchemas(inactiveJobID, nil),
310+
withWorkspaceTags(inactiveVersionID, nil),
309311

310312
// Outputs
311313
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -349,6 +351,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
349351
withLastBuildFound,
350352
withRichParameters(initialBuildParameters),
351353
withParameterSchemas(inactiveJobID, nil),
354+
withWorkspaceTags(inactiveVersionID, nil),
352355

353356
// Outputs
354357
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -398,6 +401,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
398401
withLastBuildFound,
399402
withRichParameters(nil),
400403
withParameterSchemas(inactiveJobID, schemas),
404+
withWorkspaceTags(inactiveVersionID, nil),
401405

402406
// Outputs
403407
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -433,13 +437,10 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
433437
withLastBuildFound,
434438
withRichParameters(initialBuildParameters),
435439
withParameterSchemas(inactiveJobID, nil),
440+
withWorkspaceTags(inactiveVersionID, nil),
436441

437442
// Outputs
438-
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
439-
withInTx,
440-
expectBuild(func(bld database.InsertWorkspaceBuildParams) {}),
441-
// no build parameters, since we hit an error validating.
442-
// expectBuildParameters(func(params database.InsertWorkspaceBuildParametersParams) {}),
443+
// no transaction, since we failed fast while validation build parameters
443444
)
444445

445446
ws := database.Workspace{ID: workspaceID, TemplateID: templateID, OwnerID: userID}
@@ -486,6 +487,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
486487
withLastBuildFound,
487488
withRichParameters(initialBuildParameters),
488489
withParameterSchemas(activeJobID, nil),
490+
withWorkspaceTags(activeVersionID, nil),
489491

490492
// Outputs
491493
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -546,6 +548,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
546548
withLastBuildFound,
547549
withRichParameters(initialBuildParameters),
548550
withParameterSchemas(activeJobID, nil),
551+
withWorkspaceTags(activeVersionID, nil),
549552

550553
// Outputs
551554
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),

0 commit comments

Comments
 (0)