Skip to content

Commit 7d31209

Browse files
johnstcnjohnstcn
committed
Merge remote-tracking branch 'origin/authzquerier_layer' into authzquerier_layer
2 parents a3f67bb + 912c97a commit 7d31209

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

‎coderd/authzquery/organization_test.go

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@ func (suite *MethodTestSuite) TestOrganization() {
1616
o := dbgen.Organization(t, db, database.Organization{})
1717
a := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
1818
b := dbgen.Group(t, db, database.Group{OrganizationID: o.ID})
19-
return methodCase(values(o.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
19+
return methodCase(values(o.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
20+
values([]database.Group{a, b}))
2021
})
2122
})
2223
suite.Run("GetOrganizationByID", func() {
2324
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
2425
o := dbgen.Organization(t, db, database.Organization{})
25-
return methodCase(values(o.ID), asserts(o, rbac.ActionRead))
26+
return methodCase(values(o.ID), asserts(o, rbac.ActionRead), values(o))
2627
})
2728
})
2829
suite.Run("GetOrganizationByName", func() {
2930
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
3031
o := dbgen.Organization(t, db, database.Organization{})
31-
return methodCase(values(o.Name), asserts(o, rbac.ActionRead))
32+
return methodCase(values(o.Name), asserts(o, rbac.ActionRead), values(o))
3233
})
3334
})
3435
suite.Run("GetOrganizationIDsByMemberIDs", func() {
@@ -38,7 +39,8 @@ func (suite *MethodTestSuite) TestOrganization() {
3839
ma := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: oa.ID})
3940
mb := dbgen.OrganizationMember(t, db, database.OrganizationMember{OrganizationID: ob.ID})
4041
return methodCase(values([]uuid.UUID{ma.UserID, mb.UserID}),
41-
asserts(rbac.ResourceUser.WithID(ma.UserID), rbac.ActionRead, rbac.ResourceUser.WithID(mb.UserID), rbac.ActionRead))
42+
asserts(rbac.ResourceUser.WithID(ma.UserID), rbac.ActionRead, rbac.ResourceUser.WithID(mb.UserID), rbac.ActionRead),
43+
values([]database.Organization{oa, ob}))
4244
})
4345
})
4446
suite.Run("GetOrganizationMemberByUserID", func() {
@@ -47,22 +49,25 @@ func (suite *MethodTestSuite) TestOrganization() {
4749
return methodCase(values(database.GetOrganizationMemberByUserIDParams{
4850
OrganizationID: mem.OrganizationID,
4951
UserID: mem.UserID,
50-
}), asserts(mem, rbac.ActionRead))
52+
}), asserts(mem, rbac.ActionRead),
53+
values(mem))
5154
})
5255
})
5356
suite.Run("GetOrganizationMembershipsByUserID", func() {
5457
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
5558
u := dbgen.User(t, db, database.User{})
5659
a := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
5760
b := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
58-
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
61+
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
62+
values([]database.OrganizationMember{a, b}))
5963
})
6064
})
6165
suite.Run("GetOrganizations", func() {
6266
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6367
a := dbgen.Organization(t, db, database.Organization{})
6468
b := dbgen.Organization(t, db, database.Organization{})
65-
return methodCase(values(), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
69+
return methodCase(values(), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
70+
values([]database.Organization{a, b}))
6671
})
6772
})
6873
suite.Run("GetOrganizationsByUserID", func() {
@@ -72,15 +77,16 @@ func (suite *MethodTestSuite) TestOrganization() {
7277
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID, OrganizationID: a.ID})
7378
b := dbgen.Organization(t, db, database.Organization{})
7479
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID, OrganizationID: b.ID})
75-
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
80+
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
81+
values([]database.Organization{a, b}))
7682
})
7783
})
7884
suite.Run("InsertOrganization", func() {
7985
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
8086
return methodCase(values(database.InsertOrganizationParams{
8187
ID: uuid.New(),
8288
Name: "random",
83-
}), asserts(rbac.ResourceOrganization, rbac.ActionCreate))
89+
}), asserts(rbac.ResourceOrganization, rbac.ActionCreate), nil)
8490
})
8591
})
8692
suite.Run("InsertOrganizationMember", func() {
@@ -95,7 +101,7 @@ func (suite *MethodTestSuite) TestOrganization() {
95101
}), asserts(
96102
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionCreate,
97103
rbac.ResourceOrganizationMember.InOrg(o.ID).WithID(u.ID), rbac.ActionCreate),
98-
)
104+
nil)
99105
})
100106
})
101107
suite.Run("UpdateMemberRoles", func() {
@@ -107,6 +113,8 @@ func (suite *MethodTestSuite) TestOrganization() {
107113
UserID: u.ID,
108114
Roles: []string{rbac.RoleOrgAdmin(o.ID)},
109115
})
116+
out := mem
117+
out.Roles = []string{}
110118

111119
return methodCase(values(database.UpdateMemberRolesParams{
112120
GrantedRoles: []string{},
@@ -116,7 +124,7 @@ func (suite *MethodTestSuite) TestOrganization() {
116124
mem, rbac.ActionRead,
117125
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionCreate, // org-mem
118126
rbac.ResourceRoleAssignment.InOrg(o.ID), rbac.ActionDelete, // org-admin
119-
))
127+
), values(out))
120128
})
121129
})
122130
}

0 commit comments

Comments
 (0)