Mar 6, 2023 · Nov 24, 2022 · Nov 25, 2022 · Nov 25, 2022 · Nov 25, 2022 · Feb 1, 2023
diff --git a/agent/agent.go b/agent/agent.go
 close(a.closed)
 a.closeCancel()

 rawMetadata := a.metadata.Load()
 if rawMetadata == nil {
 return xerrors.Errorf("no metadata was provided")
 }
 metadata, valid := rawMetadata.(codersdk.WorkspaceAgentMetadata)
 if !valid {
 return xerrors.Errorf("metadata is the wrong type: %T", metadata)
 }

 ctx := context.Background()
 err := a.runShutdownScript(ctx, metadata.ShutdownScript)
 if err != nil {
 a.logger.Error(ctx, "shutdown script failed", slog.Error(err))
 if metadata, ok := a.metadata.Load().(agentsdk.Metadata); ok {
 ctx := context.Background()
 err := a.runShutdownScript(ctx, metadata.ShutdownScript)
 if err != nil {
 a.logger.Error(ctx, "shutdown script failed", slog.Error(err))
 }
 } else {
 // No metadata.. halt?
 _ = false
 }

 if a.network != nil {
diff --git a/agent/agent_test.go b/agent/agent_test.go
 client := &client{
 t:       t,
 agentID: uuid.New(),
 metadata:codersdk.WorkspaceAgentMetadata{
 metadata:agentsdk.Metadata{
 DERPMap:        tailnettest.RunDERPAndSTUN(t),
 StartupScript:  "echo 1",
 ShutdownScript: "echo " + expected,
 },
 statsChan:   make(chan *codersdk.AgentStats),
 statsChan:   make(chan *agentsdk.Stats),
 coordinator: tailnet.NewCoordinator(),
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1301,19 +1301,15 @@ func (a *agent) Close() error {
		close(a.closed)
		a.closeCancel()

		rawMetadata := a.metadata.Load()
		if rawMetadata == nil {
		return xerrors.Errorf("no metadata was provided")
		}
		metadata, valid := rawMetadata.(codersdk.WorkspaceAgentMetadata)
		if !valid {
		return xerrors.Errorf("metadata is the wrong type: %T", metadata)
		}

		ctx := context.Background()
		err := a.runShutdownScript(ctx, metadata.ShutdownScript)
		if err != nil {
		a.logger.Error(ctx, "shutdown script failed", slog.Error(err))
		if metadata, ok := a.metadata.Load().(agentsdk.Metadata); ok {
		ctx := context.Background()
		err := a.runShutdownScript(ctx, metadata.ShutdownScript)
		if err != nil {
		a.logger.Error(ctx, "shutdown script failed", slog.Error(err))
		}
		} else {
		// No metadata.. halt?
		_ = false
		}

		if a.network != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -834,12 +834,12 @@ func TestAgent_Lifecycle(t *testing.T) {
		client := &client{
		t: t,
		agentID: uuid.New(),
		metadata:codersdk.WorkspaceAgentMetadata{
		metadata:agentsdk.Metadata{
		DERPMap: tailnettest.RunDERPAndSTUN(t),
		StartupScript: "echo 1",
		ShutdownScript: "echo " + expected,
		},
		statsChan: make(chan *codersdk.AgentStats),
		statsChan: make(chan *agentsdk.Stats),
		coordinator: tailnet.NewCoordinator(),
		}

Expand Down