fallback to JSON-encoding default variable values

johnstcn · johnstcn · commit 222fd902aaa1 · 2025-01-03T18:34:30.000Z
diff --git a/provisioner/terraform/tfparse/tfparse.go b/provisioner/terraform/tfparse/tfparse.go
@@ -598,7 +598,11 @@ func interfaceToString(i interface{}) (string, error) {
 		return strconv.FormatFloat(v, 'f', -1, 64), nil
 	case bool:
 		return strconv.FormatBool(v), nil
-	default:
-		return "", xerrors.Errorf("unsupported type %T", v)
+	default: // just try to JSON-encode it.
+		var sb strings.Builder
+		if err := json.NewEncoder(&sb).Encode(i); err != nil {
+			return "", xerrors.Errorf("convert %T: %w", v, err)
+		}
+		return strings.TrimSpace(sb.String()), nil
 	}
 }
diff --git a/provisioner/terraform/tfparse/tfparse_test.go b/provisioner/terraform/tfparse/tfparse_test.go
@@ -462,6 +462,14 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
 						type    = bool
 						default = true
 					}
+					variable "listvar" {
+						type    = list(string)
+						default = ["a"]
+					}
+					variable "mapvar" {
+						type    = map(string)
+						default = {"a": "b"}
+					}
 					data "coder_parameter" "stringparam" {
 						name    = "stringparam"
 						type    = "string"
@@ -487,6 +495,8 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
 							"stringvar"   = var.stringvar
 							"numvar"      = var.numvar
 							"boolvar"     = var.boolvar
+							"listvar"     = var.listvar
+							"mapvar"      = var.mapvar
 							"stringparam" = data.coder_parameter.stringparam.value
 							"numparam"    = data.coder_parameter.numparam.value
 							"boolparam"   = data.coder_parameter.boolparam.value
@@ -498,47 +508,15 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
 				"stringvar":   "a",
 				"numvar":      "1",
 				"boolvar":     "true",
+				"listvar":     `["a"]`,
+				"mapvar":      `{"a":"b"}`,
 				"stringparam": "a",
 				"numparam":    "1",
 				"boolparam":   "true",
 				"listparam":   `["a", "b"]`,
 			},
 			expectError: ``,
 		},
-		{
-			name: "unsupported list variable",
-			files: map[string]string{
-				"main.tf": `
-					variable "listvar" {
-						type    = list(string)
-						default = ["a"]
-					}
-					data "coder_workspace_tags" "tags" {
-						tags = {
-							listvar = var.listvar
-						}
-					}`,
-			},
-			expectTags:  nil,
-			expectError: `can't convert variable default value to string: unsupported type []interface {}`,
-		},
-		{
-			name: "unsupported map variable",
-			files: map[string]string{
-				"main.tf": `
-					variable "mapvar" {
-						type    = map(string)
-						default = {"a": "b"}
-					}
-					data "coder_workspace_tags" "tags" {
-						tags = {
-							mapvar = var.mapvar
-						}
-					}`,
-			},
-			expectTags:  nil,
-			expectError: `can't convert variable default value to string: unsupported type map[string]interface {}`,
-		},
 		{
 			name: "overlapping var name",
 			files: map[string]string{
@@ -547,6 +525,10 @@ func Test_WorkspaceTagDefaultsFromFile(t *testing.T) {
 					type = string
 					default = "1"
 				}
+				variable "unused" {
+					type = map(string)
+					default = {"a" : "b"}
+				}
 				variable "ab" {
 					description = "This is a variable of type string"
 					type        = string

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,11 @@ func interfaceToString(i interface{}) (string, error) {`
`598`	`598`	`return strconv.FormatFloat(v, 'f', -1, 64), nil`
`599`	`599`	`case bool:`
`600`	`600`	`return strconv.FormatBool(v), nil`
`601`		`- default:`
`602`		`- return "", xerrors.Errorf("unsupported type %T", v)`
	`601`	`+ default: // just try to JSON-encode it.`
	`602`	`+ var sb strings.Builder`
	`603`	`+ if err := json.NewEncoder(&sb).Encode(i); err != nil {`
	`604`	`+ return "", xerrors.Errorf("convert %T: %w", v, err)`
	`605`	`+ }`
	`606`	`+ return strings.TrimSpace(sb.String()), nil`
`603`	`607`	`}`
`604`	`608`	`}`