test: Update terraform tests for provider v0.6.7

coder · mafredri · Jan 24, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
commit aaf19bcb00ee608e945d5b2f64950f0abb34531e
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -27,6 +27,8 @@ type agentAttributes struct {
 	ConnectionTimeoutSeconds int32             `mapstructure:"connection_timeout"`
 	TroubleshootingURL       string            `mapstructure:"troubleshooting_url"`
 	MOTDFile                 string            `mapstructure:"motd_file"`
+	DelayLoginUntilReady     bool              `mapstructure:"delay_login_until_ready"`
+	StartupScriptTimeout     int32             `mapstructure:"startup_script_timeout"`
 }
 
 // A mapping of attributes on the "coder_app" resource.
@@ -132,6 +134,8 @@ func ConvertResourcesAndParameters(modules []*tfjson.StateModule, rawGraph strin
 			ConnectionTimeoutSeconds: attrs.ConnectionTimeoutSeconds,
 			TroubleshootingUrl:       attrs.TroubleshootingURL,
 			MotdFile:                 attrs.MOTDFile,
+			DelayLoginUntilReady:     attrs.DelayLoginUntilReady,
+			StartupScriptTimeout:     attrs.StartupScriptTimeout,
 		}
 		switch attrs.Auth {
 		case "token":

diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -105,20 +105,26 @@ func TestConvertResources(t *testing.T) {
 					Architecture:             "amd64",
 					Auth:                     &proto.Agent_Token{},
 					ConnectionTimeoutSeconds: 120,
+					DelayLoginUntilReady:     false,
+					StartupScriptTimeout:     300,
 				}, {
 					Name:                     "dev2",
 					OperatingSystem:          "darwin",
 					Architecture:             "amd64",
 					Auth:                     &proto.Agent_Token{},
 					ConnectionTimeoutSeconds: 1,
 					MotdFile:                 "/etc/motd",
+					DelayLoginUntilReady:     false,
+					StartupScriptTimeout:     30,
 				}, {
 					Name:                     "dev3",
 					OperatingSystem:          "windows",
 					Architecture:             "arm64",
 					Auth:                     &proto.Agent_Token{},
 					ConnectionTimeoutSeconds: 120,
 					TroubleshootingUrl:       "https://coder.com/troubleshoot",
+					DelayLoginUntilReady:     true,
+					StartupScriptTimeout:     300,
 				}},
 			}},
 		},
@@ -231,7 +237,8 @@ func TestConvertResources(t *testing.T) {
 						ConnectionTimeoutSeconds: 120,
 					}},
 				},
-			}},
+			},
+		},
 		"rich-parameters": {
 			resources: []*proto.Resource{{
 				Name: "dev",

diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh
@@ -9,6 +9,7 @@ for d in */; do
 
 	# This needs care to update correctly.
 	if [[ $name == "kubernetes-metadata" ]]; then
+		popd
 		continue
 	fi
 

diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.4"
+      version = "0.6.7"
     }
   }
 }
@@ -13,16 +13,19 @@ resource "coder_agent" "dev1" {
 }
 
 resource "coder_agent" "dev2" {
-  os                 = "darwin"
-  arch               = "amd64"
-  connection_timeout = 1
-  motd_file          = "/etc/motd"
+  os                      = "darwin"
+  arch                    = "amd64"
+  connection_timeout      = 1
+  motd_file               = "/etc/motd"
+  startup_script_timeout  = 30
+  delay_login_until_ready = false
 }
 
 resource "coder_agent" "dev3" {
-  os                  = "windows"
-  arch                = "arm64"
-  troubleshooting_url = "https://coder.com/troubleshoot"
+  os                      = "windows"
+  arch                    = "arm64"
+  troubleshooting_url     = "https://coder.com/troubleshoot"
+  delay_login_until_ready = true
 }
 
 resource "null_resource" "dev" {

diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json
diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ for d in */; do @@
     	# This needs care to update correctly.
     	if [[ $name == "kubernetes-metadata" ]]; then
+    		popd
     		continue
     	fi
@@ Expand Down @@