Terraform tests ok

coder · mtojek · Jun 30, 2023 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023
commit 091888b740b706ba2b33c2a8e41aa84bc44154b4
diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -383,6 +383,34 @@ func TestConvertResources(t *testing.T) {
 				DefaultValue: "ok",
 			}},
 		},
+		"rich-parameters-order": {
+			resources: []*proto.Resource{{
+				Name: "dev",
+				Type: "null_resource",
+				Agents: []*proto.Agent{{
+					Name:                         "dev",
+					OperatingSystem:              "windows",
+					ShutdownScriptTimeoutSeconds: 300,
+					StartupScriptTimeoutSeconds:  300,
+					Architecture:                 "arm64",
+					Auth:                         &proto.Agent_Token{},
+					StartupScriptBehavior:        "non-blocking",
+					ConnectionTimeoutSeconds:     120,
+				}},
+			}},
+			parameters: []*proto.RichParameter{{
+				Name:     "Example",
+				Type:     "string",
+				Required: true,
+				Order:    55,
+			}, {
+				Name:         "Sample",
+				Type:         "string",
+				Description:  "blah blah",
+				DefaultValue: "ok",
+				Order:        99,
+			}},
+		},
 		"rich-parameters-validation": {
 			resources: []*proto.Resource{{
 				Name: "dev",

diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-for d in rich-parameters-validation/; do
+for d in */; do
 	pushd "$d"
 	name=$(basename "$(pwd)")
 

diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf
@@ -0,0 +1,31 @@
+terraform {
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = "0.9.0"
+    }
+  }
+}
+
+data "coder_parameter" "sample" {
+  name        = "Sample"
+  type        = "string"
+  description = "blah blah"
+  default     = "ok"
+  order       = 99
+}
+
+data "coder_parameter" "example" {
+  name  = "Example"
+  type  = "string"
+  order = 55
+}
+
+resource "coder_agent" "dev" {
+  os   = "windows"
+  arch = "arm64"
+}
+
+resource "null_resource" "dev" {
+  depends_on = [coder_agent.dev]
+}
diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.dot b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.dot
diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json
diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.dot b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.dot