Skip to content

Commit 62e11f2

Browse files
jaaydenhjaaydenh
committed
fix: fix tests
1 parent 55a7c4d commit 62e11f2

File tree

4 files changed

+15
-30
lines changed

4 files changed

+15
-30
lines changed

‎coderd/parameters_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
249249
Value: "GO",
250250
},
251251
}
252+
request.EnableDynamicParameters = true
252253
})
253254
coderdtest.AwaitWorkspaceBuildJobCompleted(t, setup.client, wrk.LatestBuild.ID)
254255

‎coderd/templates_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ func TestPatchTemplateMeta(t *testing.T) {
15481548
user := coderdtest.CreateFirstUser(t, client)
15491549
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
15501550
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
1551-
require.False(t, template.UseClassicParameterFlow, "default is false")
1551+
require.True(t, template.UseClassicParameterFlow, "default is true")
15521552

15531553
bTrue := true
15541554
bFalse := false

‎coderd/wsbuilder/wsbuilder.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,24 +1042,28 @@ func (b *Builder) checkRunningBuild() error {
10421042
}
10431043

10441044
func (b *Builder) usingDynamicParameters() bool {
1045-
vals, err := b.getTemplateTerraformValues()
1045+
if b.dynamicParametersEnabled != nil {
1046+
return *b.dynamicParametersEnabled
1047+
}
1048+
1049+
tpl, err := b.getTemplate()
10461050
if err != nil {
1051+
return false // Let another part of the code get this error
1052+
}
1053+
if tpl.UseClassicParameterFlow {
10471054
return false
10481055
}
10491056

1050-
if !ProvisionerVersionSupportsDynamicParameters(vals.ProvisionerdVersion) {
1057+
vals, err := b.getTemplateTerraformValues()
1058+
if err != nil {
10511059
return false
10521060
}
10531061

1054-
if b.dynamicParametersEnabled != nil {
1055-
return *b.dynamicParametersEnabled
1062+
if !ProvisionerVersionSupportsDynamicParameters(vals.ProvisionerdVersion) {
1063+
return false
10561064
}
10571065

1058-
tpl, err := b.getTemplate()
1059-
if err != nil {
1060-
return false // Let another part of the code get this error
1061-
}
1062-
return !tpl.UseClassicParameterFlow
1066+
return true
10631067
}
10641068

10651069
func ProvisionerVersionSupportsDynamicParameters(version string) bool {

‎coderd/wsbuilder/wsbuilder_test.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func TestBuilder_NoOptions(t *testing.T) {
5757
mDB := expectDB(t,
5858
// Inputs
5959
withTemplate,
60-
withTerraformValuesErrNoRows,
6160
withInactiveVersion(nil),
6261
withLastBuildFound,
6362
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -114,7 +113,6 @@ func TestBuilder_Initiator(t *testing.T) {
114113
mDB := expectDB(t,
115114
// Inputs
116115
withTemplate,
117-
withTerraformValuesErrNoRows,
118116
withInactiveVersion(nil),
119117
withLastBuildFound,
120118
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -161,7 +159,6 @@ func TestBuilder_Baggage(t *testing.T) {
161159
mDB := expectDB(t,
162160
// Inputs
163161
withTemplate,
164-
withTerraformValuesErrNoRows,
165162
withInactiveVersion(nil),
166163
withLastBuildFound,
167164
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -200,7 +197,6 @@ func TestBuilder_Reason(t *testing.T) {
200197
mDB := expectDB(t,
201198
// Inputs
202199
withTemplate,
203-
withTerraformValuesErrNoRows,
204200
withInactiveVersion(nil),
205201
withLastBuildFound,
206202
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -239,7 +235,6 @@ func TestBuilder_ActiveVersion(t *testing.T) {
239235
mDB := expectDB(t,
240236
// Inputs
241237
withTemplate,
242-
withTerraformValuesErrNoRows,
243238
withActiveVersion(nil),
244239
withLastBuildNotFound,
245240
withTemplateVersionVariables(activeVersionID, nil),
@@ -343,7 +338,6 @@ func TestWorkspaceBuildWithTags(t *testing.T) {
343338
mDB := expectDB(t,
344339
// Inputs
345340
withTemplate,
346-
withTerraformValuesErrNoRows,
347341
withInactiveVersion(richParameters),
348342
withLastBuildFound,
349343
withTemplateVersionVariables(inactiveVersionID, templateVersionVariables),
@@ -439,7 +433,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
439433
mDB := expectDB(t,
440434
// Inputs
441435
withTemplate,
442-
withTerraformValuesErrNoRows,
443436
withInactiveVersion(richParameters),
444437
withLastBuildFound,
445438
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -487,7 +480,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
487480
mDB := expectDB(t,
488481
// Inputs
489482
withTemplate,
490-
withTerraformValuesErrNoRows,
491483
withInactiveVersion(richParameters),
492484
withLastBuildFound,
493485
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -541,7 +533,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
541533
mDB := expectDB(t,
542534
// Inputs
543535
withTemplate,
544-
withTerraformValuesErrNoRows,
545536
withInactiveVersion(richParameters),
546537
withLastBuildFound,
547538
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -574,7 +565,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
574565
mDB := expectDB(t,
575566
// Inputs
576567
withTemplate,
577-
withTerraformValuesErrNoRows,
578568
withInactiveVersion(richParameters),
579569
withLastBuildFound,
580570
withTemplateVersionVariables(inactiveVersionID, nil),
@@ -627,7 +617,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
627617
mDB := expectDB(t,
628618
// Inputs
629619
withTemplate,
630-
withTerraformValuesErrNoRows,
631620
withActiveVersion(version2params),
632621
withLastBuildFound,
633622
withTemplateVersionVariables(activeVersionID, nil),
@@ -691,7 +680,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
691680
mDB := expectDB(t,
692681
// Inputs
693682
withTemplate,
694-
withTerraformValuesErrNoRows,
695683
withActiveVersion(version2params),
696684
withLastBuildFound,
697685
withTemplateVersionVariables(activeVersionID, nil),
@@ -753,7 +741,6 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
753741
mDB := expectDB(t,
754742
// Inputs
755743
withTemplate,
756-
withTerraformValuesErrNoRows,
757744
withActiveVersion(version2params),
758745
withLastBuildFound,
759746
withTemplateVersionVariables(activeVersionID, nil),
@@ -801,7 +788,6 @@ func TestWorkspaceBuildWithPreset(t *testing.T) {
801788
mDB := expectDB(t,
802789
// Inputs
803790
withTemplate,
804-
withTerraformValuesErrNoRows,
805791
withActiveVersion(nil),
806792
// building workspaces using presets with different combinations of parameters
807793
// is tested at the API layer, in TestWorkspace. Here, it is sufficient to
@@ -916,12 +902,6 @@ func withTemplate(mTx *dbmock.MockStore) {
916902
}, nil)
917903
}
918904

919-
func withTerraformValuesErrNoRows(mTx *dbmock.MockStore) {
920-
mTx.EXPECT().GetTemplateVersionTerraformValues(gomock.Any(), gomock.Any()).
921-
Times(1).
922-
Return(database.TemplateVersionTerraformValue{}, sql.ErrNoRows)
923-
}
924-
925905
// withInTx runs the given functions on the same db mock.
926906
func withInTx(mTx *dbmock.MockStore) {
927907
mTx.EXPECT().InTx(gomock.Any(), gomock.Any()).Times(1).DoAndReturn(

0 commit comments

Comments
 (0)