Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit00589d6

Browse files
authored
chore: fix lint failures
1 parent69d13f1 commit00589d6

File tree

3 files changed

+20
-42
lines changed

3 files changed

+20
-42
lines changed

‎cli/templatepull_test.go

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,25 @@ func TestTemplatePull_ActiveOldStdout(t *testing.T) {
101101
client:=coderdtest.New(t,&coderdtest.Options{
102102
IncludeProvisionerDaemon:true,
103103
})
104-
user:=coderdtest.CreateFirstUser(t,client)
104+
owner:=coderdtest.CreateFirstUser(t,client)
105+
templateAdmin,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())
105106

106107
source1:=genTemplateVersionSource()
107108
source2:=genTemplateVersionSource()
108109

109110
expected,err:=echo.Tar(source1)
110111
require.NoError(t,err)
111112

112-
version1:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,source1)
113+
version1:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,source1)
113114
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,version1.ID)
114115

115-
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version1.ID)
116+
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version1.ID)
116117

117-
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,user.OrganizationID,source2,template.ID)
118+
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,owner.OrganizationID,source2,template.ID)
118119
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,updatedVersion.ID)
119120

120121
inv,root:=clitest.New(t,"templates","pull","--tar",template.Name)
121-
clitest.SetupConfig(t,client,root)
122+
clitest.SetupConfig(t,templateAdmin,root)
122123

123124
varbuf bytes.Buffer
124125
inv.Stdout=&buf
@@ -140,7 +141,8 @@ func TestTemplatePull_SpecifiedStdout(t *testing.T) {
140141
client:=coderdtest.New(t,&coderdtest.Options{
141142
IncludeProvisionerDaemon:true,
142143
})
143-
user:=coderdtest.CreateFirstUser(t,client)
144+
owner:=coderdtest.CreateFirstUser(t,client)
145+
templateAdmin,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())
144146

145147
source1:=genTemplateVersionSource()
146148
source2:=genTemplateVersionSource()
@@ -149,20 +151,20 @@ func TestTemplatePull_SpecifiedStdout(t *testing.T) {
149151
expected,err:=echo.Tar(source1)
150152
require.NoError(t,err)
151153

152-
version1:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,source1)
154+
version1:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,source1)
153155
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,version1.ID)
154156

155-
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version1.ID)
157+
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version1.ID)
156158

157-
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,user.OrganizationID,source2,template.ID)
159+
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,owner.OrganizationID,source2,template.ID)
158160
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,updatedVersion.ID)
159161

160-
updatedVersion2:=coderdtest.UpdateTemplateVersion(t,client,user.OrganizationID,source3,template.ID)
162+
updatedVersion2:=coderdtest.UpdateTemplateVersion(t,client,owner.OrganizationID,source3,template.ID)
161163
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,updatedVersion2.ID)
162164
coderdtest.UpdateActiveTemplateVersion(t,client,template.ID,updatedVersion2.ID)
163165

164166
inv,root:=clitest.New(t,"templates","pull","--tar",template.Name,"--version",version1.Name)
165-
clitest.SetupConfig(t,client,root)
167+
clitest.SetupConfig(t,templateAdmin,root)
166168

167169
varbuf bytes.Buffer
168170
inv.Stdout=&buf
@@ -181,24 +183,25 @@ func TestTemplatePull_LatestStdout(t *testing.T) {
181183
client:=coderdtest.New(t,&coderdtest.Options{
182184
IncludeProvisionerDaemon:true,
183185
})
184-
user:=coderdtest.CreateFirstUser(t,client)
186+
owner:=coderdtest.CreateFirstUser(t,client)
187+
templateAdmin,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())
185188

186189
source1:=genTemplateVersionSource()
187190
source2:=genTemplateVersionSource()
188191

189192
expected,err:=echo.Tar(source1)
190193
require.NoError(t,err)
191194

192-
version1:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,source1)
195+
version1:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,source1)
193196
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,version1.ID)
194197

195-
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version1.ID)
198+
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version1.ID)
196199

197-
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,user.OrganizationID,source2,template.ID)
200+
updatedVersion:=coderdtest.UpdateTemplateVersion(t,client,owner.OrganizationID,source2,template.ID)
198201
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,updatedVersion.ID)
199202

200203
inv,root:=clitest.New(t,"templates","pull","--tar",template.Name,"latest")
201-
clitest.SetupConfig(t,client,root)
204+
clitest.SetupConfig(t,templateAdmin,root)
202205

203206
varbuf bytes.Buffer
204207
inv.Stdout=&buf

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ require (
204204
github.com/chromedp/cdprotov0.0.0-20230802225258-3cf4e6d46a89
205205
github.com/chromedp/chromedpv0.9.2
206206
github.com/kballard/go-shellquotev0.0.0-20180428030007-95032a82bc51
207+
github.com/tidwall/gjsonv1.17.0
207208
)
208209

209210
require (
@@ -379,7 +380,6 @@ require (
379380
github.com/tcnksm/go-httpstatv0.2.0// indirect
380381
github.com/tdewolff/parse/v2v2.6.6// indirect
381382
github.com/tdewolff/testv1.0.9// indirect
382-
github.com/tidwall/gjsonv1.17.0// indirect
383383
github.com/tidwall/matchv1.1.1// indirect
384384
github.com/tidwall/prettyv1.2.1// indirect
385385
github.com/tinylib/msgpv1.1.8// indirect

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp