Merge pull request #662 from tjouni/fix/shouldretry-unnamed-parameter

hariom-hashicorp · web-flow · commit f31912def23f · 2026-05-22T20:00:47.000+05:30
Fix ShouldRetry callbacks to name error parameter for correct retry behavior
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Latest Release
 
 Please refer to [releases](https://github.com/hashicorp/packer-plugin-amazon/releases) for the latest CHANGELOG information.
+---
+## x.x.x (Unreleased)
+
+## 🐛 Bug Fixes
+- **Fix ShouldRetry callbacks not receiving error from retry framework** – by @tjouni
+  Several `ShouldRetry` callbacks had unnamed function parameters, causing them to
+  reference the outer scope's error variable instead of the error passed by the retry
+  framework. This prevented retries from working for transient AWS API errors such as
+  `InvalidAMIID.NotFound`, `InvalidSnapshot.NotFound`, and `InvalidInstanceID.NotFound`.
+
 ---
 ## 1.8.0 (November 19, 2025)
 
diff --git a/builder/common/step_create_tags.go b/builder/common/step_create_tags.go
@@ -102,7 +102,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 		snapshotTags.Report(ui)
 
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
+		err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidAMIID.NotFound", "") || awserrors.Matches(err, "InvalidSnapshot.NotFound", "") {
 				return true
 			}
diff --git a/builder/common/step_run_source_instance.go b/builder/common/step_run_source_instance.go
@@ -364,7 +364,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 	if s.IsRestricted {
 		ec2Tags.Report(ui)
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
+		err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}
diff --git a/builder/common/step_run_spot_instance.go b/builder/common/step_run_spot_instance.go
@@ -510,7 +510,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		// Apply tags to the spot request.
 		err = retry.Config{
 			Tries:       11,
-			ShouldRetry: func(error) bool { return false },
+			ShouldRetry: func(err error) bool { return false },
 			RetryDelay:  (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
 		}.Run(ctx, func(ctx context.Context) error {
 			_, err := ec2conn.CreateTags(&ec2.CreateTagsInput{
diff --git a/builder/common/step_stop_ebs_instance.go b/builder/common/step_stop_ebs_instance.go
@@ -45,7 +45,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta
 		// does not exist.
 
 		// Work around this by retrying a few times, up to about 5 minutes.
-		err := retry.Config{Tries: 6, ShouldRetry: func(error) bool {
+		err := retry.Config{Tries: 6, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}
diff --git a/common/step_create_tags.go b/common/step_create_tags.go
@@ -106,7 +106,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 		snapshotTags.Report(ui)
 
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
+		err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidAMIID.NotFound", "") || awserrors.Matches(err, "InvalidSnapshot.NotFound", "") {
 				return true
 			}
diff --git a/common/step_run_source_instance.go b/common/step_run_source_instance.go
@@ -368,7 +368,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 	if s.IsRestricted {
 		ec2Tags.Report(ui)
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
+		err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}
diff --git a/common/step_run_spot_instance.go b/common/step_run_spot_instance.go
@@ -515,7 +515,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		// Apply tags to the spot request.
 		err = retry.Config{
 			Tries:       11,
-			ShouldRetry: func(error) bool { return false },
+			ShouldRetry: func(err error) bool { return false },
 			RetryDelay:  (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
 		}.Run(ctx, func(ctx context.Context) error {
 			_, err := ec2Client.CreateTags(ctx, &ec2.CreateTagsInput{
diff --git a/common/step_stop_ebs_instance.go b/common/step_stop_ebs_instance.go
@@ -48,7 +48,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta
 		// does not exist.
 
 		// Work around this by retrying a few times, up to about 5 minutes.
-		err := retry.Config{Tries: 6, ShouldRetry: func(error) bool {
+		err := retry.Config{Tries: 6, ShouldRetry: func(err error) bool {
 			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult`
`102`	`102`	`snapshotTags.Report(ui)`
`103`	`103`
`104`	`104`	`// Retry creating tags for about 2.5 minutes`
`105`		`- err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {`
	`105`	`+ err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {`
`106`	`106`	`if awserrors.Matches(err, "InvalidAMIID.NotFound", "") \|\| awserrors.Matches(err, "InvalidSnapshot.NotFound", "") {`
`107`	`107`	`return true`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa`
`364`	`364`	`if s.IsRestricted {`
`365`	`365`	`ec2Tags.Report(ui)`
`366`	`366`	`// Retry creating tags for about 2.5 minutes`
`367`		`- err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {`
	`367`	`+ err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {`
`368`	`368`	`if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {`
`369`	`369`	`return true`
`370`	`370`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta`
`45`	`45`	`// does not exist.`
`46`	`46`
`47`	`47`	`// Work around this by retrying a few times, up to about 5 minutes.`
`48`		`- err := retry.Config{Tries: 6, ShouldRetry: func(error) bool {`
	`48`	`+ err := retry.Config{Tries: 6, ShouldRetry: func(err error) bool {`
`49`	`49`	`if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {`
`50`	`50`	`return true`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult`
`106`	`106`	`snapshotTags.Report(ui)`
`107`	`107`
`108`	`108`	`// Retry creating tags for about 2.5 minutes`
`109`		`- err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {`
	`109`	`+ err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {`
`110`	`110`	`if awserrors.Matches(err, "InvalidAMIID.NotFound", "") \|\| awserrors.Matches(err, "InvalidSnapshot.NotFound", "") {`
`111`	`111`	`return true`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa`
`368`	`368`	`if s.IsRestricted {`
`369`	`369`	`ec2Tags.Report(ui)`
`370`	`370`	`// Retry creating tags for about 2.5 minutes`
`371`		`- err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {`
	`371`	`+ err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {`
`372`	`372`	`if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {`
`373`	`373`	`return true`
`374`	`374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta`
`48`	`48`	`// does not exist.`
`49`	`49`
`50`	`50`	`// Work around this by retrying a few times, up to about 5 minutes.`
`51`		`- err := retry.Config{Tries: 6, ShouldRetry: func(error) bool {`
	`51`	`+ err := retry.Config{Tries: 6, ShouldRetry: func(err error) bool {`
`52`	`52`	`if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {`
`53`	`53`	`return true`
`54`	`54`	`}`