Use inner-tx database instance to retrieve workspace agent data after workspace claimed in tx

dannykopping · dannykopping · commit 3129bf355153 · 2025-03-07T13:13:30.000Z
Also fix e2e test to use privileged user to validate this behaviour

Signed-off-by: Danny Kopping &lt;dannykopping@gmail.com&gt;
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -677,7 +677,7 @@ func createWorkspace(
 			// Prebuild found!
 			workspaceID = claimedWorkspace.ID
 			initiatorID = prebuilds.Initiator()
-			agents, err := api.Database.GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx, claimedWorkspace.ID)
+			agents, err := db.GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx, claimedWorkspace.ID)
 			if err != nil {
 				api.Logger.Error(ctx, "failed to retrieve running agents of claimed prebuilt workspace",
 					slog.F("workspace_id", claimedWorkspace.ID), slog.Error(err))
diff --git a/site/e2e/tests/presets/basic-presets-with-prebuild/main.tf b/site/e2e/tests/presets/basic-presets-with-prebuild/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "2.1.3"
+      version = "2.3.0-pre2"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/site/e2e/tests/presets/basic-presets/main.tf b/site/e2e/tests/presets/basic-presets/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "2.1.3"
+      version = "2.3.0-pre2"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/site/e2e/tests/presets/prebuilds.spec.ts b/site/e2e/tests/presets/prebuilds.spec.ts
@@ -1,13 +1,8 @@
 import path from "node:path";
-import { type Locator, expect, test } from "@playwright/test";
-import {
-	currentUser,
-	importTemplate,
-	login,
-	randomName,
-	requiresLicense,
-} from "../../helpers";
-import { beforeCoderTest } from "../../hooks";
+import {expect, type Locator, test} from "@playwright/test";
+import {currentUser, importTemplate, login, randomName, requiresLicense,} from "../../helpers";
+import {beforeCoderTest} from "../../hooks";
+import {users} from "../../constants";
 
 test.beforeEach(async ({ page }) => {
 	beforeCoderTest(page);
@@ -23,6 +18,8 @@ const templateFiles = [
 
 const expectedPrebuilds = 2;
 
+// TODO: update provider version in *.tf
+
 // NOTE: requires the `workspace-prebuilds` experiment enabled!
 test("create template with desired prebuilds", async ({ page, baseURL }) => {
 	requiresLicense();
@@ -83,6 +80,9 @@ test("claim prebuild matching selected preset", async ({ page, baseURL }) => {
 	// Wait for the prebuild to become ready so it's eligible to be claimed.
 	await page.getByTestId("agent-status-ready").waitFor({ timeout: 60_000 });
 
+	// Logout as admin, and login as an unprivileged user.
+	await login(page, users.member);
+
 	// Create a new workspace using the same preset as one of the prebuilds.
 	await page.goto(`/templates/coder/${templateName}/workspace`, {
 		waitUntil: "domcontentloaded",
@@ -117,6 +117,9 @@ test("claim prebuild matching selected preset", async ({ page, baseURL }) => {
 	const text = indicator.locator("xpath=..").getByText("Yes");
 	await text.waitFor({ timeout: 30_000 });
 
+	// Logout as unprivileged user, and login as admin.
+	await login(page, users.admin);
+
 	// Navigate back to prebuilds page to see that a new prebuild replaced the claimed one.
 	await page.goto(
 		`/workspaces?filter=owner:prebuilds%20template:${templateName}&page=1`,

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`coder = {`
`4`	`4`	`source = "coder/coder"`
`5`		`- version = "2.1.3"`
	`5`	`+ version = "2.3.0-pre2"`
`6`	`6`	`}`
`7`	`7`	`docker = {`
`8`	`8`	`source = "kreuzwerker/docker"`