linting

Emyrk · Emyrk · commit bcea54a0cc9a · 2024-11-14T14:42:52.000-06:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8354,7 +8354,7 @@ func (q *FakeQuerier) ListWorkspaceAgentPortShares(_ context.Context, workspaceI
 	return shares, nil
 }
 
-func (q *FakeQuerier) OIDCClaimFields(ctx context.Context, organizationID uuid.UUID) ([]string, error) {
+func (q *FakeQuerier) OIDCClaimFields(_ context.Context, organizationID uuid.UUID) ([]string, error) {
 	orgMembers := q.getOrganizationMemberNoLock(organizationID)
 
 	var fields []string
diff --git a/coderd/database/oidcclaims_test.go b/coderd/database/oidcclaims_test.go
@@ -137,14 +137,7 @@ type userGenerator struct {
 }
 
 func (g userGenerator) noLink(lt database.LoginType) database.User {
-	return g.user(lt, false, nil)
-}
-
-func (g userGenerator) withLink(lt database.LoginType, rawJSON json.RawMessage) database.User {
-	return g.user(lt, true, rawJSON)
-}
 
-func (g userGenerator) user(lt database.LoginType, createLink bool, rawJSON json.RawMessage) database.User {
 	t := g.t
 	db := g.db
 
@@ -153,13 +146,17 @@ func (g userGenerator) user(lt database.LoginType, createLink bool, rawJSON json
 	u := dbgen.User(t, db, database.User{
 		LoginType: lt,
 	})
+	return u
+}
 
-	if !createLink {
-		return u
-	}
+func (g userGenerator) withLink(lt database.LoginType, rawJSON json.RawMessage) database.User {
+	t := g.t
+	db := g.db
+
+	user := g.noLink(lt)
 
 	link := dbgen.UserLink(t, db, database.UserLink{
-		UserID:    u.ID,
+		UserID:    user.ID,
 		LoginType: lt,
 	})
 
@@ -188,7 +185,7 @@ func (g userGenerator) user(lt database.LoginType, createLink bool, rawJSON json
 		require.NoError(t, err)
 	}
 
-	return u
+	return user
 }
 
 type rawUpdater interface {

Original file line number	Diff line number	Diff line change
`@@ -8354,7 +8354,7 @@ func (q *FakeQuerier) ListWorkspaceAgentPortShares(_ context.Context, workspaceI`
`8354`	`8354`	`return shares, nil`
`8355`	`8355`	`}`
`8356`	`8356`
`8357`		`-func (q *FakeQuerier) OIDCClaimFields(ctx context.Context, organizationID uuid.UUID) ([]string, error) {`
	`8357`	`+func (q *FakeQuerier) OIDCClaimFields(_ context.Context, organizationID uuid.UUID) ([]string, error) {`
`8358`	`8358`	`orgMembers := q.getOrganizationMemberNoLock(organizationID)`
`8359`	`8359`
`8360`	`8360`	`var fields []string`