Skip to content

Commit e7b1e3c

Browse files
committed
fix: workspacebuild_test use roles
1 parent 35cf509 commit e7b1e3c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

coderd/workspacebuilds_test.go

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/coder/coder/coderd/audit"
1818
"github.com/coder/coder/coderd/coderdtest"
1919
"github.com/coder/coder/coderd/database"
20+
"github.com/coder/coder/coderd/rbac"
2021
"github.com/coder/coder/codersdk"
2122
"github.com/coder/coder/provisioner/echo"
2223
"github.com/coder/coder/provisionersdk/proto"
@@ -1193,9 +1194,13 @@ func TestWorkspaceBuildDebugMode(t *testing.T) {
11931194
t.Run("AsTemplateAuthor", func(t *testing.T) {
11941195
t.Parallel()
11951196

1196-
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
1197-
user := coderdtest.CreateFirstUser(t, client)
1198-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
1197+
// Create users
1198+
adminClient := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
1199+
admin := coderdtest.CreateFirstUser(t, adminClient)
1200+
templateAdminClient, _ := coderdtest.CreateAnotherUser(t, adminClient, admin.OrganizationID, rbac.RoleTemplateAdmin())
1201+
1202+
// Interact as template admin
1203+
version := coderdtest.CreateTemplateVersion(t, templateAdminClient, admin.OrganizationID, &echo.Responses{
11991204
Parse: echo.ParseComplete,
12001205
ProvisionPlan: echo.ProvisionComplete,
12011206
ProvisionApply: []*proto.Provision_Response{{
@@ -1225,29 +1230,29 @@ func TestWorkspaceBuildDebugMode(t *testing.T) {
12251230
},
12261231
}},
12271232
})
1228-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
1229-
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
1233+
template := coderdtest.CreateTemplate(t, templateAdminClient, admin.OrganizationID, version.ID)
1234+
coderdtest.AwaitTemplateVersionJob(t, templateAdminClient, version.ID)
12301235

12311236
// Create workspace
1232-
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
1233-
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
1237+
workspace := coderdtest.CreateWorkspace(t, templateAdminClient, admin.OrganizationID, template.ID)
1238+
coderdtest.AwaitWorkspaceBuildJob(t, templateAdminClient, workspace.LatestBuild.ID)
12341239

12351240
// Create workspace build
12361241
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
12371242
defer cancel()
12381243

1239-
build, err := client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
1244+
build, err := templateAdminClient.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
12401245
TemplateVersionID: workspace.LatestBuild.TemplateVersionID,
12411246
Transition: codersdk.WorkspaceTransitionStart,
12421247
ProvisionerState: []byte(" "),
12431248
LogLevel: "debug",
12441249
})
12451250
require.Nil(t, err)
12461251

1247-
build = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
1252+
build = coderdtest.AwaitWorkspaceBuildJob(t, templateAdminClient, build.ID)
12481253

12491254
// Watch for incoming logs
1250-
logs, closer, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, 0)
1255+
logs, closer, err := templateAdminClient.WorkspaceBuildLogsAfter(ctx, build.ID, 0)
12511256
require.NoError(t, err)
12521257
defer closer.Close()
12531258

0 commit comments

Comments
 (0)