Skip to content

Commit 709a7b7

Browse files
johnstcnjohnstcn
committed
fix new linter complaints in templatelist_test.go
1 parent 4ef3b4e commit 709a7b7

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

‎cli/templatelist_test.go

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/coder/coder/v2/cli/clitest"
1313
"github.com/coder/coder/v2/coderd/coderdtest"
14+
"github.com/coder/coder/v2/coderd/rbac"
1415
"github.com/coder/coder/v2/codersdk"
1516
"github.com/coder/coder/v2/pty/ptytest"
1617
"github.com/coder/coder/v2/testutil"
@@ -21,17 +22,18 @@ func TestTemplateList(t *testing.T) {
2122
t.Run("ListTemplates", func(t *testing.T) {
2223
t.Parallel()
2324
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
24-
user := coderdtest.CreateFirstUser(t, client)
25-
firstVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
25+
admin := coderdtest.CreateFirstUser(t, client)
26+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
27+
firstVersion := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
2628
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID)
27-
firstTemplate := coderdtest.CreateTemplate(t, client, user.OrganizationID, firstVersion.ID)
29+
firstTemplate := coderdtest.CreateTemplate(t, client, admin.OrganizationID, firstVersion.ID)
2830

29-
secondVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
31+
secondVersion := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
3032
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, secondVersion.ID)
31-
secondTemplate := coderdtest.CreateTemplate(t, client, user.OrganizationID, secondVersion.ID)
33+
secondTemplate := coderdtest.CreateTemplate(t, client, admin.OrganizationID, secondVersion.ID)
3234

3335
inv, root := clitest.New(t, "templates", "list")
34-
clitest.SetupConfig(t, client, root)
36+
clitest.SetupConfig(t, templateAdmin, root)
3537

3638
pty := ptytest.New(t).Attach(inv)
3739

@@ -56,17 +58,18 @@ func TestTemplateList(t *testing.T) {
5658
t.Run("ListTemplatesJSON", func(t *testing.T) {
5759
t.Parallel()
5860
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
59-
user := coderdtest.CreateFirstUser(t, client)
60-
firstVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
61+
admin := coderdtest.CreateFirstUser(t, client)
62+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
63+
firstVersion := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
6164
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, firstVersion.ID)
62-
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, firstVersion.ID)
65+
_ = coderdtest.CreateTemplate(t, client, admin.OrganizationID, firstVersion.ID)
6366

64-
secondVersion := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
67+
secondVersion := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
6568
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, secondVersion.ID)
66-
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, secondVersion.ID)
69+
_ = coderdtest.CreateTemplate(t, client, admin.OrganizationID, secondVersion.ID)
6770

6871
inv, root := clitest.New(t, "templates", "list", "--output=json")
69-
clitest.SetupConfig(t, client, root)
72+
clitest.SetupConfig(t, templateAdmin, root)
7073

7174
ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
7275
defer cancelFunc()
@@ -83,10 +86,11 @@ func TestTemplateList(t *testing.T) {
8386
t.Run("NoTemplates", func(t *testing.T) {
8487
t.Parallel()
8588
client := coderdtest.New(t, &coderdtest.Options{})
86-
coderdtest.CreateFirstUser(t, client)
89+
admin := coderdtest.CreateFirstUser(t, client)
90+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
8791

8892
inv, root := clitest.New(t, "templates", "list")
89-
clitest.SetupConfig(t, client, root)
93+
clitest.SetupConfig(t, templateAdmin, root)
9094

9195
pty := ptytest.New(t)
9296
inv.Stdin = pty.Input()

0 commit comments

Comments
 (0)