Fix rebase

mafredri · mafredri · commit 82159e4544f1 · 2023-03-06T11:26:02.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -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 {
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -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(),
 		}
 
