linting

Emyrk · Emyrk · commit f51fae7c9964 · 2024-09-16T12:31:46.000-05:00
diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go
@@ -906,6 +906,7 @@ func (o orgGroupAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store,
 	}
 }
 
+//nolint:revive
 func (o orgRoleAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store, notMember bool, user database.User) {
 	t.Helper()
 
diff --git a/coderd/idpsync/role.go b/coderd/idpsync/role.go
@@ -70,7 +70,8 @@ func (s AGPLIDPSync) SyncRoles(ctx context.Context, db database.Store, user data
 
 		// sync roles per organization
 		orgMemberships, err := tx.OrganizationMembers(ctx, database.OrganizationMembersParams{
-			UserID: user.ID,
+			OrganizationID: uuid.Nil,
+			UserID:         user.ID,
 		})
 		if err != nil {
 			return xerrors.Errorf("get organizations by user id: %w", err)
@@ -241,7 +242,7 @@ func (s AGPLIDPSync) syncSiteWideRoles(ctx context.Context, tx database.Store, u
 	return nil
 }
 
-func (s AGPLIDPSync) RolesFromClaim(field string, claims jwt.MapClaims) ([]string, error) {
+func (AGPLIDPSync) RolesFromClaim(field string, claims jwt.MapClaims) ([]string, error) {
 	rolesRow, ok := claims[field]
 	if !ok {
 		// If no claim is provided than we can assume the user is just
diff --git a/coderd/idpsync/role_test.go b/coderd/idpsync/role_test.go
@@ -301,6 +301,8 @@ func TestRoleSyncTable(t *testing.T) {
 // per organization. This limits the number of db calls to O(1) if there
 // are no changes. Which is the usual case, as user's roles do not change often.
 func TestNoopNoDiff(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 	ctrl := gomock.NewController(t)
 	mDB := dbmock.NewMockStore(ctrl)

Original file line number	Diff line number	Diff line change
`@@ -906,6 +906,7 @@ func (o orgGroupAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store,`
`906`	`906`	`}`
`907`	`907`	`}`
`908`	`908`
	`909`	`+//nolint:revive`
`909`	`910`	`func (o orgRoleAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store, notMember bool, user database.User) {`
`910`	`911`	`t.Helper()`
`911`	`912`