coder
diff --git a/‎provisioner/terraform/resources.go
Lines changed: 4 additions & 0 deletions b/‎provisioner/terraform/resources.go
Lines changed: 4 additions & 0 deletions
diff --git a/‎provisioner/terraform/resources_test.go
Lines changed: 8 additions & 1 deletion b/‎provisioner/terraform/resources_test.go
Lines changed: 8 additions & 1 deletion
diff --git a/‎provisioner/terraform/testdata/generate.sh
Lines changed: 1 addition & 0 deletions b/‎provisioner/terraform/testdata/generate.sh
Lines changed: 1 addition & 0 deletions
diff --git a/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tf
Lines changed: 11 additions & 8 deletions b/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tf
Lines changed: 11 additions & 8 deletions
diff --git a/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json
Lines changed: 29 additions & 2 deletions b/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json
Lines changed: 29 additions & 2 deletions
diff --git a/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json
Lines changed: 17 additions & 8 deletions b/‎provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json
Lines changed: 17 additions & 8 deletions
@@ -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":
 
@@ -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",
 
@@ -9,6 +9,7 @@ for d in */; do
 
 	# This needs care to update correctly.
 	if [[ $name == "kubernetes-metadata" ]]; then
+		popd
 		continue
 	fi
 
 
@@ -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" {
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`coder = {`
`4`	`4`	`source = "coder/coder"`
`5`		`- version = "0.6.4"`
	`5`	`+ version = "0.6.7"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
`@@ -13,16 +13,19 @@ resource "coder_agent" "dev1" {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`resource "coder_agent" "dev2" {`
`16`		`- os = "darwin"`
`17`		`- arch = "amd64"`
`18`		`- connection_timeout = 1`
`19`		`- motd_file = "/etc/motd"`
	`16`	`+ os = "darwin"`
	`17`	`+ arch = "amd64"`
	`18`	`+ connection_timeout = 1`
	`19`	`+ motd_file = "/etc/motd"`
	`20`	`+ startup_script_timeout = 30`
	`21`	`+ delay_login_until_ready = false`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`resource "coder_agent" "dev3" {`
`23`		`- os = "windows"`
`24`		`- arch = "arm64"`
`25`		`- troubleshooting_url = "https://coder.com/troubleshoot"`
	`25`	`+ os = "windows"`
	`26`	`+ arch = "arm64"`
	`27`	`+ troubleshooting_url = "https://coder.com/troubleshoot"`
	`28`	`+ delay_login_until_ready = true`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`resource "null_resource" "dev" {`