Skip to content

Clean up loop captures in tests #6592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moduli merged 2 commits into from
May 1, 2026
Merged

Clean up loop captures in tests #6592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4071603
Clean up loop captures
averche Apr 16, 2026
01aada9
some more
averche Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/alias/target/repository_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ func TestRepository_CreateAlias(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
repo, err := target.NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -683,7 +682,6 @@ func TestRepository_UpdateAlias(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
tt.orig.ScopeId = "global"
orig, err := repo.CreateAlias(ctx, tt.orig)
Expand Down Expand Up @@ -806,7 +804,6 @@ func TestRepository_LookupAlias(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
kms := kms.TestKms(t, conn, wrapper)
Expand Down Expand Up @@ -875,7 +872,6 @@ func TestRepository_DeleteAlias(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
got, err := repo.DeleteAlias(ctx, tt.id)
Expand Down
1 change: 0 additions & 1 deletion internal/alias/target/repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ func TestRepository_New(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := NewRepository(ctx, tt.args.r, tt.args.w, tt.args.kms, tt.args.opts...)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/ldap/deref_aliases_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func TestNewDerefAliases(t *testing.T) {
},
}
for _, tc := range tests {
tc := tc
t.Run(tc.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := NewDerefAliases(tc.ctx, tc.authMethodId, tc.derefAliases)
Expand Down
6 changes: 0 additions & 6 deletions internal/auth/oidc/immutable_fields_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func TestAuthMethod_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -144,7 +143,6 @@ func TestAudClaim_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -225,7 +223,6 @@ func TestCertificate_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -302,7 +299,6 @@ func TestSigningAlg_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -407,7 +403,6 @@ func TestAccount_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -484,7 +479,6 @@ func TestPrompt_ImmutableFields(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down
6 changes: 0 additions & 6 deletions internal/auth/oidc/repository_account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ func TestRepository_CreateAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -526,7 +525,6 @@ func TestRepository_LookupAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -602,7 +600,6 @@ func TestRepository_DeleteAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -691,7 +688,6 @@ func TestRepository_ListAccounts(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -787,7 +783,6 @@ func TestRepository_ListAccounts_Limits(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache, tt.repoOpts...)
Expand Down Expand Up @@ -1137,7 +1132,6 @@ func TestRepository_UpdateAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/oidc/repository_auth_method_read_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ func TestRepository_LookupAuthMethod(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/oidc/repository_managed_group_members_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ func Test_ManagedGroupMemberships(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down
6 changes: 0 additions & 6 deletions internal/auth/oidc/repository_managed_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ func TestRepository_CreateManagedGroup(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -265,7 +264,6 @@ func TestRepository_LookupManagedGroup(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -341,7 +339,6 @@ func TestRepository_DeleteManagedGroup(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down Expand Up @@ -458,7 +455,6 @@ func TestRepository_ListManagedGroups(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
got, ttime, err := repo.ListManagedGroups(context.Background(), tt.in, tt.opts...)
if tt.wantIsErr != 0 {
Expand Down Expand Up @@ -575,7 +571,6 @@ func TestRepository_ListManagedGroups_Limits(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache, tt.repoOpts...)
Expand Down Expand Up @@ -1081,7 +1076,6 @@ func TestRepository_UpdateManagedGroup(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kmsCache)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/password/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ func TestAccount_New(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := NewAccount(context.Background(), tt.args.authMethodId, tt.args.opts...)
Expand Down
3 changes: 0 additions & 3 deletions internal/auth/password/argon2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ func TestArgon2Configuration_Readonly(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
var confs []*Argon2Configuration
Expand Down Expand Up @@ -283,7 +282,6 @@ func TestArgon2Configuration_Validate(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got := tt.in.validate(context.Background())
Expand Down Expand Up @@ -429,7 +427,6 @@ func TestArgon2Credential_New(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := newArgon2Credential(context.Background(), tt.args.accountId, tt.args.password, tt.args.conf, rand.Reader)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/password/auth_method_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func TestAuthMethod_New(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
org, _ := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper))
Expand Down
7 changes: 0 additions & 7 deletions internal/auth/password/repository_account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func TestCheckLoginName(t *testing.T) {
{"validloginname", true},
}
for _, tt := range tests {
tt := tt
t.Run(tt.in, func(t *testing.T) {
assert.Equal(t, tt.want, validLoginName(tt.in))
})
Expand Down Expand Up @@ -236,7 +235,6 @@ func TestRepository_CreateAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(context.Background(), rw, rw, kms)
Expand Down Expand Up @@ -387,7 +385,6 @@ func TestRepository_LookupAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kms)
Expand Down Expand Up @@ -445,7 +442,6 @@ func TestRepository_DeleteAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kms)
Expand Down Expand Up @@ -504,7 +500,6 @@ func TestRepository_ListAccounts(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(context.Background(), rw, rw, kms)
Expand Down Expand Up @@ -584,7 +579,6 @@ func TestRepository_ListAccounts_Limits(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(context.Background(), rw, rw, kms, tt.repoOpts...)
Expand Down Expand Up @@ -926,7 +920,6 @@ func TestRepository_UpdateAccount(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(context.Background(), rw, rw, kms)
Expand Down
3 changes: 0 additions & 3 deletions internal/auth/password/repository_authmethod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ func TestRepository_CreateAuthMethod(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kms)
Expand Down Expand Up @@ -321,7 +320,6 @@ func TestRepository_LookupAuthMethod(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kms)
Expand Down Expand Up @@ -376,7 +374,6 @@ func TestRepository_DeleteAuthMethod(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
repo, err := NewRepository(ctx, rw, rw, kms)
Expand Down
2 changes: 0 additions & 2 deletions internal/auth/password/repository_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ func TestRepository_GetConfiguration(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := repo.GetConfiguration(ctx, tt.authMethodId)
Expand Down Expand Up @@ -289,7 +288,6 @@ func TestRepository_SetConfiguration(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := repo.SetConfiguration(context.Background(), o.GetPublicId(), tt.in)
Expand Down
3 changes: 0 additions & 3 deletions internal/auth/password/repository_password_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ func TestRepository_Authenticate(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
authAcct, err := repo.Authenticate(context.Background(), o.GetPublicId(), tt.args.authMethodId, tt.args.loginName, tt.args.password)
Expand Down Expand Up @@ -373,7 +372,6 @@ func TestRepository_ChangePassword(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)

Expand Down Expand Up @@ -493,7 +491,6 @@ func TestRepository_SetPassword(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
acct := tt.createAcct(tt.oldPw)
Expand Down
1 change: 0 additions & 1 deletion internal/auth/password/repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func TestRepository_New(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert, require := assert.New(t), require.New(t)
got, err := NewRepository(context.Background(), tt.args.r, tt.args.w, tt.args.kms, tt.args.opts...)
Expand Down
3 changes: 0 additions & 3 deletions internal/authtoken/authtoken_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ func TestAuthToken_DbUpdate(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
w := db.New(conn)
Expand Down Expand Up @@ -173,7 +172,6 @@ func TestAuthToken_DbCreate(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
at := &AuthToken{AuthToken: tt.in}
Expand Down Expand Up @@ -234,7 +232,6 @@ func TestAuthToken_DbDelete(t *testing.T) {
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
assert := assert.New(t)
cnt, err := db.New(conn).Delete(ctx, tt.at)
Expand Down
Loading
Loading