coder · Emyrk · May 29, 2025 · May 19, 2025 · May 19, 2025 · May 19, 2025
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -9303,6 +9303,7 @@ func (q *FakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
 		DisplayName:         arg.DisplayName,
 		Description:         arg.Description,
 		Type:                arg.Type,
+		FormType:            arg.FormType,
 		Mutable:             arg.Mutable,
 		DefaultValue:        arg.DefaultValue,
 		Icon:                arg.Icon,

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000328_parameter_form_type.down.sql b/coderd/database/migrations/000328_parameter_form_type.down.sql
@@ -0,0 +1 @@
+ALTER TABLE template_version_parameters DROP COLUMN form_type;
diff --git a/coderd/database/migrations/000328_parameter_form_type.up.sql b/coderd/database/migrations/000328_parameter_form_type.up.sql
@@ -0,0 +1,6 @@
+-- Intentionally leaving the default blank. The provisioner will not re-run any
+-- imports to backfill these values. Missing values just have to be handled.
+ALTER TABLE template_version_parameters ADD COLUMN form_type text NOT NULL DEFAULT '';
+
+COMMENT ON COLUMN template_version_parameters.form_type
+	IS 'Specify what form_type should be used to render the parameter in the UI. This value should correspond to an enum, but this will not be enforced in the sql. Mistakes here should not be fatal for functional usage.';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionparameters.sql b/coderd/database/queries/templateversionparameters.sql
@@ -5,6 +5,7 @@ INSERT INTO
         name,
         description,
         type,
+        form_type,
         mutable,
         default_value,
         icon,
@@ -37,7 +38,8 @@ VALUES
         $14,
         $15,
         $16,
-        $17
+        $17,
+        $18
     ) RETURNING *;
 
 -- name: GetTemplateVersionParameters :many

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1414,6 +1414,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 				DisplayName:         richParameter.DisplayName,
 				Description:         richParameter.Description,
 				Type:                richParameter.Type,
+				FormType:            richParameter.FormType,
 				Mutable:             richParameter.Mutable,
 				DefaultValue:        richParameter.DefaultValue,
 				Icon:                richParameter.Icon,

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1895,6 +1895,7 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
 		Description:          param.Description,
 		DescriptionPlaintext: descriptionPlaintext,
 		Type:                 param.Type,
+		FormType:             param.FormType,
 		Mutable:              param.Mutable,
 		DefaultValue:         param.DefaultValue,
 		Icon:                 param.Icon,

diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -3527,6 +3527,12 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
 		secondParameterDescription         = "_This_ is second *parameter*"
 		secondParameterValue               = "2"
 		secondParameterValidationMonotonic = codersdk.MonotonicOrderIncreasing
+
+		thirdParameterName     = "third_parameter"
+		thirdParameterType     = "list(string)"
+		thirdParameterFormType = "multi-select"
+		thirdParameterDefault  = `["red"]`
+		thirdParameterOption   = "red"
 	)
 
 	client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
@@ -3552,6 +3558,18 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
 								ValidationMax:       ptr.Ref(int32(3)),
 								ValidationMonotonic: string(secondParameterValidationMonotonic),
 							},
+							{
+								Name:         thirdParameterName,
+								Type:         thirdParameterType,
+								DefaultValue: thirdParameterDefault,
+								Options: []*proto.RichParameterOption{
+									{
+										Name:  thirdParameterOption,
+										Value: thirdParameterOption,
+									},
+								},
+								FormType: thirdParameterFormType,
+							},
 						},
 					},
 				},
@@ -3575,22 +3593,32 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
 
 	templateRichParameters, err := client.TemplateVersionRichParameters(ctx, version.ID)
 	require.NoError(t, err)
-	require.Len(t, templateRichParameters, 2)
+	require.Len(t, templateRichParameters, 3)
 	require.Equal(t, firstParameterName, templateRichParameters[0].Name)
 	require.Equal(t, firstParameterType, templateRichParameters[0].Type)
 	require.Equal(t, firstParameterDescription, templateRichParameters[0].Description)
 	require.Equal(t, firstParameterDescriptionPlaintext, templateRichParameters[0].DescriptionPlaintext)
 	require.Equal(t, codersdk.ValidationMonotonicOrder(""), templateRichParameters[0].ValidationMonotonic) // no validation for string
+
 	require.Equal(t, secondParameterName, templateRichParameters[1].Name)
 	require.Equal(t, secondParameterDisplayName, templateRichParameters[1].DisplayName)
 	require.Equal(t, secondParameterType, templateRichParameters[1].Type)
 	require.Equal(t, secondParameterDescription, templateRichParameters[1].Description)
 	require.Equal(t, secondParameterDescriptionPlaintext, templateRichParameters[1].DescriptionPlaintext)
 	require.Equal(t, secondParameterValidationMonotonic, templateRichParameters[1].ValidationMonotonic)
 
