Skip to content

Commit 7ba3482

Browse files
EmyrkEmyrk
committed
Rename fetchSet to fetchWithPostFilter
1 parent 7fde8fb commit 7ba3482

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

‎coderd/authzquery/apikey.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ func (q *AuthzQuerier) GetAPIKeyByID(ctx context.Context, id string) (database.A
1818
}
1919

2020
func (q *AuthzQuerier) GetAPIKeysByLoginType(ctx context.Context, loginType database.LoginType) ([]database.APIKey, error) {
21-
return fetchSet(q.auth, q.db.GetAPIKeysByLoginType)(ctx, loginType)
21+
return fetchWithPostFilter(q.auth, q.db.GetAPIKeysByLoginType)(ctx, loginType)
2222
}
2323

2424
func (q *AuthzQuerier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed time.Time) ([]database.APIKey, error) {
25-
return fetchSet(q.auth, q.db.GetAPIKeysLastUsedAfter)(ctx, lastUsed)
25+
return fetchWithPostFilter(q.auth, q.db.GetAPIKeysLastUsedAfter)(ctx, lastUsed)
2626
}
2727

2828
func (q *AuthzQuerier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {

‎coderd/authzquery/authz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ func authorizedQuery[ArgumentType any, ObjectType rbac.Objecter,
235235
}
236236
}
237237

238-
// fetchSet is like fetch, but works with lists of objects.
238+
// fetchWithPostFilter is like fetch, but works with lists of objects.
239239
// SQL filters are much more optimal.
240-
func fetchSet[ArgumentType any, ObjectType rbac.Objecter,
240+
func fetchWithPostFilter[ArgumentType any, ObjectType rbac.Objecter,
241241
DatabaseFunc func(ctx context.Context, arg ArgumentType) ([]ObjectType, error)](
242242
// Arguments
243243
authorizer rbac.Authorizer,

‎coderd/authzquery/license.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func (q *AuthzQuerier) GetLicenses(ctx context.Context) ([]database.License, err
1212
fetch := func(ctx context.Context, _ interface{}) ([]database.License, error) {
1313
return q.db.GetLicenses(ctx)
1414
}
15-
return fetchSet(q.auth, fetch)(ctx, nil)
15+
return fetchWithPostFilter(q.auth, fetch)(ctx, nil)
1616
}
1717

1818
func (q *AuthzQuerier) InsertLicense(ctx context.Context, arg database.InsertLicenseParams) (database.License, error) {

‎coderd/authzquery/methods.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func (q *AuthzQuerier) GetProvisionerDaemons(ctx context.Context) ([]database.Pr
1313
fetch := func(ctx context.Context, _ interface{}) ([]database.ProvisionerDaemon, error) {
1414
return q.db.GetProvisionerDaemons(ctx)
1515
}
16-
return fetchSet(q.auth, fetch)(ctx, nil)
16+
return fetchWithPostFilter(q.auth, fetch)(ctx, nil)
1717
}
1818

1919
func (q *AuthzQuerier) GetDeploymentDAUs(ctx context.Context) ([]database.GetDeploymentDAUsRow, error) {

‎coderd/authzquery/organization.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
func (q *AuthzQuerier) GetGroupsByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]database.Group, error) {
14-
return fetchSet(q.auth, q.db.GetGroupsByOrganizationID)(ctx, organizationID)
14+
return fetchWithPostFilter(q.auth, q.db.GetGroupsByOrganizationID)(ctx, organizationID)
1515
}
1616

1717
func (q *AuthzQuerier) GetOrganizationByID(ctx context.Context, id uuid.UUID) (database.Organization, error) {
@@ -25,26 +25,26 @@ func (q *AuthzQuerier) GetOrganizationByName(ctx context.Context, name string) (
2525
func (q *AuthzQuerier) GetOrganizationIDsByMemberIDs(ctx context.Context, ids []uuid.UUID) ([]database.GetOrganizationIDsByMemberIDsRow, error) {
2626
// TODO: This should be rewritten to return a list of database.OrganizationMember for consistent RBAC objects.
2727
// Currently this row returns a list of org ids per user, which is challenging to check against the RBAC system.
28-
return fetchSet(q.auth, q.db.GetOrganizationIDsByMemberIDs)(ctx, ids)
28+
return fetchWithPostFilter(q.auth, q.db.GetOrganizationIDsByMemberIDs)(ctx, ids)
2929
}
3030

3131
func (q *AuthzQuerier) GetOrganizationMemberByUserID(ctx context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) {
3232
return fetch(q.log, q.auth, q.db.GetOrganizationMemberByUserID)(ctx, arg)
3333
}
3434

3535
func (q *AuthzQuerier) GetOrganizationMembershipsByUserID(ctx context.Context, userID uuid.UUID) ([]database.OrganizationMember, error) {
36-
return fetchSet(q.auth, q.db.GetOrganizationMembershipsByUserID)(ctx, userID)
36+
return fetchWithPostFilter(q.auth, q.db.GetOrganizationMembershipsByUserID)(ctx, userID)
3737
}
3838

3939
func (q *AuthzQuerier) GetOrganizations(ctx context.Context) ([]database.Organization, error) {
4040
fetch := func(ctx context.Context, _ interface{}) ([]database.Organization, error) {
4141
return q.db.GetOrganizations(ctx)
4242
}
43-
return fetchSet(q.auth, fetch)(ctx, nil)
43+
return fetchWithPostFilter(q.auth, fetch)(ctx, nil)
4444
}
4545

4646
func (q *AuthzQuerier) GetOrganizationsByUserID(ctx context.Context, userID uuid.UUID) ([]database.Organization, error) {
47-
return fetchSet(q.auth, q.db.GetOrganizationsByUserID)(ctx, userID)
47+
return fetchWithPostFilter(q.auth, q.db.GetOrganizationsByUserID)(ctx, userID)
4848
}
4949

5050
func (q *AuthzQuerier) InsertOrganization(ctx context.Context, arg database.InsertOrganizationParams) (database.Organization, error) {

‎coderd/authzquery/user.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (q *AuthzQuerier) GetFilteredUserCount(ctx context.Context, arg database.Ge
6363

6464
func (q *AuthzQuerier) GetUsers(ctx context.Context, arg database.GetUsersParams) ([]database.GetUsersRow, error) {
6565
// TODO: We should use GetUsersWithCount with a better method signature.
66-
return fetchSet(q.auth, q.db.GetUsers)(ctx, arg)
66+
return fetchWithPostFilter(q.auth, q.db.GetUsers)(ctx, arg)
6767
}
6868

6969
func (q *AuthzQuerier) GetUsersWithCount(ctx context.Context, arg database.GetUsersParams) ([]database.User, int64, error) {
@@ -93,7 +93,7 @@ func (q *AuthzQuerier) GetUsersWithCount(ctx context.Context, arg database.GetUs
9393
}
9494

9595
func (q *AuthzQuerier) GetUsersByIDs(ctx context.Context, ids []uuid.UUID) ([]database.User, error) {
96-
return fetchSet(q.auth, q.db.GetUsersByIDs)(ctx, ids)
96+
return fetchWithPostFilter(q.auth, q.db.GetUsersByIDs)(ctx, ids)
9797
}
9898

9999
func (q *AuthzQuerier) InsertUser(ctx context.Context, arg database.InsertUserParams) (database.User, error) {
@@ -189,7 +189,10 @@ func (q *AuthzQuerier) InsertGitSSHKey(ctx context.Context, arg database.InsertG
189189
}
190190

191191
func (q *AuthzQuerier) UpdateGitSSHKey(ctx context.Context, arg database.UpdateGitSSHKeyParams) (database.GitSSHKey, error) {
192-
return insertWithReturn(q.log, q.auth, rbac.ActionUpdate, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.UpdateGitSSHKey)(ctx, arg)
192+
fetch := func(ctx context.Context, arg database.UpdateGitSSHKeyParams) (database.GitSSHKey, error) {
193+
return q.db.GetGitSSHKey(ctx, arg.UserID)
194+
}
195+
return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateGitSSHKey)(ctx, arg)
193196
}
194197

195198
func (q *AuthzQuerier) GetGitAuthLink(ctx context.Context, arg database.GetGitAuthLinkParams) (database.GitAuthLink, error) {

0 commit comments

Comments
 (0)