test: add sub agent antagonist for workspace builder too

mafredri · mafredri · commit 612123158ba7 · 2025-06-19T13:12:39.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
+	"errors"
 	"testing"
 	"time"
 
@@ -243,6 +244,25 @@ func (b WorkspaceBuildBuilder) Do() WorkspaceResponse {
 		require.NoError(b.t, err)
 	}
 
+	agents, err := b.db.GetWorkspaceAgentsByWorkspaceAndBuildNumber(ownerCtx, database.GetWorkspaceAgentsByWorkspaceAndBuildNumberParams{
+		WorkspaceID: resp.Workspace.ID,
+		BuildNumber: resp.Build.BuildNumber,
+	})
+	if !errors.Is(err, sql.ErrNoRows) {
+		require.NoError(b.t, err, "get workspace agents")
+		// Insert deleted subagent test antagonists for the workspace build.
+		// See also `dbgen.WorkspaceAgent()`.
+		for _, agent := range agents {
+			subAgent := dbgen.WorkspaceSubAgent(b.t, b.db, agent, database.WorkspaceAgent{
+				TroubleshootingURL: "I AM A TEST ANTAGONIST AND I AM HERE TO MESS UP YOUR TESTS. IF YOU SEE ME, SOMETHING IS WRONG AND SUB AGENT DELETION MAY NOT BE HANDLED CORRECTLY IN A QUERY.",
+			})
+			err = b.db.DeleteWorkspaceSubAgentByID(ownerCtx, subAgent.ID)
+			require.NoError(b.t, err, "delete workspace agent subagent antagonist")
+
+			b.t.Logf("inserted deleted subagent antagonist %s (%v) for workspace agent %s (%v)", subAgent.Name, subAgent.ID, agent.Name, agent.ID)
+		}
+	}
+
 	return resp
 }
 
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -227,39 +227,49 @@ func WorkspaceAgent(t testing.TB, db database.Store, orig database.WorkspaceAgen
 		require.NoError(t, err, "update workspace agent first connected at")
 	}
 
-	// Add a test antagonist. For every agent we add a deleted sub agent
-	// to discover cases where deletion should be handled.
-	subAgt, err := db.InsertWorkspaceAgent(genCtx, database.InsertWorkspaceAgentParams{
-		ID:                       uuid.New(),
-		ParentID:                 uuid.NullUUID{UUID: agt.ID, Valid: true},
-		CreatedAt:                dbtime.Now(),
-		UpdatedAt:                dbtime.Now(),
-		Name:                     testutil.GetRandomName(t),
-		ResourceID:               agt.ResourceID,
-		AuthToken:                uuid.New(),
-		AuthInstanceID:           sql.NullString{},
-		Architecture:             agt.Architecture,
-		EnvironmentVariables:     pqtype.NullRawMessage{},
-		OperatingSystem:          agt.OperatingSystem,
-		Directory:                agt.Directory,
-		InstanceMetadata:         pqtype.NullRawMessage{},
-		ResourceMetadata:         pqtype.NullRawMessage{},
-		ConnectionTimeoutSeconds: agt.ConnectionTimeoutSeconds,
-		TroubleshootingURL:       "I AM A TEST ANTAGONIST AND I AM HERE TO MESS UP YOUR TESTS. IF YOU SEE ME, SOMETHING IS WRONG AND SUB AGENT DELETION MAY NOT BE HANDLED CORRECTLY IN A QUERY.",
-		MOTDFile:                 "",
-		DisplayApps:              nil,
-		DisplayOrder:             agt.DisplayOrder,
-		APIKeyScope:              agt.APIKeyScope,
-	})
-	require.NoError(t, err, "insert workspace agent subagent antagonist")
-	err = db.DeleteWorkspaceSubAgentByID(genCtx, subAgt.ID)
-	require.NoError(t, err, "delete workspace agent subagent antagonist")
+	if orig.ParentID.UUID == uuid.Nil {
+		// Add a test antagonist. For every agent we add a deleted sub agent
+		// to discover cases where deletion should be handled.
+		// See also `(dbfake.WorkspaceBuildBuilder).Do()`.
+		subAgt, err := db.InsertWorkspaceAgent(genCtx, database.InsertWorkspaceAgentParams{
+			ID:                       uuid.New(),
+			ParentID:                 uuid.NullUUID{UUID: agt.ID, Valid: true},
+			CreatedAt:                dbtime.Now(),
+			UpdatedAt:                dbtime.Now(),
+			Name:                     testutil.GetRandomName(t),
+			ResourceID:               agt.ResourceID,
+			AuthToken:                uuid.New(),
+			AuthInstanceID:           sql.NullString{},
+			Architecture:             agt.Architecture,
+			EnvironmentVariables:     pqtype.NullRawMessage{},
+			OperatingSystem:          agt.OperatingSystem,
+			Directory:                agt.Directory,
+			InstanceMetadata:         pqtype.NullRawMessage{},
+			ResourceMetadata:         pqtype.NullRawMessage{},
+			ConnectionTimeoutSeconds: agt.ConnectionTimeoutSeconds,
+			TroubleshootingURL:       "I AM A TEST ANTAGONIST AND I AM HERE TO MESS UP YOUR TESTS. IF YOU SEE ME, SOMETHING IS WRONG AND SUB AGENT DELETION MAY NOT BE HANDLED CORRECTLY IN A QUERY.",
+			MOTDFile:                 "",
+			DisplayApps:              nil,
+			DisplayOrder:             agt.DisplayOrder,
+			APIKeyScope:              agt.APIKeyScope,
+		})
+		require.NoError(t, err, "insert workspace agent subagent antagonist")
+		err = db.DeleteWorkspaceSubAgentByID(genCtx, subAgt.ID)
+		require.NoError(t, err, "delete workspace agent subagent antagonist")
 
-	t.Logf("inserted workspace agent %s (%v) with deleted subagent antagonist %s (%v)", agt.Name, agt.ID, subAgt.Name, subAgt.ID)
+		t.Logf("inserted deleted subagent antagonist %s (%v) for workspace agent %s (%v)", subAgt.Name, subAgt.ID, agt.Name, agt.ID)
+	}
 
 	return agt
 }
 
+func WorkspaceSubAgent(t testing.TB, db database.Store, parentAgent database.WorkspaceAgent, orig database.WorkspaceAgent) database.WorkspaceAgent {
+	orig.ParentID = uuid.NullUUID{UUID: parentAgent.ID, Valid: true}
+	orig.ResourceID = parentAgent.ResourceID
+	subAgt := WorkspaceAgent(t, db, orig)
+	return subAgt
+}
+
 func WorkspaceAgentScript(t testing.TB, db database.Store, orig database.WorkspaceAgentScript) database.WorkspaceAgentScript {
 	scripts, err := db.InsertWorkspaceAgentScripts(genCtx, database.InsertWorkspaceAgentScriptsParams{
 		WorkspaceAgentID: takeFirst(orig.WorkspaceAgentID, uuid.New()),