+	third := templateRichParameters[2]
+	require.Equal(t, thirdParameterName, third.Name)
+	require.Equal(t, thirdParameterType, third.Type)
+	require.Equal(t, thirdParameterFormType, third.FormType)
+	require.Equal(t, thirdParameterDefault, third.DefaultValue)
+	require.Equal(t, thirdParameterOption, third.Options[0].Name)
+	require.Equal(t, thirdParameterOption, third.Options[0].Value)
+
 	expectedBuildParameters := []codersdk.WorkspaceBuildParameter{
 		{Name: firstParameterName, Value: firstParameterValue},
 		{Name: secondParameterName, Value: secondParameterValue},
+		{Name: thirdParameterName, Value: thirdParameterDefault},
 	}
 
 	template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -1,9 +1,12 @@
 package codersdk
 
 import (
+	"encoding/json"
+
 	"golang.org/x/xerrors"
 	"tailscale.com/types/ptr"
 
+	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/terraform-provider-coder/v2/provider"
 )
 
@@ -66,18 +69,8 @@ func validateBuildParameter(richParameter TemplateVersionParameter, buildParamet
 		current = richParameter.DefaultValue
 	}
 
-	if len(richParameter.Options) > 0 {
-		var matched bool
-		for _, opt := range richParameter.Options {
-			if opt.Value == current {
-				matched = true
-				break
-			}
-		}
-
-		if !matched {
-			return xerrors.Errorf("parameter value must match one of options: %s", parameterValuesAsArray(richParameter.Options))
-		}
+	if len(richParameter.Options) > 0 && !inOptionSet(richParameter, current) {
+		return xerrors.Errorf("parameter value must match one of options: %s", parameterValuesAsArray(richParameter.Options))
 	}
 
 	if !validationEnabled(richParameter) {
@@ -104,6 +97,41 @@ func validateBuildParameter(richParameter TemplateVersionParameter, buildParamet
 	return validation.Valid(richParameter.Type, current, previous)
 }
 
+// inOptionSet returns if the value given is in the set of options for a parameter.
+func inOptionSet(richParameter TemplateVersionParameter, value string) bool {
+	optionValues := make([]string, 0, len(richParameter.Options))
+	for _, option := range richParameter.Options {
+		optionValues = append(optionValues, option.Value)
+	}
+
+	// This is the simple case
+	if slice.Contains(optionValues, value) {
+		return true
+	}
+
+	// If the type is `list(string)` and the form_type is `multi-select`, then we check each individual
+	// value in the list against the option set. If the form_type is the empty string, we have to consider the
+	// possibility it might be a multi-select. Old provisioners do not send us the form_type.
+	mightBeMultiSelect := richParameter.Type == provider.OptionTypeListString && (richParameter.FormType == string(provider.ParameterFormTypeMultiSelect) || richParameter.FormType == "")
+	if !mightBeMultiSelect {
+		return false
+	}
+
+	var checks []string
+	err := json.Unmarshal([]byte(value), &checks)
+	if err != nil {
+		return false
+	}
+
+	for _, check := range checks {
+		if !slice.Contains(optionValues, check) {
+			return false
+		}
+	}
+
+	return true
+}
+
 func findBuildParameter(params []WorkspaceBuildParameter, parameterName string) (*WorkspaceBuildParameter, bool) {
 	if params == nil {
 		return nil, false

diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -61,6 +61,7 @@ type TemplateVersionParameter struct {
 	Description          string                           `json:"description"`
 	DescriptionPlaintext string                           `json:"description_plaintext"`
 	Type                 string                           `json:"type" enums:"string,number,bool,list(string)"`
+	FormType             string                           `json:"form_type"`
 	Mutable              bool                             `json:"mutable"`
 	DefaultValue         string                           `json:"default_value"`
 	Icon                 string                           `json:"icon"`

diff --git a/go.mod b/go.mod
@@ -101,7 +101,7 @@ require (
 	github.com/coder/quartz v0.1.3
 	github.com/coder/retry v1.5.1
 	github.com/coder/serpent v0.10.0
-	github.com/coder/terraform-provider-coder/v2 v2.4.1
+	github.com/coder/terraform-provider-coder/v2 v2.4.3-0.20250519162750-a4f40659a9be
 	github.com/coder/websocket v1.8.13
 	github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0
 	github.com/coreos/go-oidc/v3 v3.14.1
@@ -207,7 +207,7 @@ require (
 	golang.org/x/tools v0.32.0
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
 	google.golang.org/api v0.231.0
-	google.golang.org/grpc v1.72.0
+	google.golang.org/grpc v1.72.1
 	google.golang.org/protobuf v1.36.6
 	gopkg.in/DataDog/dd-trace-go.v1 v1.73.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -333,7 +333,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-cty v1.5.0 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
@@ -344,9 +344,9 @@ require (
 	github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
 	github.com/hashicorp/hcl/v2 v2.23.0
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.27.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/illarion/gonotify v1.0.1 // indirect
 	github.com/insomniacslk/dhcp v0.0.0-20231206064809-8c70d406f6d2 // indirect
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_version_parameters DROP COLUMN form_type;