Skip to content

Commit 20b0450

Browse files
committed
refactor: capture loop variables to avoid closure issues in goroutines
Signed-off-by: cuisongliu <[email protected]>
1 parent 2d5973e commit 20b0450

File tree

6 files changed

+6
-1
lines changed

6 files changed

+6
-1
lines changed

lifecycle/pkg/apply/applydrivers/apply_drivers_default.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ func (c *Applier) syncWorkdir() {
337337
}
338338
eg, _ := errgroup.WithContext(context.Background())
339339
for _, ipAddr := range ipList {
340+
ipAddr := ipAddr
340341
eg.Go(func() error {
341342
return execer.Copy(ipAddr, workDir, workDir)
342343
})

lifecycle/pkg/apply/processor/create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ func (c *CreateProcessor) RunConfig(cluster *v2.Cluster) error {
121121
logger.Info("Executing pipeline RunConfig in CreateProcessor.")
122122
eg, _ := errgroup.WithContext(context.Background())
123123
for _, cManifest := range cluster.Status.Mounts {
124+
cManifest := cManifest
124125
eg.Go(func() error {
125126
cfg := config.NewConfiguration(
126127
cManifest.ImageName,

lifecycle/pkg/apply/processor/delete.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ func (d *DeleteProcessor) UnMountRootfs(cluster *v2.Cluster) error {
115115
func (d *DeleteProcessor) UnMountImage(cluster *v2.Cluster) error {
116116
eg, _ := errgroup.WithContext(context.Background())
117117
for _, mount := range cluster.Status.Mounts {
118+
mount := mount
118119
eg.Go(func() error {
119120
return d.Buildah.Delete(mount.Name)
120121
})

lifecycle/pkg/apply/processor/install.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ func (c *InstallProcessor) RunConfig(_ *v2.Cluster) error {
240240
}
241241
eg, _ := errgroup.WithContext(context.Background())
242242
for _, cManifest := range c.NewMounts {
243+
cManifest := cManifest
243244
eg.Go(func() error {
244245
cfg := config.NewConfiguration(
245246
cManifest.ImageName,

lifecycle/pkg/apply/processor/scale.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ func (c *ScaleProcessor) RunConfig(cluster *v2.Cluster) error {
264264
logger.Info("Executing pipeline RunConfig in ScaleProcessor.")
265265
eg, _ := errgroup.WithContext(context.Background())
266266
for _, cManifest := range cluster.Status.Mounts {
267+
cManifest := cManifest
267268
eg.Go(func() error {
268269
cfg := config.NewConfiguration(
269270
cManifest.ImageName,

lifecycle/pkg/buildah/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ func manifestInspect(
988988
if latestErr == nil {
989989
latestErr = e
990990
} else {
991-
latestErr = fmt.Errorf("tried %w: %w", e, latestErr)
991+
latestErr = fmt.Errorf("tried %v: %w", e, latestErr)
992992
}
993993
}
994994

0 commit comments

Comments
 (0)