chore!: use map over list for template tf_vars & provisioner_tags

ethanndickson · ethanndickson · commit 1128eba81102 · 2024-10-31T14:38:26.000Z
diff --git a/docs/index.md b/docs/index.md
@@ -58,10 +58,9 @@ resource "coderd_template" "example" {
   versions = [{
     directory = "./example-template"
     active    = true
-    tf_vars = [{
-      name  = "image_id"
-      value = "ami-12345678"
-    }]
+    tf_vars = {
+      "image_id" = "ami-12345678"
+    }
     # Version names can be randomly generated if null/omitted
   }]
   acl = {
diff --git a/docs/resources/template.md b/docs/resources/template.md
@@ -100,32 +100,14 @@ Optional:
 - `active` (Boolean) Whether this version is the active version of the template. Only one version can be active at a time.
 - `message` (String) A message describing the changes in this version of the template. Messages longer than 72 characters will be truncated.
 - `name` (String) The name of the template version. Automatically generated if not provided. If provided, the name *must* change each time the directory contents, or the `tf_vars` attribute are updated.
-- `provisioner_tags` (Attributes Set) Provisioner tags for the template version. (see [below for nested schema](#nestedatt--versions--provisioner_tags))
-- `tf_vars` (Attributes Set) Terraform variables for the template version. (see [below for nested schema](#nestedatt--versions--tf_vars))
+- `provisioner_tags` (Map of String) Provisioner tags for the template version.
+- `tf_vars` (Map of String) Terraform variables for the template version.
 
 Read-Only:
 
 - `directory_hash` (String)
 - `id` (String)
 
-<a id="nestedatt--versions--provisioner_tags"></a>
-### Nested Schema for `versions.provisioner_tags`
-
-Required:
-
-- `name` (String)
-- `value` (String)
-
-
-<a id="nestedatt--versions--tf_vars"></a>
-### Nested Schema for `versions.tf_vars`
-
-Required:
-
-- `name` (String)
-- `value` (String)
-
-
 
 <a id="nestedatt--acl"></a>
 ### Nested Schema for `acl`
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
@@ -38,10 +38,9 @@ resource "coderd_template" "example" {
   versions = [{
     directory = "./example-template"
     active    = true
-    tf_vars = [{
-      name  = "image_id"
-      value = "ami-12345678"
-    }]
+    tf_vars = {
+      "image_id" = "ami-12345678"
+    }
     # Version names can be randomly generated if null/omitted
   }]
   acl = {
diff --git a/integration/template-test/main.tf b/integration/template-test/main.tf
@@ -43,22 +43,16 @@ resource "coderd_template" "sample" {
     {
       directory = "./example-template-2"
       active    = true
-      tf_vars = [
-        {
-          name  = "name"
-          value = "world"
-        },
-      ]
+      tf_vars = {
+        name = "world"
+      }
     },
     {
       directory = "./example-template-2"
       active    = false
-      tf_vars = [
-        {
-          name  = "name"
-          value = "ethan"
-        },
-      ]
+      tf_vars = {
+        name = "ethan"
+      }
     }
   ]
 }
diff --git a/internal/provider/template_data_source_test.go b/internal/provider/template_data_source_test.go
@@ -34,11 +34,8 @@ func TestAccTemplateDataSource(t *testing.T) {
 			Name:      types.StringValue("main"),
 			Message:   types.StringValue("Initial commit"),
 			Directory: types.StringValue("../../integration/template-test/example-template/"),
-			TerraformVariables: []Variable{
-				{
-					Name:  types.StringValue("name"),
-					Value: types.StringValue("world"),
-				},
+			TerraformVariables: map[string]string{
+				"name": "world",
 			},
 		},
 	})
diff --git a/internal/provider/template_resource.go b/internal/provider/template_resource.go
diff --git a/internal/provider/template_resource_test.go b/internal/provider/template_resource_test.go

Original file line number	Diff line number	Diff line change
`@@ -43,22 +43,16 @@ resource "coderd_template" "sample" {`
`43`	`43`	`{`
`44`	`44`	`directory = "./example-template-2"`
`45`	`45`	`active = true`
`46`		`- tf_vars = [`
`47`		`- {`
`48`		`- name = "name"`
`49`		`- value = "world"`
`50`		`- },`
`51`		`- ]`
	`46`	`+ tf_vars = {`
	`47`	`+ name = "world"`
	`48`	`+ }`
`52`	`49`	`},`
`53`	`50`	`{`
`54`	`51`	`directory = "./example-template-2"`
`55`	`52`	`active = false`
`56`		`- tf_vars = [`
`57`		`- {`
`58`		`- name = "name"`
`59`		`- value = "ethan"`
`60`		`- },`
`61`		`- ]`
	`53`	`+ tf_vars = {`
	`54`	`+ name = "ethan"`
	`55`	`+ }`
`62`	`56`	`}`
`63`	`57`	`]`
`64`	`58`	`}`