Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit48c5372

Browse files
committed
appease the linter
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
1 parentbc5f4f4 commit48c5372

File tree

7 files changed

+19
-1
lines changed

7 files changed

+19
-1
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,6 +1346,7 @@ func (q *querier) DeleteOrganizationMember(ctx context.Context, arg database.Del
13461346
member,err:=database.ExpectOne(q.OrganizationMembers(ctx, database.OrganizationMembersParams{
13471347
OrganizationID:arg.OrganizationID,
13481348
UserID:arg.UserID,
1349+
IncludeSystem:false,
13491350
}))
13501351
iferr!=nil {
13511352
return database.OrganizationMember{},err
@@ -3776,6 +3777,7 @@ func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemb
37763777
member,err:=database.ExpectOne(q.OrganizationMembers(ctx, database.OrganizationMembersParams{
37773778
OrganizationID:arg.OrgID,
37783779
UserID:arg.UserID,
3780+
IncludeSystem:false,
37793781
}))
37803782
iferr!=nil {
37813783
return database.OrganizationMember{},err

‎coderd/database/dbmem/dbmem.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,11 +1549,16 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, arg database.Ac
15491549
returnsql.ErrNoRows
15501550
}
15511551

1552+
// nolint:revive // It's not a control flag, it's a filter.
15521553
func (q*FakeQuerier)AllUserIDs(_ context.Context,includeSystembool) ([]uuid.UUID,error) {
15531554
q.mutex.RLock()
15541555
deferq.mutex.RUnlock()
15551556
userIDs:=make([]uuid.UUID,0,len(q.users))
15561557
foridx:=rangeq.users {
1558+
if!includeSystem&&q.users[idx].IsSystem.Valid&&q.users[idx].IsSystem.Bool {
1559+
continue
1560+
}
1561+
15571562
userIDs=append(userIDs,q.users[idx].ID)
15581563
}
15591564
returnuserIDs,nil
@@ -2644,12 +2649,17 @@ func (q *FakeQuerier) GetAPIKeysLastUsedAfter(_ context.Context, after time.Time
26442649
returnapiKeys,nil
26452650
}
26462651

2652+
// nolint:revive // It's not a control flag, it's a filter.
26472653
func (q*FakeQuerier)GetActiveUserCount(_ context.Context,includeSystembool) (int64,error) {
26482654
q.mutex.RLock()
26492655
deferq.mutex.RUnlock()
26502656

26512657
active:=int64(0)
26522658
for_,u:=rangeq.users {
2659+
if!includeSystem&&u.IsSystem.Valid&&u.IsSystem.Bool {
2660+
continue
2661+
}
2662+
26532663
ifu.Status==database.UserStatusActive&&!u.Deleted {
26542664
active++
26552665
}
@@ -6200,7 +6210,7 @@ func (q *FakeQuerier) GetUserByID(_ context.Context, id uuid.UUID) (database.Use
62006210
returnq.getUserByIDNoLock(id)
62016211
}
62026212

6203-
// nolint:revive //Nota control flag; used for filtering.
6213+
// nolint:revive //It's nota control flag, it's a filter.
62046214
func (q*FakeQuerier)GetUserCount(_ context.Context,includeSystembool) (int64,error) {
62056215
q.mutex.RLock()
62066216
deferq.mutex.RUnlock()

‎coderd/httpmw/organizationparam.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func ExtractOrganizationMemberParam(db database.Store) func(http.Handler) http.H
126126
organizationMember,err:=database.ExpectOne(db.OrganizationMembers(ctx, database.OrganizationMembersParams{
127127
OrganizationID:organization.ID,
128128
UserID:user.ID,
129+
IncludeSystem:false,
129130
}))
130131
ifhttpapi.Is404Error(err) {
131132
httpapi.ResourceNotFound(rw)

‎coderd/idpsync/role.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"golang.org/x/xerrors"
1111

1212
"cdr.dev/slog"
13+
1314
"github.com/coder/coder/v2/coderd/database"
1415
"github.com/coder/coder/v2/coderd/database/dbauthz"
1516
"github.com/coder/coder/v2/coderd/rbac"
@@ -91,6 +92,7 @@ func (s AGPLIDPSync) SyncRoles(ctx context.Context, db database.Store, user data
9192
orgMemberships,err:=tx.OrganizationMembers(ctx, database.OrganizationMembersParams{
9293
OrganizationID:uuid.Nil,
9394
UserID:user.ID,
95+
IncludeSystem:false,
9496
})
9597
iferr!=nil {
9698
returnxerrors.Errorf("get organizations by user id: %w",err)

‎coderd/members.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ func (api *API) listMembers(rw http.ResponseWriter, r *http.Request) {
160160
members,err:=api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{
161161
OrganizationID:organization.ID,
162162
UserID:uuid.Nil,
163+
IncludeSystem:false,
163164
})
164165
ifhttpapi.Is404Error(err) {
165166
httpapi.ResourceNotFound(rw)

‎coderd/users.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,7 @@ func (api *API) userRoles(rw http.ResponseWriter, r *http.Request) {
11911191
memberships,err:=api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{
11921192
UserID:user.ID,
11931193
OrganizationID:uuid.Nil,
1194+
IncludeSystem:false,
11941195
})
11951196
iferr!=nil {
11961197
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{

‎enterprise/coderd/groups.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
170170
_,err:=database.ExpectOne(api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{
171171
OrganizationID:group.OrganizationID,
172172
UserID:uuid.MustParse(id),
173+
IncludeSystem:false,
173174
}))
174175
iferrors.Is(err,sql.ErrNoRows) {
175176
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp