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

Commitc03bfa3

Browse files
committed
fixed InOrg check for provisionerjob resource
1 parent4351529 commitc03bfa3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2325,7 +2325,7 @@ func (q *querier) GetProvisionerJobsByIDs(ctx context.Context, ids []uuid.UUID)
23252325
returnnil,err
23262326
}
23272327
}
2328-
returnq.db.GetProvisionerJobsByIDs(ctx,ids)
2328+
returnprovisionerJobs,nil
23292329
}
23302330

23312331
func (q*querier)GetProvisionerJobsByIDsWithQueuePosition(ctx context.Context,ids []uuid.UUID) ([]database.GetProvisionerJobsByIDsWithQueuePositionRow,error) {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -694,11 +694,11 @@ func (s *MethodTestSuite) TestProvisionerJob() {
694694
Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead,policy.ActionUpdate}).Returns()
695695
}))
696696
s.Run("GetProvisionerJobsByIDs",s.Subtest(func(db database.Store,check*expects) {
697-
orgID:=uuid.New()
698-
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
699-
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
697+
o:=dbgen.Organization(s.T(),db, database.Organization{})
698+
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:o.ID})
699+
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:o.ID})
700700
check.Args([]uuid.UUID{a.ID,b.ID}).
701-
Asserts(rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead).
701+
Asserts(rbac.ResourceProvisionerJobs.InOrg(o.ID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(o.ID),policy.ActionRead).
702702
Returns(slice.New(a,b))
703703
}))
704704
s.Run("GetProvisionerLogsAfterID",s.Subtest(func(db database.Store,check*expects) {
@@ -3978,11 +3978,11 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39783978
Returns([]database.WorkspaceAgent{agt})
39793979
}))
39803980
s.Run("GetProvisionerJobsByIDs",s.Subtest(func(db database.Store,check*expects) {
3981-
orgID:=uuid.New()
3982-
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
3983-
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
3981+
o:=dbgen.Organization(s.T(),db, database.Organization{})
3982+
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:o.ID})
3983+
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:o.ID})
39843984
check.Args([]uuid.UUID{a.ID,b.ID}).
3985-
Asserts(rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead).
3985+
Asserts(rbac.ResourceProvisionerJobs.InOrg(o.ID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(o.ID),policy.ActionRead).
39863986
Returns(slice.New(a,b))
39873987
}))
39883988
s.Run("InsertWorkspaceAgent",s.Subtest(func(db database.Store,check*expects) {
@@ -4283,7 +4283,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
42834283
check.Args([]uuid.UUID{uuid.New()}).Asserts(rbac.ResourceSystem,policy.ActionRead)
42844284
}))
42854285
s.Run("GetProvisionerJobsByIDsWithQueuePosition",s.Subtest(func(db database.Store,check*expects) {
4286-
check.Args([]uuid.UUID{}).Asserts(/* rbac.ResourceProvisionerJobs.InOrg(orgID), policy.ActionRead */)
4286+
check.Args([]uuid.UUID{}).Asserts()
42874287
}))
42884288
s.Run("GetReplicaByID",s.Subtest(func(db database.Store,check*expects) {
42894289
check.Args(uuid.New()).Asserts(rbac.ResourceSystem,policy.ActionRead).Errors(sql.ErrNoRows)

0 commit comments

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