linting

Emyrk · Emyrk · commit d5a68dd6db3d · 2025-05-15T11:23:02.000-05:00
diff --git a/coderd/parameters.go b/coderd/parameters.go
@@ -214,7 +214,9 @@ func prepareDynamicPreview(ctx context.Context, rw http.ResponseWriter, db datab
 	// for populating values from data blocks, but isn't strictly required. If
 	// we don't have a cached plan available, we just use an empty one instead.
 	plan := json.RawMessage("{}")
-	plan = tf.CachedPlan
+	if len(tf.CachedPlan) > 0 {
+		plan = tf.CachedPlan
+	}
 
 	openFiles = append(openFiles, tf.CachedModuleFiles.UUID)
 	if tf.CachedModuleFiles.Valid {
@@ -338,7 +340,7 @@ func prepareStaticPreview(ctx context.Context, db database.Store, version uuid.U
 			if ok {
 				param.Value = previewtypes.StringLiteral(paramValue)
 			} else {
-				paramValue = param.DefaultValue.AsString()
+				param.Value = param.DefaultValue
 			}
 			param.Diagnostics = previewtypes.Diagnostics(param.Valid(param.Value))
 		}
diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go
@@ -182,6 +182,7 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
 	t.Run("OldProvisioner", func(t *testing.T) {
 		t.Parallel()
 
+		const defaultValue = "PS"
 		setup := setupDynamicParamsTest(t, setupDynamicParamsTestParams{
 			provisionerDaemonVersion: "1.4",
 			mainTF:                   nil,
@@ -191,13 +192,13 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
 				{
 					Name:         "jetbrains_ide",
 					Type:         "string",
-					DefaultValue: "PS",
+					DefaultValue: defaultValue,
 					Icon:         "",
 					Options: []*proto.RichParameterOption{
 						{
 							Name:        "PHPStorm",
 							Description: "",
-							Value:       "PS",
+							Value:       defaultValue,
 							Icon:        "",
 						},
 						{
@@ -225,15 +226,18 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
 		require.Len(t, preview.Parameters, 1)
 		require.Equal(t, "jetbrains_ide", preview.Parameters[0].Name)
 		require.True(t, preview.Parameters[0].Value.Valid())
-		require.Equal(t, "PS", preview.Parameters[0].Value.AsString())
+		require.Equal(t, defaultValue, preview.Parameters[0].Value.AsString())
 
 		// Test some inputs
-		for _, exp := range []string{"PS", "GO", "Invalid"} {
+		for _, exp := range []string{defaultValue, "GO", "Invalid", defaultValue} {
+			inputs := map[string]string{}
+			if exp != defaultValue {
+				// Let the default value be the default without being explicitly set
+				inputs["jetbrains_ide"] = exp
+			}
 			err := stream.Send(codersdk.DynamicParametersRequest{
-				ID: 1,
-				Inputs: map[string]string{
-					"jetbrains_ide": exp,
-				},
+				ID:     1,
+				Inputs: inputs,
 			})
 			require.NoError(t, err)
 
@@ -252,7 +256,6 @@ func TestDynamicParametersWithTerraformValues(t *testing.T) {
 			require.True(t, preview.Parameters[0].Value.Valid())
 			require.Equal(t, exp, preview.Parameters[0].Value.AsString())
 		}
-
 	})
 
 	t.Run("FileError", func(t *testing.T) {
