Skip to content

Commit 178d08b

Browse files
johnstcnjohnstcn
committed
fix new linter complaints in templatedelete_test.go
1 parent d6ca45d commit 178d08b

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

‎cli/templatedelete_test.go

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/coder/coder/v2/cli/clitest"
1414
"github.com/coder/coder/v2/cli/cliui"
1515
"github.com/coder/coder/v2/coderd/coderdtest"
16+
"github.com/coder/coder/v2/coderd/rbac"
1617
"github.com/coder/coder/v2/codersdk"
1718
"github.com/coder/coder/v2/pty/ptytest"
1819
)
@@ -24,14 +25,15 @@ func TestTemplateDelete(t *testing.T) {
2425
t.Parallel()
2526

2627
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
27-
user := coderdtest.CreateFirstUser(t, client)
28-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
28+
admin := coderdtest.CreateFirstUser(t, client)
29+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
30+
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
2931
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
30-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
32+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
3133

3234
inv, root := clitest.New(t, "templates", "delete", template.Name)
3335

34-
clitest.SetupConfig(t, client, root)
36+
clitest.SetupConfig(t, templateAdmin, root)
3537
pty := ptytest.New(t).Attach(inv)
3638

3739
execDone := make(chan error)
@@ -52,19 +54,20 @@ func TestTemplateDelete(t *testing.T) {
5254
t.Parallel()
5355

5456
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
55-
user := coderdtest.CreateFirstUser(t, client)
57+
admin := coderdtest.CreateFirstUser(t, client)
58+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
5659
templates := []codersdk.Template{}
5760
templateNames := []string{}
5861
for i := 0; i < 3; i++ {
59-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
62+
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
6063
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
61-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
64+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
6265
templates = append(templates, template)
6366
templateNames = append(templateNames, template.Name)
6467
}
6568

6669
inv, root := clitest.New(t, append([]string{"templates", "delete", "--yes"}, templateNames...)...)
67-
clitest.SetupConfig(t, client, root)
70+
clitest.SetupConfig(t, templateAdmin, root)
6871
require.NoError(t, inv.Run())
6972

7073
for _, template := range templates {
@@ -77,19 +80,20 @@ func TestTemplateDelete(t *testing.T) {
7780
t.Parallel()
7881

7982
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
80-
user := coderdtest.CreateFirstUser(t, client)
83+
admin := coderdtest.CreateFirstUser(t, client)
84+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
8185
templates := []codersdk.Template{}
8286
templateNames := []string{}
8387
for i := 0; i < 3; i++ {
84-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
88+
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
8589
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
86-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
90+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
8791
templates = append(templates, template)
8892
templateNames = append(templateNames, template.Name)
8993
}
9094

9195
inv, root := clitest.New(t, append([]string{"templates", "delete"}, templateNames...)...)
92-
clitest.SetupConfig(t, client, root)
96+
clitest.SetupConfig(t, templateAdmin, root)
9397
pty := ptytest.New(t).Attach(inv)
9498

9599
execDone := make(chan error)
@@ -112,13 +116,14 @@ func TestTemplateDelete(t *testing.T) {
112116
t.Parallel()
113117

114118
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
115-
user := coderdtest.CreateFirstUser(t, client)
116-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
119+
admin := coderdtest.CreateFirstUser(t, client)
120+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
121+
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
117122
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
118-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
123+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
119124

120125
inv, root := clitest.New(t, "templates", "delete")
121-
clitest.SetupConfig(t, client, root)
126+
clitest.SetupConfig(t, templateAdmin, root)
122127

123128
pty := ptytest.New(t).Attach(inv)
124129

0 commit comments

Comments
 (0)