chore: fix TestWorkspaceAgentAppHealth test after agent ID field now required

dannykopping · dannykopping · commit 8aef94a37fa7 · 2025-06-20T19:27:04.000+02:00
Signed-off-by: Danny Kopping &lt;dannykopping@gmail.com&gt;
diff --git a/coderd/agentapi/apps.go b/coderd/agentapi/apps.go
@@ -92,7 +92,7 @@ func (a *AppsAPI) BatchUpdateAppHealths(ctx context.Context, req *agentproto.Bat
 			Health: app.Health,
 		})
 		if err != nil {
-			return nil, xerrors.Errorf("update workspace app health for app %q (%q): %w", err, app.ID, app.Slug)
+			return nil, xerrors.Errorf("update workspace app health for app %q (%q): %w", app.ID, app.Slug, err)
 		}
 	}
 
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -2,6 +2,7 @@ package coderd_test
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"fmt"
 	"maps"
@@ -1508,39 +1509,52 @@ func TestWorkspaceAgentAppHealth(t *testing.T) {
 	t.Parallel()
 	client, db := coderdtest.NewWithDatabase(t, nil)
 	user := coderdtest.CreateFirstUser(t, client)
-	apps := []*proto.App{
-		{
-			Slug:    "code-server",
-			Command: "some-command",
-			Url:     "http://localhost:3000",
-			Icon:    "/code.svg",
-		},
-		{
-			Slug:        "code-server-2",
-			DisplayName: "code-server-2",
-			Command:     "some-command",
-			Url:         "http://localhost:3000",
-			Icon:        "/code.svg",
-			Healthcheck: &proto.Healthcheck{
-				Url:       "http://localhost:3000",
-				Interval:  5,
-				Threshold: 6,
-			},
-		},
-	}
+
+	// When using WithAgent() here and setting some *proto.App instances on the agent, Do() ends up trying to insert duplicate records.
 	r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
 		OrganizationID: user.OrganizationID,
 		OwnerID:        user.UserID,
-	}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
-		agents[0].Apps = apps
-		return agents
 	}).Do()
 
+	res := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{JobID: r.Build.JobID})
+	agent := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{ResourceID: res.ID})
+
+	// It's simpler to call db.InsertWorkspaceApp directly than dbgen.WorkspaceApp because it's more terse and direct;
+	// the latter sets a bunch of defaults which make this test hard.
+	_, err := db.InsertWorkspaceApp(dbauthz.AsSystemRestricted(t.Context()), database.InsertWorkspaceAppParams{
+		ID: uuid.New(),
+		Slug:         "code-server",
+		AgentID:      agent.ID,
+		Icon:         "/code.svg",
+		Command:      sql.NullString{String: "some-command", Valid: true},
+		Url:          sql.NullString{String: "http://localhost:3000", Valid: true},
+		SharingLevel: database.AppSharingLevelOwner,
+		Health:       database.WorkspaceAppHealthDisabled,
+		OpenIn:       database.WorkspaceAppOpenInWindow,
+	})
+	require.NoError(t, err)
+	_, err = db.InsertWorkspaceApp(dbauthz.AsSystemRestricted(t.Context()), database.InsertWorkspaceAppParams{
+		ID: uuid.New(),
+		Slug:                 "code-server-2",
+		DisplayName:          "code-server-2",
+		AgentID:              agent.ID,
+		Icon:                 "/code.svg",
+		Command:              sql.NullString{String: "some-command", Valid: true},
+		Url:                  sql.NullString{String: "http://localhost:3000", Valid: true},
+		HealthcheckInterval:  5,
+		HealthcheckUrl:       "http://localhost:3000",
+		HealthcheckThreshold: 6,
+		Health:               database.WorkspaceAppHealthInitializing,
+		SharingLevel:         database.AppSharingLevelOwner,
+		OpenIn:               database.WorkspaceAppOpenInWindow,
+	})
+	require.NoError(t, err)
+
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
 	agentClient := agentsdk.New(client.URL)
-	agentClient.SetSessionToken(r.AgentToken)
+	agentClient.SetSessionToken(agent.AuthToken.String())
 	conn, err := agentClient.ConnectRPC(ctx)
 	require.NoError(t, err)
 	defer func() {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (a AppsAPI) BatchUpdateAppHealths(ctx context.Context, req agentproto.Bat`
`92`	`92`	`Health: app.Health,`
`93`	`93`	`})`
`94`	`94`	`if err != nil {`
`95`		`- return nil, xerrors.Errorf("update workspace app health for app %q (%q): %w", err, app.ID, app.Slug)`
	`95`	`+ return nil, xerrors.Errorf("update workspace app health for app %q (%q): %w", app.ID, app.Slug, err)`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`