Skip to content

Commit fc3ae4b

Browse files
johnstcnjohnstcn
committed
insertWithReturn is the new insert
1 parent 2767264 commit fc3ae4b

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

‎coderd/authzquery/apikey.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (q *AuthzQuerier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed tim
2626
}
2727

2828
func (q *AuthzQuerier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {
29-
return insertWithReturn(q.log, q.auth,
29+
return insert(q.log, q.auth,
3030
rbac.ResourceAPIKey.WithOwner(arg.UserID.String()),
3131
q.db.InsertAPIKey)(ctx, arg)
3232
}

‎coderd/authzquery/audit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func (q *AuthzQuerier) InsertAuditLog(ctx context.Context, arg database.InsertAuditLogParams) (database.AuditLog, error) {
11-
return insertWithReturn(q.log, q.auth, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg)
11+
return insert(q.log, q.auth, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg)
1212
}
1313

1414
func (q *AuthzQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAuditLogsOffsetParams) ([]database.GetAuditLogsOffsetRow, error) {

‎coderd/authzquery/authz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ func LogNotAuthorizedError(ctx context.Context, logger slog.Logger, err error) e
5050
}
5151
}
5252

53-
// insertWithReturn runs an rbac.ActionCreate on the rbac object argument before
53+
// insert runs an rbac.ActionCreate on the rbac object argument before
5454
// running the insertFunc. The insertFunc is expected to return the object that
5555
// was inserted.
56-
func insertWithReturn[
56+
func insert[
5757
ObjectType any,
5858
ArgumentType any,
5959
Insert func(ctx context.Context, arg ArgumentType) (ObjectType, error),

‎coderd/authzquery/file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ func (q *AuthzQuerier) GetFileByID(ctx context.Context, id uuid.UUID) (database.
1919
}
2020

2121
func (q *AuthzQuerier) InsertFile(ctx context.Context, arg database.InsertFileParams) (database.File, error) {
22-
return insertWithReturn(q.log, q.auth, rbac.ResourceFile.WithOwner(arg.CreatedBy.String()), q.db.InsertFile)(ctx, arg)
22+
return insert(q.log, q.auth, rbac.ResourceFile.WithOwner(arg.CreatedBy.String()), q.db.InsertFile)(ctx, arg)
2323
}

‎coderd/authzquery/group.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func (q *AuthzQuerier) GetGroupMembers(ctx context.Context, groupID uuid.UUID) (
5858

5959
func (q *AuthzQuerier) InsertAllUsersGroup(ctx context.Context, organizationID uuid.UUID) (database.Group, error) {
6060
// This method creates a new group.
61-
return insertWithReturn(q.log, q.auth, rbac.ResourceGroup.InOrg(organizationID), q.db.InsertAllUsersGroup)(ctx, organizationID)
61+
return insert(q.log, q.auth, rbac.ResourceGroup.InOrg(organizationID), q.db.InsertAllUsersGroup)(ctx, organizationID)
6262
}
6363

6464
func (q *AuthzQuerier) InsertGroup(ctx context.Context, arg database.InsertGroupParams) (database.Group, error) {
65-
return insertWithReturn(q.log, q.auth, rbac.ResourceGroup.InOrg(arg.OrganizationID), q.db.InsertGroup)(ctx, arg)
65+
return insert(q.log, q.auth, rbac.ResourceGroup.InOrg(arg.OrganizationID), q.db.InsertGroup)(ctx, arg)
6666
}
6767

6868
func (q *AuthzQuerier) InsertGroupMember(ctx context.Context, arg database.InsertGroupMemberParams) error {

‎coderd/authzquery/organization.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (q *AuthzQuerier) GetOrganizationsByUserID(ctx context.Context, userID uuid
4848
}
4949

5050
func (q *AuthzQuerier) InsertOrganization(ctx context.Context, arg database.InsertOrganizationParams) (database.Organization, error) {
51-
return insertWithReturn(q.log, q.auth, rbac.ResourceOrganization, q.db.InsertOrganization)(ctx, arg)
51+
return insert(q.log, q.auth, rbac.ResourceOrganization, q.db.InsertOrganization)(ctx, arg)
5252
}
5353

5454
func (q *AuthzQuerier) InsertOrganizationMember(ctx context.Context, arg database.InsertOrganizationMemberParams) (database.OrganizationMember, error) {
@@ -60,7 +60,7 @@ func (q *AuthzQuerier) InsertOrganizationMember(ctx context.Context, arg databas
6060
}
6161

6262
obj := rbac.ResourceOrganizationMember.InOrg(arg.OrganizationID).WithID(arg.UserID)
63-
return insertWithReturn(q.log, q.auth, obj, q.db.InsertOrganizationMember)(ctx, arg)
63+
return insert(q.log, q.auth, obj, q.db.InsertOrganizationMember)(ctx, arg)
6464
}
6565

6666
func (q *AuthzQuerier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {

‎coderd/authzquery/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func (q *AuthzQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.
197197

198198
func (q *AuthzQuerier) InsertTemplate(ctx context.Context, arg database.InsertTemplateParams) (database.Template, error) {
199199
obj := rbac.ResourceTemplate.InOrg(arg.OrganizationID)
200-
return insertWithReturn(q.log, q.auth, obj, q.db.InsertTemplate)(ctx, arg)
200+
return insert(q.log, q.auth, obj, q.db.InsertTemplate)(ctx, arg)
201201
}
202202

203203
func (q *AuthzQuerier) InsertTemplateVersion(ctx context.Context, arg database.InsertTemplateVersionParams) (database.TemplateVersion, error) {

‎coderd/authzquery/user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func (q *AuthzQuerier) InsertUser(ctx context.Context, arg database.InsertUserPa
105105
return database.User{}, err
106106
}
107107
obj := rbac.ResourceUser
108-
return insertWithReturn(q.log, q.auth, obj, q.db.InsertUser)(ctx, arg)
108+
return insert(q.log, q.auth, obj, q.db.InsertUser)(ctx, arg)
109109
}
110110

111111
// TODO: Should this be in system.go?
@@ -186,7 +186,7 @@ func (q *AuthzQuerier) GetGitSSHKey(ctx context.Context, userID uuid.UUID) (data
186186
}
187187

188188
func (q *AuthzQuerier) InsertGitSSHKey(ctx context.Context, arg database.InsertGitSSHKeyParams) (database.GitSSHKey, error) {
189-
return insertWithReturn(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitSSHKey)(ctx, arg)
189+
return insert(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitSSHKey)(ctx, arg)
190190
}
191191

192192
func (q *AuthzQuerier) UpdateGitSSHKey(ctx context.Context, arg database.UpdateGitSSHKeyParams) (database.GitSSHKey, error) {
@@ -201,7 +201,7 @@ func (q *AuthzQuerier) GetGitAuthLink(ctx context.Context, arg database.GetGitAu
201201
}
202202

203203
func (q *AuthzQuerier) InsertGitAuthLink(ctx context.Context, arg database.InsertGitAuthLinkParams) (database.GitAuthLink, error) {
204-
return insertWithReturn(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitAuthLink)(ctx, arg)
204+
return insert(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitAuthLink)(ctx, arg)
205205
}
206206

207207
func (q *AuthzQuerier) UpdateGitAuthLink(ctx context.Context, arg database.UpdateGitAuthLinkParams) error {

‎coderd/authzquery/workspace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ func (q *AuthzQuerier) GetWorkspaceResourcesByJobIDs(ctx context.Context, ids []
300300

301301
func (q *AuthzQuerier) InsertWorkspace(ctx context.Context, arg database.InsertWorkspaceParams) (database.Workspace, error) {
302302
obj := rbac.ResourceWorkspace.WithOwner(arg.OwnerID.String()).InOrg(arg.OrganizationID)
303-
return insertWithReturn(q.log, q.auth, obj, q.db.InsertWorkspace)(ctx, arg)
303+
return insert(q.log, q.auth, obj, q.db.InsertWorkspace)(ctx, arg)
304304
}
305305

306306
func (q *AuthzQuerier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertWorkspaceBuildParams) (database.WorkspaceBuild, error) {

0 commit comments

Comments
 (0)