remove insert() function

johnstcn · johnstcn · commit 2767264136b5 · 2023-02-07T15:14:37.000Z
diff --git a/coderd/authzquery/authz.go b/coderd/authzquery/authz.go
@@ -50,24 +50,6 @@ func LogNotAuthorizedError(ctx context.Context, logger slog.Logger, err error) e
 	}
 }
 
-// insert is the same as insertWithReturn, but does not return the inserted object.
-func insert[
-	ArgumentType any,
-	Insert func(ctx context.Context, arg ArgumentType) error,
-](
-	logger slog.Logger,
-	authorizer rbac.Authorizer,
-	object rbac.Objecter,
-	insertFunc Insert,
-) Insert {
-	return func(ctx context.Context, arg ArgumentType) error {
-		_, err := insertWithReturn(logger, authorizer, object, func(ctx context.Context, arg ArgumentType) (rbac.Objecter, error) {
-			return rbac.Object{}, insertFunc(ctx, arg)
-		})(ctx, arg)
-		return err
-	}
-}
-
 // insertWithReturn runs an rbac.ActionCreate on the rbac object argument before
 // running the insertFunc. The insertFunc is expected to return the object that
 // was inserted.
diff --git a/coderd/authzquery/license.go b/coderd/authzquery/license.go
@@ -16,15 +16,24 @@ func (q *AuthzQuerier) GetLicenses(ctx context.Context) ([]database.License, err
 }
 
 func (q *AuthzQuerier) InsertLicense(ctx context.Context, arg database.InsertLicenseParams) (database.License, error) {
-	return insertWithReturn(q.log, q.auth, rbac.ResourceLicense, q.db.InsertLicense)(ctx, arg)
+	if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceLicense); err != nil {
+		return database.License{}, err
+	}
+	return q.db.InsertLicense(ctx, arg)
 }
 
 func (q *AuthzQuerier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {
-	return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateLogoURL)(ctx, value)
+	if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentConfig); err != nil {
+		return err
+	}
+	return q.db.InsertOrUpdateLogoURL(ctx, value)
 }
 
 func (q *AuthzQuerier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {
-	return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateServiceBanner)(ctx, value)
+	if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentConfig); err != nil {
+		return err
+	}
+	return q.db.InsertOrUpdateServiceBanner(ctx, value)
 }
 
 func (q *AuthzQuerier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,24 @@ func (q *AuthzQuerier) GetLicenses(ctx context.Context) ([]database.License, err`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func (q *AuthzQuerier) InsertLicense(ctx context.Context, arg database.InsertLicenseParams) (database.License, error) {`
`19`		`- return insertWithReturn(q.log, q.auth, rbac.ResourceLicense, q.db.InsertLicense)(ctx, arg)`
	`19`	`+ if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceLicense); err != nil {`
	`20`	`+ return database.License{}, err`
	`21`	`+ }`
	`22`	`+ return q.db.InsertLicense(ctx, arg)`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`func (q *AuthzQuerier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {`
`23`		`- return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateLogoURL)(ctx, value)`
	`26`	`+ if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentConfig); err != nil {`
	`27`	`+ return err`
	`28`	`+ }`
	`29`	`+ return q.db.InsertOrUpdateLogoURL(ctx, value)`
`24`	`30`	`}`
`25`	`31`
`26`	`32`	`func (q *AuthzQuerier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {`
`27`		`- return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateServiceBanner)(ctx, value)`
	`33`	`+ if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentConfig); err != nil {`
	`34`	`+ return err`
	`35`	`+ }`
	`36`	`+ return q.db.InsertOrUpdateServiceBanner(ctx, value)`
`28`	`37`	`}`
`29`	`38`
`30`	`39`	`func (q *AuthzQuerier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {`