Skip to content

Commit 23a2658

Browse files
johnstcnjohnstcn
committed
address new linter complaints in templatepull_test.go
1 parent d4d53b5 commit 23a2658

File tree

1 file changed

+25
-20
lines changed

1 file changed

+25
-20
lines changed

‎cli/templatepull_test.go

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
"github.com/coder/coder/v2/cli/clitest"
1717
"github.com/coder/coder/v2/coderd/coderdtest"
18+
"github.com/coder/coder/v2/coderd/rbac"
1819
"github.com/coder/coder/v2/provisioner/echo"
1920
"github.com/coder/coder/v2/provisionersdk/proto"
2021
"github.com/coder/coder/v2/pty/ptytest"
@@ -56,7 +57,8 @@ func TestTemplatePull_Stdout(t *testing.T) {
5657
client := coderdtest.New(t, &coderdtest.Options{
5758
IncludeProvisionerDaemon: true,
5859
})
59-
user := coderdtest.CreateFirstUser(t, client)
60+
admin := coderdtest.CreateFirstUser(t, client)
61+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
6062

6163
// Create an initial template bundle.
6264
source1 := genTemplateVersionSource()
@@ -67,18 +69,18 @@ func TestTemplatePull_Stdout(t *testing.T) {
6769
expected, err := echo.Tar(source2)
6870
require.NoError(t, err)
6971

70-
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1)
72+
version1 := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, source1)
7173
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID)
7274

73-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID)
75+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version1.ID)
7476

7577
// Update the template version so that we can assert that templates
7678
// are being sorted correctly.
77-
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
79+
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, admin.OrganizationID, source2, template.ID)
7880
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID)
7981

8082
inv, root := clitest.New(t, "templates", "pull", "--tar", template.Name)
81-
clitest.SetupConfig(t, client, root)
83+
clitest.SetupConfig(t, templateAdmin, root)
8284

8385
var buf bytes.Buffer
8486
inv.Stdout = &buf
@@ -97,7 +99,8 @@ func TestTemplatePull_ToDir(t *testing.T) {
9799
client := coderdtest.New(t, &coderdtest.Options{
98100
IncludeProvisionerDaemon: true,
99101
})
100-
user := coderdtest.CreateFirstUser(t, client)
102+
admin := coderdtest.CreateFirstUser(t, client)
103+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
101104

102105
// Create an initial template bundle.
103106
source1 := genTemplateVersionSource()
@@ -108,14 +111,14 @@ func TestTemplatePull_ToDir(t *testing.T) {
108111
expected, err := echo.Tar(source2)
109112
require.NoError(t, err)
110113

111-
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1)
114+
version1 := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, source1)
112115
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID)
113116

114-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID)
117+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version1.ID)
115118

116119
// Update the template version so that we can assert that templates
117120
// are being sorted correctly.
118-
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
121+
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, admin.OrganizationID, source2, template.ID)
119122
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID)
120123

121124
dir := t.TempDir()
@@ -128,7 +131,7 @@ func TestTemplatePull_ToDir(t *testing.T) {
128131
require.NoError(t, err)
129132

130133
inv, root := clitest.New(t, "templates", "pull", template.Name, actualDest)
131-
clitest.SetupConfig(t, client, root)
134+
clitest.SetupConfig(t, templateAdmin, root)
132135

133136
ptytest.New(t).Attach(inv)
134137

@@ -147,7 +150,8 @@ func TestTemplatePull_ToImplicit(t *testing.T) {
147150
client := coderdtest.New(t, &coderdtest.Options{
148151
IncludeProvisionerDaemon: true,
149152
})
150-
user := coderdtest.CreateFirstUser(t, client)
153+
admin := coderdtest.CreateFirstUser(t, client)
154+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
151155

152156
// Create an initial template bundle.
153157
source1 := genTemplateVersionSource()
@@ -158,14 +162,14 @@ func TestTemplatePull_ToImplicit(t *testing.T) {
158162
expected, err := echo.Tar(source2)
159163
require.NoError(t, err)
160164

161-
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1)
165+
version1 := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, source1)
162166
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID)
163167

164-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID)
168+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version1.ID)
165169

166170
// Update the template version so that we can assert that templates
167171
// are being sorted correctly.
168-
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
172+
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, admin.OrganizationID, source2, template.ID)
169173
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID)
170174

171175
// create a tempdir and change the working directory to it for the duration of the test (cannot run in parallel)
@@ -188,7 +192,7 @@ func TestTemplatePull_ToImplicit(t *testing.T) {
188192
require.NoError(t, err)
189193

190194
inv, root := clitest.New(t, "templates", "pull", template.Name)
191-
clitest.SetupConfig(t, client, root)
195+
clitest.SetupConfig(t, templateAdmin, root)
192196

193197
ptytest.New(t).Attach(inv)
194198

@@ -208,7 +212,8 @@ func TestTemplatePull_FolderConflict(t *testing.T) {
208212
client := coderdtest.New(t, &coderdtest.Options{
209213
IncludeProvisionerDaemon: true,
210214
})
211-
user := coderdtest.CreateFirstUser(t, client)
215+
admin := coderdtest.CreateFirstUser(t, client)
216+
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
212217

213218
// Create an initial template bundle.
214219
source1 := genTemplateVersionSource()
@@ -219,14 +224,14 @@ func TestTemplatePull_FolderConflict(t *testing.T) {
219224
expected, err := echo.Tar(source2)
220225
require.NoError(t, err)
221226

222-
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1)
227+
version1 := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, source1)
223228
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version1.ID)
224229

225-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID)
230+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version1.ID)
226231

227232
// Update the template version so that we can assert that templates
228233
// are being sorted correctly.
229-
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
234+
updatedVersion := coderdtest.UpdateTemplateVersion(t, client, admin.OrganizationID, source2, template.ID)
230235
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, updatedVersion.ID)
231236

232237
dir := t.TempDir()
@@ -249,7 +254,7 @@ func TestTemplatePull_FolderConflict(t *testing.T) {
249254
require.NoError(t, err)
250255

251256
inv, root := clitest.New(t, "templates", "pull", template.Name, conflictDest)
252-
clitest.SetupConfig(t, client, root)
257+
clitest.SetupConfig(t, templateAdmin, root)
253258

254259
pty := ptytest.New(t).Attach(inv)
255260

0 commit comments

Comments
 (0)