better assertion in test

Emyrk · Emyrk · commit 28d14168945e · 2025-05-28T09:05:26.000-05:00
diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go
@@ -3,7 +3,6 @@ package coderd_test
 import (
 	"context"
 	"os"
-	"slices"
 	"testing"
 
 	"github.com/google/uuid"
@@ -281,17 +280,10 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
 
 			latestParams, err := setup.client.WorkspaceBuildParameters(ctx, bld.ID)
 			require.NoError(t, err)
-
-			require.Len(t, latestParams, 2)
-			idx := slices.IndexFunc(latestParams, func(parameter codersdk.WorkspaceBuildParameter) bool {
-				return parameter.Name == "jetbrains_ide"
+			require.ElementsMatch(t, latestParams, []codersdk.WorkspaceBuildParameter{
+				{Name: "jetbrains_ide", Value: "GO"},
+				{Name: "foo", Value: fooVal},
 			})
-			require.Equal(t, "jetbrains_ide", latestParams[idx].Name)
-			require.Equal(t, "GO", latestParams[idx].Value)
-
-			fooIdx := (idx + 1) % 2
-			require.Equal(t, "foo", latestParams[fooIdx].Name)
-			require.Equal(t, fooVal, latestParams[fooIdx].Value)
 		}
 
 		// Restart the workspace, then delete. Asserting params on all builds.
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -637,7 +637,7 @@ func (b *Builder) getParameters() (names, values []string, err error) {
 		//  conditional parameter existence, the static frame of reference
 		//  is not sufficient. So assume the user is correct, or pull in the
 		//  dynamic param code to find the actual parameters.
-		latestValues := make(map[string]string)
+		latestValues := make(map[string]string, len(b.richParameterValues))
 		for _, latest := range b.richParameterValues {
 			latestValues[latest.Name] = latest.Value
 		}

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ func (b *Builder) getParameters() (names, values []string, err error) {`
`637`	`637`	`// conditional parameter existence, the static frame of reference`
`638`	`638`	`// is not sufficient. So assume the user is correct, or pull in the`
`639`	`639`	`// dynamic param code to find the actual parameters.`
`640`		`- latestValues := make(map[string]string)`
	`640`	`+ latestValues := make(map[string]string, len(b.richParameterValues))`
`641`	`641`	`for _, latest := range b.richParameterValues {`
`642`	`642`	`latestValues[latest.Name] = latest.Value`
`643`	`643`	`}`