Merge pull request #4931 from hashicorp/fix4817

only delete snapshots which exist
9 years ago · c436d9aea4
parent 1cf4754d80 77b4d47409
commit c436d9aea4
1 changed files with 1 additions and 1 deletions
--- a/builder/amazon/common/step_deregister_ami.go
+++ b/builder/amazon/common/step_deregister_ami.go
@ -51,7 +51,7 @@ func (s *StepDeregisterAMI) Run(state multistep.StateBag) multistep.StepAction {
 			// Delete snapshot(s) by image
 			if s.ForceDeleteSnapshot {
 				for _, b := range i.BlockDeviceMappings {
-					if b.Ebs != nil {
+					if b.Ebs != nil && aws.StringValue(b.Ebs.SnapshotId) != "" {
 						_, err := ec2conn.DeleteSnapshot(&ec2.DeleteSnapshotInput{
 							SnapshotId: b.Ebs.SnapshotId,
 						})