return 404 if external_agent is not associated with agent

kacpersaw · kacpersaw · commit ed93d092689a · 2025-08-13T12:08:07.000Z
diff --git a/enterprise/coderd/workspaceagents.go b/enterprise/coderd/workspaceagents.go
@@ -52,6 +52,29 @@ func (api *API) workspaceExternalAgentCredentials(rw http.ResponseWriter, r *htt
 		return
 	}
 
+	resources, err := api.Database.GetWorkspaceResourcesByJobID(ctx, build.JobID)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Failed to get workspace resources.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	found := false
+	for _, resource := range resources {
+		if resource.Type == "coder_external_agent" && resource.Name == agentName {
+			found = true
+			break
+		}
+	}
+	if !found {
+		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+			Message: fmt.Sprintf("Agent '%s' does not have an external agent associated with it.", agentName),
+		})
+		return
+	}
+
 	agents, err := api.Database.GetWorkspaceAgentsByWorkspaceAndBuildNumber(ctx, database.GetWorkspaceAgentsByWorkspaceAndBuildNumberParams{
 		WorkspaceID: workspace.ID,
 		BuildNumber: build.BuildNumber,
diff --git a/enterprise/coderd/workspaceagents_test.go b/enterprise/coderd/workspaceagents_test.go
@@ -370,6 +370,9 @@ func TestWorkspaceExternalAgentCredentials(t *testing.T) {
 				Bool:  true,
 				Valid: true,
 			},
+		}).Resource(&proto.Resource{
+			Name: "test-agent",
+			Type: "coder_external_agent",
 		}).WithAgent(func(a []*proto.Agent) []*proto.Agent {
 			a[0].Name = "test-agent"
 			a[0].OperatingSystem = "linux"
@@ -393,6 +396,9 @@ func TestWorkspaceExternalAgentCredentials(t *testing.T) {
 		r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
 			OrganizationID: user.OrganizationID,
 			OwnerID:        user.UserID,
+		}).Resource(&proto.Resource{
+			Name: "test-agent",
+			Type: "coder_external_agent",
 		}).Seed(database.WorkspaceBuild{
 			HasExternalAgent: sql.NullBool{
 				Bool:  true,
@@ -426,6 +432,9 @@ func TestWorkspaceExternalAgentCredentials(t *testing.T) {
 				Bool:  true,
 				Valid: true,
 			},
+		}).Resource(&proto.Resource{
+			Name: "test-agent",
+			Type: "coder_external_agent",
 		}).WithAgent(func(a []*proto.Agent) []*proto.Agent {
 			a[0].Name = "test-agent"
 			a[0].Auth = &proto.Agent_InstanceId{
@@ -456,4 +465,34 @@ func TestWorkspaceExternalAgentCredentials(t *testing.T) {
 		require.ErrorAs(t, err, &apiErr)
 		require.Equal(t, "Workspace does not have an external agent.", apiErr.Message)
 	})
+
+	t.Run("No external agent associated with agent - should return 404", func(t *testing.T) {
+		t.Parallel()
+		ctx := testutil.Context(t, testutil.WaitShort)
+
+		r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
+			OrganizationID: user.OrganizationID,
+			OwnerID:        user.UserID,
+		}).Seed(database.WorkspaceBuild{
+			HasExternalAgent: sql.NullBool{
+				Bool:  true,
+				Valid: true,
+			},
+		}).Resource(&proto.Resource{
+			Name: "test-external-agent",
+			Type: "coder_external_agent",
+		}).WithAgent(func(a []*proto.Agent) []*proto.Agent {
+			a[0].Name = "test-agent-no-external-agent"
+			a[0].Auth = &proto.Agent_Token{
+				Token: uuid.NewString(),
+			}
+			return a
+		}).Do()
+
+		_, err := client.WorkspaceExternalAgentCredentials(ctx, r.Workspace.ID, "test-agent-no-external-agent")
+		require.Error(t, err)
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, "Agent 'test-agent-no-external-agent' does not have an external agent associated with it.", apiErr.Message)
+	})
 }
