More code

mtojek · mafredri · commit d1677a908ec5 · 2023-02-09T09:55:35.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -772,6 +772,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
 				Apps: []*sdkproto.App{{
 					Slug: "a",
 				}},
+				ShutdownScript: "shutdown",
 			}},
 		})
 		require.NoError(t, err)
@@ -786,6 +787,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
 		require.Equal(t, "amd64", agent.Architecture)
 		require.Equal(t, "linux", agent.OperatingSystem)
 		require.Equal(t, "value", agent.StartupScript.String)
+		require.Equal(t, "shutdown", agent.ShutdownScript.String)
 		want, err := json.Marshal(map[string]string{
 			"something": "test",
 		})
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -550,6 +550,7 @@ func ConvertWorkspaceAgent(agent database.WorkspaceAgent) WorkspaceAgent {
 		StartupScript:            agent.StartupScript.Valid,
 		Directory:                agent.Directory != "",
 		ConnectionTimeoutSeconds: agent.ConnectionTimeoutSeconds,
+		ShutdownScript:           agent.ShutdownScript.Valid,
 	}
 	if agent.FirstConnectedAt.Valid {
 		snapAgent.FirstConnectedAt = &agent.FirstConnectedAt.Time
@@ -750,6 +751,7 @@ type WorkspaceAgent struct {
 	LastConnectedAt          *time.Time `json:"last_connected_at"`
 	DisconnectedAt           *time.Time `json:"disconnected_at"`
 	ConnectionTimeoutSeconds int32      `json:"connection_timeout_seconds"`
+	ShutdownScript           bool       `json:"shutdown_script"`
 }
 
 type WorkspaceApp struct {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -791,6 +791,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 		LifecycleState:              codersdk.WorkspaceAgentLifecycle(dbAgent.LifecycleState),
 		LoginBeforeReady:            dbAgent.LoginBeforeReady,
 		StartupScriptTimeoutSeconds: dbAgent.StartupScriptTimeoutSeconds,
+		ShutdownScript:              dbAgent.ShutdownScript.String,
 	}
 	node := coordinator.Node(dbAgent.ID)
 	if node != nil {

Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,7 @@ func ConvertWorkspaceAgent(agent database.WorkspaceAgent) WorkspaceAgent {`
`550`	`550`	`StartupScript: agent.StartupScript.Valid,`
`551`	`551`	`Directory: agent.Directory != "",`
`552`	`552`	`ConnectionTimeoutSeconds: agent.ConnectionTimeoutSeconds,`
	`553`	`+ ShutdownScript: agent.ShutdownScript.Valid,`
`553`	`554`	`}`
`554`	`555`	`if agent.FirstConnectedAt.Valid {`
`555`	`556`	`snapAgent.FirstConnectedAt = &agent.FirstConnectedAt.Time`
`@@ -750,6 +751,7 @@ type WorkspaceAgent struct {`
`750`	`751`	LastConnectedAt *time.Time `json:"last_connected_at"`
`751`	`752`	DisconnectedAt *time.Time `json:"disconnected_at"`
`752`	`753`	ConnectionTimeoutSeconds int32 `json:"connection_timeout_seconds"`
	`754`	+ ShutdownScript bool `json:"shutdown_script"`
`753`	`755`	`}`
`754`	`756`
`755`	`757`	`type WorkspaceApp struct {`
Original file line number	Diff line number	Diff line change
`@@ -791,6 +791,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin`
`791`	`791`	`LifecycleState: codersdk.WorkspaceAgentLifecycle(dbAgent.LifecycleState),`
`792`	`792`	`LoginBeforeReady: dbAgent.LoginBeforeReady,`
`793`	`793`	`StartupScriptTimeoutSeconds: dbAgent.StartupScriptTimeoutSeconds,`
	`794`	`+ ShutdownScript: dbAgent.ShutdownScript.String,`
`794`	`795`	`}`
`795`	`796`	`node := coordinator.Node(dbAgent.ID)`
`796`	`797`	`if node != nil {`