fix: unique per resource not build

DanielleMaywood · DanielleMaywood · commit 2aadf9f9eb25 · 2025-05-27T14:19:14.000Z
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000330_workspace_agent_name_unique_trigger.up.sql b/coderd/database/migrations/000330_workspace_agent_name_unique_trigger.up.sql
@@ -1,37 +1,49 @@
 CREATE OR REPLACE FUNCTION check_workspace_agent_name_unique()
 RETURNS TRIGGER AS $$
 DECLARE
-    workspace_build_id uuid;
-    existing_count integer;
+    provisioner_job_id uuid;
+    agents_with_name integer;
 BEGIN
-    -- Get the workspace_build.id for this agent by following the relationship chain:
-    -- workspace_agents -> workspace_resources -> provisioner_jobs -> workspace_builds
-    SELECT wb.id INTO workspace_build_id
-    FROM workspace_resources wr
-    JOIN provisioner_jobs pj ON wr.job_id = pj.id
-    JOIN workspace_builds wb ON pj.id = wb.job_id
-    WHERE wr.id = NEW.resource_id;
+	-- Count how many agents in this resource already have
+	-- the given agent ID.
+	SELECT COUNT(*) INTO agents_with_name
+	FROM workspace_agents
+	WHERE workspace_agents.resource_id = NEW.resource_id
+	  AND workspace_agents.name = NEW.name
+	  AND workspace_agents.id != NEW.id;
 
-    -- If we couldn't find a workspace_build_id, allow the insert (might be a template import or other edge case)
-    IF workspace_build_id IS NULL THEN
-        RETURN NEW;
+	-- If there's already an agent with this name, raise an error
+    IF agents_with_name > 0 THEN
+        RAISE EXCEPTION 'workspace agent name "%" already exists in this workspace resource', NEW.name
+            USING ERRCODE = 'unique_violation';
     END IF;
 
-    -- Check if there's already an agent with this name for this workspace build
-    SELECT COUNT(*) INTO existing_count
-    FROM workspace_agents wa
-    JOIN workspace_resources wr ON wa.resource_id = wr.id
-    JOIN provisioner_jobs pj ON wr.job_id = pj.id
-    JOIN workspace_builds wb ON pj.id = wb.job_id
-    WHERE wb.id = workspace_build_id
-      AND wa.name = NEW.name
-      AND wa.id != NEW.id;  -- Exclude the current agent (for updates)
+    -- Get the provisioner_jobs.id for this agent by following the relationship chain:
+    -- workspace_agents -> workspace_resources -> provisioner_jobs
+    -- SELECT pj.id INTO provisioner_job_id
+    -- FROM workspace_resources wr
+    -- JOIN provisioner_jobs pj ON wr.job_id = pj.id
+    -- WHERE wr.id = NEW.resource_id;
+
+    -- If we couldn't find a provisioner_job.id, allow the insert (might be a template import or other edge case)
+    -- IF provisioner_job_id IS NULL THEN
+    --     RETURN NEW;
+    -- END IF;
+
+    -- Check if there's already an agent with this name for this provisioner job
+    -- SELECT COUNT(*) INTO existing_count
+    -- FROM workspace_agents wa
+    -- JOIN workspace_resources wr ON wa.resource_id = wr.id
+    -- JOIN provisioner_jobs pj ON wr.job_id = pj.id
+    -- WHERE pj.id = provisioner_job_id
+    --   AND wa.name = NEW.name
+    --   AND wa.id != NEW.id;
 
     -- If there's already an agent with this name, raise an error
-    IF existing_count > 0 THEN
-        RAISE EXCEPTION 'workspace agent name "%" already exists in this workspace', NEW.name
-            USING ERRCODE = 'unique_violation';
-    END IF;
+    -- IF existing_count > 0 THEN
+    --     RAISE EXCEPTION 'workspace agent name "%" already exists in this provisioner job', NEW.name
+    --         USING ERRCODE = 'unique_violation';
+    -- END IF;
 
     RETURN NEW;
 END;
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"sort"
-	"sync/atomic"
 	"testing"
 	"time"
 
