coder
diff --git a/‎coderd/provisionerdserver/provisionerdserver.go
Lines changed: 1 addition & 1 deletion b/‎coderd/provisionerdserver/provisionerdserver.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎provisioner/terraform/resources.go
Lines changed: 1 addition & 3 deletions b/‎provisioner/terraform/resources.go
Lines changed: 1 addition & 3 deletions
@@ -1299,7 +1299,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 			scriptLogPaths = append(scriptLogPaths, script.LogPath)
 			scriptSources = append(scriptSources, script.Script)
 			scriptCron = append(scriptCron, script.Cron)
-			scriptTimeout = append(scriptTimeout, script.Timeout)
+			scriptTimeout = append(scriptTimeout, script.TimeoutSeconds)
 			scriptStartBlocksLogin = append(scriptStartBlocksLogin, script.StartBlocksLogin)
 			scriptRunOnStart = append(scriptRunOnStart, script.RunOnStart)
 			scriptRunOnStop = append(scriptRunOnStop, script.RunOnStop)
 
@@ -238,7 +238,6 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 					DisplayName:      "Startup Script",
 					Script:           attrs.StartupScript,
 					StartBlocksLogin: startupScriptBehavior == string(codersdk.WorkspaceAgentStartupScriptBehaviorBlocking),
-					Timeout:          attrs.StartupScriptTimeoutSeconds,
 					RunOnStart:       true,
 				})
 			}
@@ -247,7 +246,6 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 					LogPath:     "coder-shutdown-script.log",
 					DisplayName: "Shutdown Script",
 					Script:      attrs.ShutdownScript,
-					Timeout:     attrs.ShutdownScriptTimeoutSeconds,
 					RunOnStop:   true,
 				})
 			}
@@ -456,7 +454,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 						StartBlocksLogin: attrs.StartBlocksLogin,
 						RunOnStart:       attrs.RunOnStart,
 						RunOnStop:        attrs.RunOnStop,
-						Timeout:          attrs.TimeoutSeconds,
+						TimeoutSeconds:   attrs.TimeoutSeconds,
 					})
 				}
 			}
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,6 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error`
`238`	`238`	`DisplayName: "Startup Script",`
`239`	`239`	`Script: attrs.StartupScript,`
`240`	`240`	`StartBlocksLogin: startupScriptBehavior == string(codersdk.WorkspaceAgentStartupScriptBehaviorBlocking),`
`241`		`- Timeout: attrs.StartupScriptTimeoutSeconds,`
`242`	`241`	`RunOnStart: true,`
`243`	`242`	`})`
`244`	`243`	`}`
`@@ -247,7 +246,6 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error`
`247`	`246`	`LogPath: "coder-shutdown-script.log",`
`248`	`247`	`DisplayName: "Shutdown Script",`
`249`	`248`	`Script: attrs.ShutdownScript,`
`250`		`- Timeout: attrs.ShutdownScriptTimeoutSeconds,`
`251`	`249`	`RunOnStop: true,`
`252`	`250`	`})`
`253`	`251`	`}`
`@@ -456,7 +454,7 @@ func ConvertState(modules []tfjson.StateModule, rawGraph string) (State, error`
`456`	`454`	`StartBlocksLogin: attrs.StartBlocksLogin,`
`457`	`455`	`RunOnStart: attrs.RunOnStart,`
`458`	`456`	`RunOnStop: attrs.RunOnStop,`
`459`		`- Timeout: attrs.TimeoutSeconds,`
	`457`	`+ TimeoutSeconds: attrs.TimeoutSeconds,`
`460`	`458`	`})`
`461`	`459`	`}`
`462`	`460`	`}`