Merge pull request #67 from coder/lilac/update-provider

Emyrk · web-flow · commit 5da878f61db5 · 2025-04-07T13:18:18.000-05:00
chore: update terraform-provider-coder
diff --git a/extract/parameter.go b/extract/parameter.go
@@ -56,7 +56,7 @@ func ParameterFromBlock(block *terraform.Block) (*types.Parameter, hcl.Diagnosti
 		def = types.ToHCLString(block, defAttr)
 	}
 
-	ftmeta := optionalString(block, "form_type_metadata")
+	ftmeta := optionalString(block, "styling")
 	formTypeMeta := make(map[string]any)
 	if ftmeta != "" {
 		_ = json.Unmarshal([]byte(ftmeta), &formTypeMeta)
@@ -65,12 +65,12 @@ func ParameterFromBlock(block *terraform.Block) (*types.Parameter, hcl.Diagnosti
 	p := types.Parameter{
 		Value: pVal,
 		ParameterData: types.ParameterData{
-			Name:             pName,
-			Description:      optionalString(block, "description"),
-			Type:             pType,
-			FormType:         formType,
-			FormTypeMetadata: formTypeMeta,
-			Mutable:          optionalBoolean(block, "mutable"),
+			Name:        pName,
+			Description: optionalString(block, "description"),
+			Type:        pType,
+			FormType:    formType,
+			Styling:     formTypeMeta,
+			Mutable:     optionalBoolean(block, "mutable"),
 			// Default value is always written as a string, then converted
 			// to the correct type.
 			DefaultValue: def,
@@ -88,7 +88,7 @@ func ParameterFromBlock(block *terraform.Block) (*types.Parameter, hcl.Diagnosti
 
 	optBlocks := block.GetBlocks("option")
 
-	optionType, newFormType, err := provider.ValidateFormType(string(p.Type), len(optBlocks), p.FormType)
+	optionType, newFormType, err := provider.ValidateFormType(provider.OptionType(p.Type), len(optBlocks), p.FormType)
 	var _ = optionType // TODO: Should we enforce this anywhere?
 	if err != nil {
 		diags = diags.Append(&hcl.Diagnostic{
diff --git a/extract/state.go b/extract/state.go
@@ -53,29 +53,31 @@ func ParameterFromState(block *tfjson.StateResource) (types.Parameter, error) {
 		return types.Parameter{}, fmt.Errorf("convert param validations: %w", err)
 	}
 
-	ftmeta := st.optionalString("form_type_metadata")
+	ftmeta := st.optionalString("styling")
 	var formTypeMeta any
 	if ftmeta != "" {
 		_ = json.Unmarshal([]byte(ftmeta), &formTypeMeta)
+	} else {
+		formTypeMeta = map[string]any{}
 	}
 
 	param := types.Parameter{
 		Value: types.StringLiteral(st.string("value")),
 		ParameterData: types.ParameterData{
-			Name:             st.string("name"),
-			Description:      st.optionalString("description"),
-			Type:             types.ParameterType(st.optionalString("type")),
-			FormType:         provider.ParameterFormType(st.optionalString("form_type")),
-			FormTypeMetadata: formTypeMeta,
-			Mutable:          st.optionalBool("mutable"),
-			DefaultValue:     types.StringLiteral(st.optionalString("default")),
-			Icon:             st.optionalString("icon"),
-			Options:          options,
-			Validations:      validations,
-			Required:         st.optionalBool("required"),
-			DisplayName:      st.optionalString("display_name"),
-			Order:            st.optionalInteger("order"),
-			Ephemeral:        st.optionalBool("ephemeral"),
+			Name:         st.string("name"),
+			Description:  st.optionalString("description"),
+			Type:         types.ParameterType(st.optionalString("type")),
+			FormType:     provider.ParameterFormType(st.optionalString("form_type")),
+			Styling:      formTypeMeta,
+			Mutable:      st.optionalBool("mutable"),
+			DefaultValue: types.StringLiteral(st.optionalString("default")),
+			Icon:         st.optionalString("icon"),
+			Options:      options,
+			Validations:  validations,
+			Required:     st.optionalBool("required"),
+			DisplayName:  st.optionalString("display_name"),
+			Order:        st.optionalInteger("order"),
+			Ephemeral:    st.optionalBool("ephemeral"),
 		},
 	}
 
diff --git a/go.mod b/go.mod
@@ -9,9 +9,10 @@ require (
 	github.com/aquasecurity/trivy v0.58.2
 	github.com/coder/guts v1.0.2-0.20250227211802-139809366a22
 	github.com/coder/serpent v0.10.0
-	github.com/coder/terraform-provider-coder/v2 v2.2.1-0.20250324135603-0b76448b8bd1
+	github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b
 	github.com/coder/websocket v1.8.13
 	github.com/go-chi/chi v4.1.2+incompatible
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/hc-install v0.9.1
 	github.com/hashicorp/hcl/v2 v2.23.0
@@ -66,7 +67,6 @@ require (
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -718,8 +718,8 @@ github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
 github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=
 github.com/coder/serpent v0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
-github.com/coder/terraform-provider-coder/v2 v2.2.1-0.20250324135603-0b76448b8bd1 h1:RfLwYVe6GwyEhHc3/y/9h4LPgfziOkrDhLyS+WaC0EI=
-github.com/coder/terraform-provider-coder/v2 v2.2.1-0.20250324135603-0b76448b8bd1/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
+github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b h1:FTCKE+v4So2jaiBTgXXM7KPv002ayhOGlNSUWaNEGm0=
+github.com/coder/terraform-provider-coder/v2 v2.3.1-0.20250407164559-8356ff71938b/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
 github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
 github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
diff --git a/site/src/DynamicForm.tsx b/site/src/DynamicForm.tsx
@@ -216,7 +216,7 @@ export function DynamicForm() {
                   <Select
                     onValueChange={field.onChange}
                     defaultValue={parameterValue(param.default_value)}
-                    disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}
+                    disabled={(param.styling as { disabled?: boolean })?.disabled}
                   >
                     <SelectTrigger>
                       <SelectValue placeholder={param.description} />
@@ -267,7 +267,7 @@ export function DynamicForm() {
                       //   })) 
                       //   : []}
                       emptyIndicator={<p className="text-sm">No results found</p>}
-                      disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}
+                      disabled={(param.styling as { disabled?: boolean })?.disabled}
                     />
                   </div>
                 )}
@@ -298,7 +298,7 @@ export function DynamicForm() {
                       onValueChange={(value) => {
                         field.onChange(value[0].toString());
                       }}
-                      disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}
+                      disabled={(param.styling as { disabled?: boolean })?.disabled}
                       />
                   </div>
                 )}
@@ -315,7 +315,7 @@ export function DynamicForm() {
                 control={methods.control}
                 render={({ field }) => (
                   <div>
-                    <RadioGroup defaultValue={parameterValue(param.default_value)} onValueChange={field.onChange} disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}>
+                    <RadioGroup defaultValue={parameterValue(param.default_value)} onValueChange={field.onChange} disabled={(param.styling as { disabled?: boolean })?.disabled}>
                     {(param.options || []).map((option, idx) => {
                           if (!option) return null;
                           return (
@@ -344,7 +344,7 @@ export function DynamicForm() {
                       <Switch 
                         checked={Boolean(field.value === "true")} 
                         onCheckedChange={(checked) => field.onChange(checked.toString())} 
-                        disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled} 
+                        disabled={(param.styling as { disabled?: boolean })?.disabled}
                       />
                     </div>
                   )}
@@ -361,7 +361,7 @@ export function DynamicForm() {
                   control={methods.control}
                   render={({ field }) => (
                     <div>
-                      <Checkbox checked={Boolean(field.value === "true")} onCheckedChange={(checked) => field.onChange(checked.toString())} disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled} />
+                      <Checkbox checked={Boolean(field.value === "true")} onCheckedChange={(checked) => field.onChange(checked.toString())} disabled={(param.styling as { disabled?: boolean })?.disabled} />
                     </div>
                   )}
                 />
@@ -380,7 +380,7 @@ export function DynamicForm() {
                           <Textarea
                             value={field.value}
                             onChange={(e) => field.onChange(e)}
-                            disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}
+                            disabled={(param.styling as { disabled?: boolean })?.disabled}
                           />
                         </div>
                       )}
@@ -402,7 +402,7 @@ export function DynamicForm() {
                           }}
                           type={mapParamTypeToInputType(param.type)}
                           defaultValue={parameterValue(param.default_value)}
-                          disabled={(param.form_type_metadata as { disabled?: boolean })?.disabled}
+                          disabled={(param.styling as { disabled?: boolean })?.disabled}
                         />
                       )}
                     />
diff --git a/site/src/types/preview.ts b/site/src/types/preview.ts
@@ -36,7 +36,7 @@ export interface ParameterData {
     // this is likely an enum in an external package "github.com/coder/terraform-provider-coder/v2/provider.ParameterFormType"
     readonly form_type: string;
     // empty interface{} type, falling back to unknown
-    readonly form_type_metadata: unknown;
+    readonly styling: unknown;
     readonly mutable: boolean;
     readonly default_value: NullHCLString;
     readonly icon: string;
diff --git a/testdata/connections/main.tf b/testdata/connections/main.tf
@@ -63,7 +63,7 @@ data "coder_parameter" display {
   default = local.solved ? false : true
   # default = local.solved ? "" : "Keep guessing!"
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = !local.solved
   })
 }
@@ -81,7 +81,7 @@ data "coder_parameter" "rows" {
   # name = "rows"
   type = "list(string)"
   form_type = "multi-select"
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = module.checker[each.value].solved
   })
   default = "[]"
diff --git a/testdata/demo/parameters.tf b/testdata/demo/parameters.tf
@@ -71,7 +71,7 @@ data "coder_parameter" "cpu" {
   mutable      = true
   order        = 20
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     "minumum" = 1
     "budget"  = 2
     "performance" = module.base.security_level == "high" ? 4 : 8
diff --git a/testdata/demo/plan.json b/testdata/demo/plan.json
@@ -123,7 +123,7 @@
               "display_name": null,
               "ephemeral": false,
               "form_type": "radio",
-              "form_type_metadata": "{}",
+              "styling": "{}",
               "icon": null,
               "id": "5e27a5d3-52ef-41ba-9c6b-cc4cdb1c98ff",
               "mutable": false,
@@ -190,7 +190,7 @@
               "display_name": "CPU",
               "ephemeral": false,
               "form_type": "slider",
-              "form_type_metadata": "{\"budget\":2,\"minumum\":1,\"performance\":4}",
+              "styling": "{\"budget\":2,\"minumum\":1,\"performance\":4}",
               "icon": "/icon/memory.svg",
               "id": "6e2e551e-b126-490a-a061-08504848bdb5",
               "mutable": true,
@@ -231,7 +231,7 @@
               "display_name": "Region",
               "ephemeral": false,
               "form_type": "radio",
-              "form_type_metadata": "{}",
+              "styling": "{}",
               "icon": "/icon/memory.svg",
               "id": "c60ab269-96a7-42a7-9aaa-d9a6f0f60ecd",
               "mutable": false,
@@ -298,7 +298,7 @@
               "display_name": null,
               "ephemeral": false,
               "form_type": "radio",
-              "form_type_metadata": "{}",
+              "styling": "{}",
               "icon": null,
               "id": "09c65d3c-f116-49a0-855c-6675c4aa1c21",
               "mutable": false,
@@ -474,7 +474,7 @@
                   "display_name": "JetBrains IDE",
                   "ephemeral": false,
                   "form_type": "radio",
-                  "form_type_metadata": "{}",
+                  "styling": "{}",
                   "icon": "/icon/gateway.svg",
                   "id": "a56f76ad-7626-4a22-b7b4-d0dac5c6e93a",
                   "mutable": true,
@@ -709,7 +709,7 @@
             "form_type": {
               "constant_value": "slider"
             },
-            "form_type_metadata": {
+            "styling": {
               "references": [
                 "module.base.security_level",
                 "module.base"
diff --git a/testdata/demo_flat/parameters.tf b/testdata/demo_flat/parameters.tf
@@ -72,7 +72,7 @@ data "coder_parameter" "cpu" {
   mutable      = true
   order        = 20
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     "minumum" = 1
     "budget"  = 2
     "performance" = local.secutity_level == "high" ? 4 : 8
diff --git a/testdata/module/plan.json b/testdata/module/plan.json
@@ -172,7 +172,7 @@
               "display_name": "Extra Param",
               "ephemeral": false,
               "form_type": "input",
-              "form_type_metadata": "{}",
+              "styling": "{}",
               "icon": null,
               "id": "792c6343-65bf-470a-8edb-f88d89e03cce",
               "mutable": false,
@@ -257,7 +257,7 @@
                   "display_name": "JetBrains IDE",
                   "ephemeral": false,
                   "form_type": "radio",
-                  "form_type_metadata": "{}",
+                  "styling": "{}",
                   "icon": "/icon/gateway.svg",
                   "id": "5cacbcbc-adcf-46dd-bd54-6292a6797fbf",
                   "mutable": true,
diff --git a/testdata/wordle/main.tf b/testdata/wordle/main.tf
@@ -49,7 +49,7 @@ data "coder_parameter" "letter_bank" {
   order = 9
   default = ""
   form_type = "input"
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = !local.solved
   })
   # count = 0
@@ -63,7 +63,7 @@ data "coder_parameter" "one" {
   order = 11
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.one.value) == 5 && contains(local.wordlist,data.coder_parameter.one.value)) || local.solved
   })
 
@@ -89,7 +89,7 @@ data "coder_parameter" "two" {
   order = 12
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.two.value) == 5 && contains(local.wordlist,data.coder_parameter.two.value)) || local.solved
   })
 
@@ -115,7 +115,7 @@ data "coder_parameter" "three" {
   order = 13
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.three.value) == 5 && contains(local.wordlist,data.coder_parameter.three.value)) || local.solved
   })
 
@@ -141,7 +141,7 @@ data "coder_parameter" "four" {
   order = 14
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.four.value) == 5 && contains(local.wordlist,data.coder_parameter.four.value)) || local.solved
   })
 
@@ -167,7 +167,7 @@ data "coder_parameter" "five" {
   order = 15
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.five.value) == 5 && contains(local.wordlist,data.coder_parameter.five.value)) || local.solved
   })
 
@@ -193,7 +193,7 @@ data "coder_parameter" "six" {
   order = 16
   default = ""
 
-  form_type_metadata = jsonencode({
+  styling = jsonencode({
     disabled = (length(data.coder_parameter.six.value) == 5 && contains(local.wordlist,data.coder_parameter.six.value)) || local.solved
   })
 
diff --git a/types/parameter.go b/types/parameter.go