@@ -4711,13 +4710,11 @@ func TestGetPresetsAtFailureLimit(t *testing.T) {
 func TestWorkspaceAgentNameUniqueTrigger(t *testing.T) {
 	t.Parallel()
 
-	var builds atomic.Int32
-
 	if !dbtestutil.WillUsePostgres() {
 		t.Skip("This test makes use of a database trigger not implemented in dbmem")
 	}
 
-	createWorkspaceWithAgent := func(t *testing.T, db database.Store, org database.Organization, agentName string) (database.WorkspaceTable, database.TemplateVersion, database.WorkspaceAgent) {
+	createWorkspaceWithAgent := func(t *testing.T, db database.Store, org database.Organization, agentName string) (database.WorkspaceTable, database.WorkspaceResource, database.WorkspaceAgent) {
 		t.Helper()
 
 		user := dbgen.User(t, db, database.User{})
@@ -4740,7 +4737,7 @@ func TestWorkspaceAgentNameUniqueTrigger(t *testing.T) {
 			OrganizationID: org.ID,
 		})
 		build := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
-			BuildNumber:       builds.Add(1),
+			BuildNumber:       1,
 			JobID:             job.ID,
 			WorkspaceID:       workspace.ID,
 			TemplateVersionID: templateVersion.ID,
@@ -4753,40 +4750,27 @@ func TestWorkspaceAgentNameUniqueTrigger(t *testing.T) {
 			Name:       agentName,
 		})
 
-		return workspace, templateVersion, agent
+		return workspace, resource, agent
 	}
 
-	t.Run("DuplicateNamesInSameWorkspace", func(t *testing.T) {
+	t.Run("DuplicateNamesInSameWorkspaceBuild", func(t *testing.T) {
 		t.Parallel()
 
 		db, _ := dbtestutil.NewDB(t)
 		org := dbgen.Organization(t, db, database.Organization{})
 		ctx := testutil.Context(t, testutil.WaitShort)
 
 		// Given: A workspace with an agent
-		workspace1, templateVersion1, agent1 := createWorkspaceWithAgent(t, db, org, "duplicate-agent")
-		require.Equal(t, "duplicate-agent", agent1.Name)
+		_, resource, agent := createWorkspaceWithAgent(t, db, org, "duplicate-agent")
+		require.Equal(t, "duplicate-agent", agent.Name)
 
 		// When: Another agent is created for that workspace with the same name.
-		job2 := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
-			Type:           database.ProvisionerJobTypeWorkspaceBuild,
-			OrganizationID: org.ID,
-		})
-		build2 := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
-			BuildNumber:       builds.Add(1),
-			JobID:             job2.ID,
-			WorkspaceID:       workspace1.ID,
-			TemplateVersionID: templateVersion1.ID,
-		})
-		resource2 := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
-			JobID: build2.JobID,
-		})
 		_, err := db.InsertWorkspaceAgent(ctx, database.InsertWorkspaceAgentParams{
 			ID:              uuid.New(),
 			CreatedAt:       time.Now(),
 			UpdatedAt:       time.Now(),
 			Name:            "duplicate-agent", // Same name as agent1
-			ResourceID:      resource2.ID,
+			ResourceID:      resource.ID,
 			AuthToken:       uuid.New(),
 			Architecture:    "amd64",
 			OperatingSystem: "linux",
@@ -4798,7 +4782,7 @@ func TestWorkspaceAgentNameUniqueTrigger(t *testing.T) {
 		var pqErr *pq.Error
 		require.True(t, errors.As(err, &pqErr))
 		require.Equal(t, pq.ErrorCode("23505"), pqErr.Code) // unique_violation
-		require.Contains(t, pqErr.Message, `workspace agent name "duplicate-agent" already exists in this workspace`)
+		require.Contains(t, pqErr.Message, `workspace agent name "duplicate-agent" already exists in this workspace resource`)
 	})
 
 	t.Run("SameNamesInDifferentWorkspaces", func(t *testing.T) {
