From 2d6028eb9aec9eebb74d12b0cf65c671739a3922 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 8 Aug 2017 14:28:01 -0700 Subject: [PATCH] use named loops instead of doDelete flag --- builder/amazon/common/step_encrypted_ami.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/builder/amazon/common/step_encrypted_ami.go b/builder/amazon/common/step_encrypted_ami.go index a6e95b183..3e3b6023d 100644 --- a/builder/amazon/common/step_encrypted_ami.go +++ b/builder/amazon/common/step_encrypted_ami.go @@ -117,19 +117,17 @@ func (s *StepCreateEncryptedAMICopy) Run(state multistep.StateBag) multistep.Ste ui.Say("Deleting unencrypted snapshots") snapshots := state.Get("snapshots").(map[string][]string) +OuterLoop: for _, blockDevice := range unencImage.BlockDeviceMappings { if blockDevice.Ebs != nil && blockDevice.Ebs.SnapshotId != nil { // If this packer run didn't create it, then don't delete it - doDelete := true for _, origDevice := range s.AMIMappings { if origDevice.SnapshotId == *blockDevice.Ebs.SnapshotId { - doDelete = false + ui.Message(fmt.Sprintf("Keeping Snapshot ID: %s", *blockDevice.Ebs.SnapshotId)) + break OuterLoop } } - if doDelete == false { - ui.Message(fmt.Sprintf("Keeping Snapshot ID: %s", *blockDevice.Ebs.SnapshotId)) - continue - } + ui.Message(fmt.Sprintf("Deleting Snapshot ID: %s", *blockDevice.Ebs.SnapshotId)) deleteSnapOpts := &ec2.DeleteSnapshotInput{ SnapshotId: aws.String(*blockDevice.Ebs.SnapshotId),