pr comments

deansheather · deansheather · commit 29655e517294 · 2025-08-20T13:15:26.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -3042,10 +3042,10 @@ func (q *querier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTe
 }
 
 func (q *querier) GetUnexpiredLicenses(ctx context.Context) ([]database.License, error) {
-	fetch := func(ctx context.Context, _ interface{}) ([]database.License, error) {
-		return q.db.GetUnexpiredLicenses(ctx)
+	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceLicense); err != nil {
+		return nil, err
 	}
-	return fetchWithPostFilter(q.auth, policy.ActionRead, fetch)(ctx, nil)
+	return q.db.GetUnexpiredLicenses(ctx)
 }
 
 func (q *querier) GetUserActivityInsights(ctx context.Context, arg database.GetUserActivityInsightsParams) ([]database.GetUserActivityInsightsRow, error) {
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -767,7 +767,7 @@ func (s *MethodTestSuite) TestLicense() {
 		db.EXPECT().GetUnexpiredLicenses(gomock.Any()).
 			Return([]database.License{l}, nil).
 			AnyTimes()
-		check.Args().Asserts(l, policy.ActionRead).
+		check.Args().Asserts(rbac.ResourceLicense, policy.ActionRead).
 			Returns([]database.License{l})
 	}))
 	s.Run("InsertLicense", s.Subtest(func(db database.Store, check *expects) {
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -163,11 +163,11 @@ func (m *multiCloser) Add(closer io.Closer) {
 }
 
 func (m *multiCloser) Close() error {
-	var mErr error
+	var errs []error
 	for _, closer := range m.closers {
 		if err := closer.Close(); err != nil {
-			mErr = xerrors.Errorf("close %T: %w", closer, err)
+			errs = append(errs, xerrors.Errorf("close %T: %w", closer, err))
 		}
 	}
-	return mErr
+	return errors.Join(errs...)
 }

Original file line number	Diff line number	Diff line change
`@@ -3042,10 +3042,10 @@ func (q *querier) GetTemplatesWithFilter(ctx context.Context, arg database.GetTe`
`3042`	`3042`	`}`
`3043`	`3043`
`3044`	`3044`	`func (q *querier) GetUnexpiredLicenses(ctx context.Context) ([]database.License, error) {`
`3045`		`- fetch := func(ctx context.Context, _ interface{}) ([]database.License, error) {`
`3046`		`- return q.db.GetUnexpiredLicenses(ctx)`
	`3045`	`+ if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceLicense); err != nil {`
	`3046`	`+ return nil, err`
`3047`	`3047`	`}`
`3048`		`- return fetchWithPostFilter(q.auth, policy.ActionRead, fetch)(ctx, nil)`
	`3048`	`+ return q.db.GetUnexpiredLicenses(ctx)`
`3049`	`3049`	`}`
`3050`	`3050`
`3051`	`3051`	`func (q *querier) GetUserActivityInsights(ctx context.Context, arg database.GetUserActivityInsightsParams) ([]database.GetUserActivityInsightsRow, error) {`
Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,11 @@ func (m *multiCloser) Add(closer io.Closer) {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`func (m *multiCloser) Close() error {`
`166`		`- var mErr error`
	`166`	`+ var errs []error`
`167`	`167`	`for _, closer := range m.closers {`
`168`	`168`	`if err := closer.Close(); err != nil {`
`169`		`- mErr = xerrors.Errorf("close %T: %w", closer, err)`
	`169`	`+ errs = append(errs, xerrors.Errorf("close %T: %w", closer, err))`
`170`	`170`	`}`
`171`	`171`	`}`
`172`		`- return mErr`
	`172`	`+ return errors.Join(errs...)`
`173`	`173`	`}`