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

Commita11fed5

Browse files
committed
replace short names
1 parent4da9a94 commita11fed5

File tree

1 file changed

+47
-54
lines changed

1 file changed

+47
-54
lines changed

‎coderd/database/dbauthz/system_test.go

Lines changed: 47 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,90 +15,83 @@ import (
1515
)
1616

1717
func (s*MethodTestSuite)TestSystemFunctions() {
18-
var (
19-
sys=rbac.ResourceSystem
20-
create=rbac.ActionCreate
21-
read=rbac.ActionRead
22-
update=rbac.ActionUpdate
23-
delete=rbac.ActionDelete
24-
)
2518
s.Run("UpdateUserLinkedID",s.Subtest(func(db database.Store,check*expects) {
2619
u:=dbgen.User(s.T(),db, database.User{})
2720
l:=dbgen.UserLink(s.T(),db, database.UserLink{UserID:u.ID})
2821
check.Args(database.UpdateUserLinkedIDParams{
2922
UserID:u.ID,
3023
LinkedID:l.LinkedID,
3124
LoginType:database.LoginTypeGithub,
32-
}).Asserts(sys,update).Returns(l)
25+
}).Asserts(rbac.ResourceSystem,rbac.ActionUpdate).Returns(l)
3326
}))
3427
s.Run("GetUserLinkByLinkedID",s.Subtest(func(db database.Store,check*expects) {
3528
l:=dbgen.UserLink(s.T(),db, database.UserLink{})
36-
check.Args(l.LinkedID).Asserts(sys,read).Returns(l)
29+
check.Args(l.LinkedID).Asserts(rbac.ResourceSystem,rbac.ActionRead).Returns(l)
3730
}))
3831
s.Run("GetUserLinkByUserIDLoginType",s.Subtest(func(db database.Store,check*expects) {
3932
l:=dbgen.UserLink(s.T(),db, database.UserLink{})
4033
check.Args(database.GetUserLinkByUserIDLoginTypeParams{
4134
UserID:l.UserID,
4235
LoginType:l.LoginType,
43-
}).Asserts(sys,read).Returns(l)
36+
}).Asserts(rbac.ResourceSystem,rbac.ActionRead).Returns(l)
4437
}))
4538
s.Run("GetLatestWorkspaceBuilds",s.Subtest(func(db database.Store,check*expects) {
4639
dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{})
4740
dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{})
48-
check.Args().Asserts(sys,read)
41+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead)
4942
}))
5043
s.Run("GetWorkspaceAgentByAuthToken",s.Subtest(func(db database.Store,check*expects) {
5144
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{})
52-
check.Args(agt.AuthToken).Asserts(sys,read).Returns(agt)
45+
check.Args(agt.AuthToken).Asserts(rbac.ResourceSystem,rbac.ActionRead).Returns(agt)
5346
}))
5447
s.Run("GetActiveUserCount",s.Subtest(func(db database.Store,check*expects) {
55-
check.Args().Asserts(sys,read).Returns(int64(0))
48+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead).Returns(int64(0))
5649
}))
5750
s.Run("GetUnexpiredLicenses",s.Subtest(func(db database.Store,check*expects) {
58-
check.Args().Asserts(sys,read)
51+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead)
5952
}))
6053
s.Run("GetAuthorizationUserRoles",s.Subtest(func(db database.Store,check*expects) {
6154
u:=dbgen.User(s.T(),db, database.User{})
62-
check.Args(u.ID).Asserts(sys,read)
55+
check.Args(u.ID).Asserts(rbac.ResourceSystem,rbac.ActionRead)
6356
}))
6457
s.Run("GetDERPMeshKey",s.Subtest(func(db database.Store,check*expects) {
65-
check.Args().Asserts(sys,read)
58+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead)
6659
}))
6760
s.Run("InsertDERPMeshKey",s.Subtest(func(db database.Store,check*expects) {
68-
check.Args("value").Asserts(sys,create).Returns()
61+
check.Args("value").Asserts(rbac.ResourceSystem,rbac.ActionCreate).Returns()
6962
}))
7063
s.Run("InsertDeploymentID",s.Subtest(func(db database.Store,check*expects) {
71-
check.Args("value").Asserts(sys,create).Returns()
64+
check.Args("value").Asserts(rbac.ResourceSystem,rbac.ActionCreate).Returns()
7265
}))
7366
s.Run("InsertReplica",s.Subtest(func(db database.Store,check*expects) {
7467
check.Args(database.InsertReplicaParams{
7568
ID:uuid.New(),
76-
}).Asserts(sys,create)
69+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
7770
}))
7871
s.Run("UpdateReplica",s.Subtest(func(db database.Store,check*expects) {
7972
replica,err:=db.InsertReplica(context.Background(), database.InsertReplicaParams{ID:uuid.New()})
8073
require.NoError(s.T(),err)
8174
check.Args(database.UpdateReplicaParams{
8275
ID:replica.ID,
8376
DatabaseLatency:100,
84-
}).Asserts(sys,update)
77+
}).Asserts(rbac.ResourceSystem,rbac.ActionUpdate)
8578
}))
8679
s.Run("DeleteReplicasUpdatedBefore",s.Subtest(func(db database.Store,check*expects) {
8780
_,err:=db.InsertReplica(context.Background(), database.InsertReplicaParams{ID:uuid.New(),UpdatedAt:time.Now()})
8881
require.NoError(s.T(),err)
89-
check.Args(time.Now().Add(time.Hour)).Asserts(sys,delete)
82+
check.Args(time.Now().Add(time.Hour)).Asserts(rbac.ResourceSystem,rbac.ActionDelete)
9083
}))
9184
s.Run("GetReplicasUpdatedAfter",s.Subtest(func(db database.Store,check*expects) {
9285
_,err:=db.InsertReplica(context.Background(), database.InsertReplicaParams{ID:uuid.New(),UpdatedAt:time.Now()})
9386
require.NoError(s.T(),err)
94-
check.Args(time.Now().Add(time.Hour*-1)).Asserts(sys,read)
87+
check.Args(time.Now().Add(time.Hour*-1)).Asserts(rbac.ResourceSystem,rbac.ActionRead)
9588
}))
9689
s.Run("GetUserCount",s.Subtest(func(db database.Store,check*expects) {
97-
check.Args().Asserts(sys,read).Returns(int64(0))
90+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead).Returns(int64(0))
9891
}))
9992
s.Run("GetTemplates",s.Subtest(func(db database.Store,check*expects) {
10093
_=dbgen.Template(s.T(),db, database.Template{})
101-
check.Args().Asserts(sys,read)
94+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead)
10295
}))
10396
s.Run("UpdateWorkspaceBuildCostByID",s.Subtest(func(db database.Store,check*expects) {
10497
b:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{})
@@ -107,46 +100,46 @@ func (s *MethodTestSuite) TestSystemFunctions() {
107100
check.Args(database.UpdateWorkspaceBuildCostByIDParams{
108101
ID:b.ID,
109102
DailyCost:10,
110-
}).Asserts(sys,update).Returns(o)
103+
}).Asserts(rbac.ResourceSystem,rbac.ActionUpdate).Returns(o)
111104
}))
112105
s.Run("InsertOrUpdateLastUpdateCheck",s.Subtest(func(db database.Store,check*expects) {
113-
check.Args("value").Asserts(sys,update)
106+
check.Args("value").Asserts(rbac.ResourceSystem,rbac.ActionUpdate)
114107
}))
115108
s.Run("GetLastUpdateCheck",s.Subtest(func(db database.Store,check*expects) {
116109
err:=db.InsertOrUpdateLastUpdateCheck(context.Background(),"value")
117110
require.NoError(s.T(),err)
118-
check.Args().Asserts(sys,read)
111+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionRead)
119112
}))
120113
s.Run("GetWorkspaceBuildsCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
121114
_=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{CreatedAt:time.Now().Add(-time.Hour)})
122-
check.Args(time.Now()).Asserts(sys,read)
115+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
123116
}))
124117
s.Run("GetWorkspaceAgentsCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
125118
_=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{CreatedAt:time.Now().Add(-time.Hour)})
126-
check.Args(time.Now()).Asserts(sys,read)
119+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
127120
}))
128121
s.Run("GetWorkspaceAppsCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
129122
_=dbgen.WorkspaceApp(s.T(),db, database.WorkspaceApp{CreatedAt:time.Now().Add(-time.Hour)})
130-
check.Args(time.Now()).Asserts(sys,read)
123+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
131124
}))
132125
s.Run("GetWorkspaceResourcesCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
133126
_=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{CreatedAt:time.Now().Add(-time.Hour)})
134-
check.Args(time.Now()).Asserts(sys,read)
127+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
135128
}))
136129
s.Run("GetWorkspaceResourceMetadataCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
137130
_=dbgen.WorkspaceResourceMetadatums(s.T(),db, database.WorkspaceResourceMetadatum{})
138-
check.Args(time.Now()).Asserts(sys,read)
131+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
139132
}))
140133
s.Run("DeleteOldWorkspaceAgentStats",s.Subtest(func(db database.Store,check*expects) {
141-
check.Args().Asserts(sys,delete)
134+
check.Args().Asserts(rbac.ResourceSystem,rbac.ActionDelete)
142135
}))
143136
s.Run("GetParameterSchemasCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
144137
_=dbgen.ParameterSchema(s.T(),db, database.ParameterSchema{CreatedAt:time.Now().Add(-time.Hour)})
145-
check.Args(time.Now()).Asserts(sys,read)
138+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
146139
}))
147140
s.Run("GetProvisionerJobsCreatedAfter",s.Subtest(func(db database.Store,check*expects) {
148141
_=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{CreatedAt:time.Now().Add(-time.Hour)})
149-
check.Args(time.Now()).Asserts(sys,read)
142+
check.Args(time.Now()).Asserts(rbac.ResourceSystem,rbac.ActionRead)
150143
}))
151144
s.Run("GetTemplateVersionsByIDs",s.Subtest(func(db database.Store,check*expects) {
152145
t1:=dbgen.Template(s.T(),db, database.Template{})
@@ -161,14 +154,14 @@ func (s *MethodTestSuite) TestSystemFunctions() {
161154
TemplateID: uuid.NullUUID{UUID:t2.ID,Valid:true},
162155
})
163156
check.Args([]uuid.UUID{tv1.ID,tv2.ID,tv3.ID}).
164-
Asserts(sys,read).
157+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
165158
Returns(slice.New(tv1,tv2,tv3))
166159
}))
167160
s.Run("GetUsersByIDs",s.Subtest(func(db database.Store,check*expects) {
168161
a:=dbgen.User(s.T(),db, database.User{CreatedAt:database.Now().Add(-time.Hour)})
169162
b:=dbgen.User(s.T(),db, database.User{CreatedAt:database.Now()})
170163
check.Args([]uuid.UUID{a.ID,b.ID}).
171-
Asserts(sys,read).
164+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
172165
Returns(slice.New(a,b))
173166
}))
174167
s.Run("GetWorkspaceAppsByAgentIDs",s.Subtest(func(db database.Store,check*expects) {
@@ -185,7 +178,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
185178
b:=dbgen.WorkspaceApp(s.T(),db, database.WorkspaceApp{AgentID:bAgt.ID})
186179

187180
check.Args([]uuid.UUID{a.AgentID,b.AgentID}).
188-
Asserts(sys,read).
181+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
189182
Returns([]database.WorkspaceApp{a,b})
190183
}))
191184
s.Run("GetWorkspaceResourcesByJobIDs",s.Subtest(func(db database.Store,check*expects) {
@@ -197,7 +190,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
197190
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
198191
wJob:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{ID:build.JobID,Type:database.ProvisionerJobTypeWorkspaceBuild})
199192
check.Args([]uuid.UUID{tJob.ID,wJob.ID}).
200-
Asserts(sys,read).
193+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
201194
Returns([]database.WorkspaceResource{})
202195
}))
203196
s.Run("GetWorkspaceResourceMetadataByResourceIDs",s.Subtest(func(db database.Store,check*expects) {
@@ -207,99 +200,99 @@ func (s *MethodTestSuite) TestSystemFunctions() {
207200
a:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
208201
b:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
209202
check.Args([]uuid.UUID{a.ID,b.ID}).
210-
Asserts(sys,read)
203+
Asserts(rbac.ResourceSystem,rbac.ActionRead)
211204
}))
212205
s.Run("GetWorkspaceAgentsByResourceIDs",s.Subtest(func(db database.Store,check*expects) {
213206
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
214207
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
215208
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
216209
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
217210
check.Args([]uuid.UUID{res.ID}).
218-
Asserts(sys,read).
211+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
219212
Returns([]database.WorkspaceAgent{agt})
220213
}))
221214
s.Run("GetProvisionerJobsByIDs",s.Subtest(func(db database.Store,check*expects) {
222215
a:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{})
223216
b:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{})
224217
check.Args([]uuid.UUID{a.ID,b.ID}).
225-
Asserts(sys,read).
218+
Asserts(rbac.ResourceSystem,rbac.ActionRead).
226219
Returns(slice.New(a,b))
227220
}))
228221
s.Run("InsertWorkspaceAgent",s.Subtest(func(db database.Store,check*expects) {
229222
check.Args(database.InsertWorkspaceAgentParams{
230223
ID:uuid.New(),
231-
}).Asserts(sys,create)
224+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
232225
}))
233226
s.Run("InsertWorkspaceApp",s.Subtest(func(db database.Store,check*expects) {
234227
check.Args(database.InsertWorkspaceAppParams{
235228
ID:uuid.New(),
236229
Health:database.WorkspaceAppHealthDisabled,
237230
SharingLevel:database.AppSharingLevelOwner,
238-
}).Asserts(sys,create)
231+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
239232
}))
240233
s.Run("InsertWorkspaceResourceMetadata",s.Subtest(func(db database.Store,check*expects) {
241234
check.Args(database.InsertWorkspaceResourceMetadataParams{
242235
WorkspaceResourceID:uuid.New(),
243-
}).Asserts(sys,create)
236+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
244237
}))
245238
s.Run("AcquireProvisionerJob",s.Subtest(func(db database.Store,check*expects) {
246239
j:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{
247240
StartedAt: sql.NullTime{Valid:false},
248241
})
249242
check.Args(database.AcquireProvisionerJobParams{Types: []database.ProvisionerType{j.Provisioner}}).
250-
Asserts(sys,update)
243+
Asserts(rbac.ResourceSystem,rbac.ActionUpdate)
251244
}))
252245
s.Run("UpdateProvisionerJobWithCompleteByID",s.Subtest(func(db database.Store,check*expects) {
253246
j:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{})
254247
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
255248
ID:j.ID,
256-
}).Asserts(sys,update)
249+
}).Asserts(rbac.ResourceSystem,rbac.ActionUpdate)
257250
}))
258251
s.Run("UpdateProvisionerJobByID",s.Subtest(func(db database.Store,check*expects) {
259252
j:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{})
260253
check.Args(database.UpdateProvisionerJobByIDParams{
261254
ID:j.ID,
262255
UpdatedAt:time.Now(),
263-
}).Asserts(sys,update)
256+
}).Asserts(rbac.ResourceSystem,rbac.ActionUpdate)
264257
}))
265258
s.Run("InsertProvisionerJob",s.Subtest(func(db database.Store,check*expects) {
266259
check.Args(database.InsertProvisionerJobParams{
267260
ID:uuid.New(),
268261
Provisioner:database.ProvisionerTypeEcho,
269262
StorageMethod:database.ProvisionerStorageMethodFile,
270263
Type:database.ProvisionerJobTypeWorkspaceBuild,
271-
}).Asserts(sys,create)
264+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
272265
}))
273266
s.Run("InsertProvisionerJobLogs",s.Subtest(func(db database.Store,check*expects) {
274267
j:=dbgen.ProvisionerJob(s.T(),db, database.ProvisionerJob{})
275268
check.Args(database.InsertProvisionerJobLogsParams{
276269
JobID:j.ID,
277-
}).Asserts(sys,create)
270+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
278271
}))
279272
s.Run("InsertProvisionerDaemon",s.Subtest(func(db database.Store,check*expects) {
280273
check.Args(database.InsertProvisionerDaemonParams{
281274
ID:uuid.New(),
282-
}).Asserts(sys,create)
275+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
283276
}))
284277
s.Run("InsertTemplateVersionParameter",s.Subtest(func(db database.Store,check*expects) {
285278
v:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{})
286279
check.Args(database.InsertTemplateVersionParameterParams{
287280
TemplateVersionID:v.ID,
288-
}).Asserts(sys,create)
281+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
289282
}))
290283
s.Run("InsertWorkspaceResource",s.Subtest(func(db database.Store,check*expects) {
291284
r:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{})
292285
check.Args(database.InsertWorkspaceResourceParams{
293286
ID:r.ID,
294287
Transition:database.WorkspaceTransitionStart,
295-
}).Asserts(sys,create)
288+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
296289
}))
297290
s.Run("InsertParameterSchema",s.Subtest(func(db database.Store,check*expects) {
298291
check.Args(database.InsertParameterSchemaParams{
299292
ID:uuid.New(),
300293
DefaultSourceScheme:database.ParameterSourceSchemeNone,
301294
DefaultDestinationScheme:database.ParameterDestinationSchemeNone,
302295
ValidationTypeSystem:database.ParameterTypeSystemNone,
303-
}).Asserts(sys,create)
296+
}).Asserts(rbac.ResourceSystem,rbac.ActionCreate)
304297
}))
305298
}

0 commit comments

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