Skip to content

Commit 10c5669

Browse files
committed
fix: resolve loopvar experiment issues by capturing loop variables
1 parent fe9a05f commit 10c5669

File tree

12 files changed

+17
-0
lines changed

12 files changed

+17
-0
lines changed

internal/services/applesilicon/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData,
309309
authorized := true
310310

311311
for _, privateNetworkID := range privateNetworkIDs {
312+
privateNetworkID := privateNetworkID // capture loop variable
312313
resourceType := ipamAPI.ResourceTypeAppleSiliconPrivateNic
313314
opts := &ipam.GetResourcePrivateIPsOptions{
314315
ResourceType: &resourceType,

internal/services/baremetal/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag
551551
diags := diag.Diagnostics{}
552552

553553
for _, privateNetworkID := range privateNetworkIDs {
554+
privateNetworkID := privateNetworkID // capture loop variable
554555
resourceType := ipamAPI.ResourceTypeBaremetalPrivateNic
555556
opts := &ipam.GetResourcePrivateIPsOptions{
556557
ResourceType: &resourceType,

internal/services/container/helpers_container.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ func filterSecretEnvsToPatch(oldEnv []*container.Secret, newEnv []*container.Sec
499499

500500
// delete
501501
for _, env := range oldEnv {
502+
env := env // capture loop variable
502503
if !slices.ContainsFunc(newEnv, func(s *container.Secret) bool {
503504
return s.Key == env.Key
504505
}) {

internal/services/function/helpers_function.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ func filterSecretEnvsToPatch(oldEnv []*function.Secret, newEnv []*function.Secre
202202

203203
// delete
204204
for _, env := range oldEnv {
205+
env := env // capture loop variable
205206
if !slices.ContainsFunc(newEnv, func(s *function.Secret) bool {
206207
return s.Key == env.Key
207208
}) {

internal/services/instance/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,6 +897,7 @@ You can check the full list of compatible server types:
897897
}
898898

899899
for _, nicID := range privateNICIDs {
900+
nicID := nicID // capture loop variable
900901
opts := &ipam.GetResourcePrivateIPsOptions{
901902
ResourceType: &resourceType,
902903
ResourceID: &nicID,

internal/services/instance/servers_data_source.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData,
297297
}
298298

299299
for _, nicID := range privateNICIDs {
300+
nicID := nicID // capture loop variable
300301
opts := &ipam.GetResourcePrivateIPsOptions{
301302
ResourceType: &resourceType,
302303
ResourceID: &nicID,

internal/services/jobs/helpers.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ func CreateJobDefinitionSecret(ctx context.Context, api *jobs.API, jobSecrets []
163163
secretConfigs := []*jobs.CreateJobDefinitionSecretsRequestSecretConfig{}
164164

165165
for _, parsedSecretRef := range jobSecrets {
166+
parsedSecretRef := parsedSecretRef // capture loop variable
166167
secretConfig := &jobs.CreateJobDefinitionSecretsRequestSecretConfig{}
167168

168169
secretConfigs = append(secretConfigs, secretConfig)
@@ -220,12 +221,14 @@ func DiffJobDefinitionSecrets(oldSecretRefs, newSecretRefs []JobDefinitionSecret
220221
// hash the new and old secret sets
221222
oldSecretRefsMap := make(map[int]JobDefinitionSecret, len(oldSecretRefs))
222223
for _, secret := range oldSecretRefs {
224+
secret := secret // capture loop variable
223225
oldSecretRefsMap[hashJobDefinitionSecret(&secret)] = secret
224226
}
225227

226228
newSecretRefsMap := make(map[int]JobDefinitionSecret, len(newSecretRefs))
227229

228230
for _, secret := range newSecretRefs {
231+
secret := secret // capture loop variable
229232
if err := validateJobDefinitionSecret(&secret); err != nil {
230233
return toCreate, toDelete, err
231234
}

internal/services/lb/lb.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ func resourceLbRead(ctx context.Context, d *schema.ResourceData, m any) diag.Dia
363363
resourceType := ipamAPI.ResourceTypeLBServer
364364

365365
for _, privateNetworkID := range privateNetworkIDs {
366+
privateNetworkID := privateNetworkID // capture loop variable
366367
opts := &ipam.GetResourcePrivateIPsOptions{
367368
ResourceType: &resourceType,
368369
PrivateNetworkID: &privateNetworkID,

internal/services/mnq/sns_topic.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ func ResourceMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, m an
206206

207207
if len(updatedAttributes) > 0 {
208208
for attributeName, attributeValue := range updatedAttributes {
209+
attributeName := attributeName // capture loop variable
210+
attributeValue := attributeValue // capture loop variable
209211
_, err := snsClient.SetTopicAttributes(ctx, &sns.SetTopicAttributesInput{
210212
AttributeName: scw.StringPtr(attributeName),
211213
AttributeValue: &attributeValue,

internal/services/object/helpers_object.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ func deleteMarkerBucket(ctx context.Context, conn *s3.Client, bucketName string,
495495
var nObject int64
496496

497497
for _, deleteMarkerEntry := range page.DeleteMarkers {
498+
deleteMarkerEntry := deleteMarkerEntry // capture loop variable
498499
pool.AddTask(func() error {
499500
deleteMarkerKey := aws.ToString(deleteMarkerEntry.Key)
500501
deleteMarkerVersionsID := aws.ToString(deleteMarkerEntry.VersionId)
@@ -517,6 +518,7 @@ func deleteVersionBucket(ctx context.Context, conn *s3.Client, bucketName string
517518
var nObject int64
518519

519520
for _, objectVersion := range page.Versions {
521+
objectVersion := objectVersion // capture loop variable
520522
pool.AddTask(func() error {
521523
objectKey := aws.ToString(objectVersion.Key)
522524
objectVersionID := aws.ToString(objectVersion.VersionId)

0 commit comments

Comments
 (0)