make ErrUserDeleted private

hugodutka · hugodutka · commit 08646da3a8fe · 2024-08-13T08:39:45.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -723,7 +723,7 @@ func (q *FakeQuerier) getOrganizationMemberNoLock(orgID uuid.UUID) []database.Or
 	return members
 }
 
-var ErrUserDeleted = xerrors.New("user deleted")
+var errUserDeleted = xerrors.New("user deleted")
 
 // getGroupMemberNoLock fetches a group member by user ID and group ID.
 func (q *FakeQuerier) getGroupMemberNoLock(ctx context.Context, userID, groupID uuid.UUID) (database.GroupMember, error) {
@@ -744,7 +744,7 @@ func (q *FakeQuerier) getGroupMemberNoLock(ctx context.Context, userID, groupID
 		return database.GroupMember{}, err
 	}
 	if user.Deleted {
-		return database.GroupMember{}, ErrUserDeleted
+		return database.GroupMember{}, errUserDeleted
 	}
 
 	return database.GroupMember{
@@ -778,7 +778,7 @@ func (q *FakeQuerier) getEveryoneGroupMembersNoLock(ctx context.Context, orgID u
 	)
 	for _, member := range orgMembers {
 		groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, orgID)
-		if errors.Is(err, ErrUserDeleted) {
+		if errors.Is(err, errUserDeleted) {
 			continue
 		}
 		if err != nil {
@@ -2554,7 +2554,7 @@ func (q *FakeQuerier) GetGroupMembers(ctx context.Context) ([]database.GroupMemb
 	var groupMembers []database.GroupMember
 	for _, member := range members {
 		groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, member.GroupID)
-		if errors.Is(err, ErrUserDeleted) {
+		if errors.Is(err, errUserDeleted) {
 			continue
 		}
 		if err != nil {
@@ -2577,7 +2577,7 @@ func (q *FakeQuerier) GetGroupMembersByGroupID(ctx context.Context, id uuid.UUID
 	var groupMembers []database.GroupMember
 	for _, member := range q.groupMembers {
 		groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, member.GroupID)
-		if errors.Is(err, ErrUserDeleted) {
+		if errors.Is(err, errUserDeleted) {
 			continue
 		}
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ func (q *FakeQuerier) getOrganizationMemberNoLock(orgID uuid.UUID) []database.Or`
`723`	`723`	`return members`
`724`	`724`	`}`
`725`	`725`
`726`		`-var ErrUserDeleted = xerrors.New("user deleted")`
	`726`	`+var errUserDeleted = xerrors.New("user deleted")`
`727`	`727`
`728`	`728`	`// getGroupMemberNoLock fetches a group member by user ID and group ID.`
`729`	`729`	`func (q *FakeQuerier) getGroupMemberNoLock(ctx context.Context, userID, groupID uuid.UUID) (database.GroupMember, error) {`
`@@ -744,7 +744,7 @@ func (q *FakeQuerier) getGroupMemberNoLock(ctx context.Context, userID, groupID`
`744`	`744`	`return database.GroupMember{}, err`
`745`	`745`	`}`
`746`	`746`	`if user.Deleted {`
`747`		`- return database.GroupMember{}, ErrUserDeleted`
	`747`	`+ return database.GroupMember{}, errUserDeleted`
`748`	`748`	`}`
`749`	`749`
`750`	`750`	`return database.GroupMember{`
`@@ -778,7 +778,7 @@ func (q *FakeQuerier) getEveryoneGroupMembersNoLock(ctx context.Context, orgID u`
`778`	`778`	`)`
`779`	`779`	`for _, member := range orgMembers {`
`780`	`780`	`groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, orgID)`
`781`		`- if errors.Is(err, ErrUserDeleted) {`
	`781`	`+ if errors.Is(err, errUserDeleted) {`
`782`	`782`	`continue`
`783`	`783`	`}`
`784`	`784`	`if err != nil {`
`@@ -2554,7 +2554,7 @@ func (q *FakeQuerier) GetGroupMembers(ctx context.Context) ([]database.GroupMemb`
`2554`	`2554`	`var groupMembers []database.GroupMember`
`2555`	`2555`	`for _, member := range members {`
`2556`	`2556`	`groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, member.GroupID)`
`2557`		`- if errors.Is(err, ErrUserDeleted) {`
	`2557`	`+ if errors.Is(err, errUserDeleted) {`
`2558`	`2558`	`continue`
`2559`	`2559`	`}`
`2560`	`2560`	`if err != nil {`
`@@ -2577,7 +2577,7 @@ func (q *FakeQuerier) GetGroupMembersByGroupID(ctx context.Context, id uuid.UUID`
`2577`	`2577`	`var groupMembers []database.GroupMember`
`2578`	`2578`	`for _, member := range q.groupMembers {`
`2579`	`2579`	`groupMember, err := q.getGroupMemberNoLock(ctx, member.UserID, member.GroupID)`
`2580`		`- if errors.Is(err, ErrUserDeleted) {`
	`2580`	`+ if errors.Is(err, errUserDeleted) {`
`2581`	`2581`	`continue`
`2582`	`2582`	`}`
`2583`	`2583`	`if err != nil {`