From f5c3c25d2b8ae4b315a4665aedf4baa26db6155f Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Wed, 30 Nov 2016 13:10:22 -0800 Subject: [PATCH] Revert "Adds `force_delete_snapshot` flag" --- builder/amazon/chroot/builder.go | 5 +-- builder/amazon/common/ami_config.go | 1 - builder/amazon/common/step_deregister_ami.go | 28 ++----------- builder/amazon/ebs/builder.go | 5 +-- builder/amazon/ebs/builder_acc_test.go | 39 +------------------ builder/amazon/instance/builder.go | 5 +-- .../docs/builders/amazon-chroot.html.md | 3 -- .../source/docs/builders/amazon-ebs.html.md | 3 -- .../docs/builders/amazon-instance.html.md | 3 -- 9 files changed, 12 insertions(+), 80 deletions(-) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 8239584a3..c9f56289a 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -244,9 +244,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe &StepEarlyCleanup{}, &StepSnapshot{}, &awscommon.StepDeregisterAMI{ - ForceDeregister: b.config.AMIForceDeregister, - ForceDeleteSnapshot: b.config.AMIForceDeleteSnapshot, - AMIName: b.config.AMIName, + ForceDeregister: b.config.AMIForceDeregister, + AMIName: b.config.AMIName, }, &StepRegisterAMI{ RootVolumeSize: b.config.RootVolumeSize, diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index c59653863..28eafb7fd 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -19,7 +19,6 @@ type AMIConfig struct { AMITags map[string]string `mapstructure:"tags"` AMIEnhancedNetworking bool `mapstructure:"enhanced_networking"` AMIForceDeregister bool `mapstructure:"force_deregister"` - AMIForceDeleteSnapshot bool `mapstructure:"force_delete_snapshot"` AMIEncryptBootVolume bool `mapstructure:"encrypt_boot"` SnapshotTags map[string]string `mapstructure:"snapshot_tags"` } diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go index 97f4257ff..f92de2797 100644 --- a/builder/amazon/common/step_deregister_ami.go +++ b/builder/amazon/common/step_deregister_ami.go @@ -10,16 +10,15 @@ import ( ) type StepDeregisterAMI struct { - ForceDeregister bool - ForceDeleteSnapshot bool - AMIName string + ForceDeregister bool + AMIName string } func (s *StepDeregisterAMI) Run(state multistep.StateBag) multistep.StepAction { ec2conn := state.Get("ec2").(*ec2.EC2) ui := state.Get("ui").(packer.Ui) - // Check for force deregister + // check for force deregister if s.ForceDeregister { resp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{ Filters: []*ec2.Filter{{ @@ -34,7 +33,7 @@ func (s *StepDeregisterAMI) Run(state multistep.StateBag) multistep.StepAction { return multistep.ActionHalt } - // Deregister image(s) by name + // deregister image(s) by that name for _, i := range resp.Images { _, err := ec2conn.DeregisterImage(&ec2.DeregisterImageInput{ ImageId: i.ImageId, @@ -47,25 +46,6 @@ func (s *StepDeregisterAMI) Run(state multistep.StateBag) multistep.StepAction { return multistep.ActionHalt } ui.Say(fmt.Sprintf("Deregistered AMI %s, id: %s", s.AMIName, *i.ImageId)) - - // Delete snapshot(s) by image - if s.ForceDeleteSnapshot { - for _, b := range i.BlockDeviceMappings { - if b.Ebs != nil { - _, err := ec2conn.DeleteSnapshot(&ec2.DeleteSnapshotInput{ - SnapshotId: b.Ebs.SnapshotId, - }) - - if err != nil { - err := fmt.Errorf("Error deleting existing snapshot: %s", err) - state.Put("error", err) - ui.Error(err.Error()) - return multistep.ActionHalt - } - ui.Say(fmt.Sprintf("Deleted snapshot: %s", *b.Ebs.SnapshotId)) - } - } - } } } diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 8f28ba17a..197046152 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -166,9 +166,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe EnableEnhancedNetworking: b.config.AMIEnhancedNetworking, }, &awscommon.StepDeregisterAMI{ - ForceDeregister: b.config.AMIForceDeregister, - ForceDeleteSnapshot: b.config.AMIForceDeleteSnapshot, - AMIName: b.config.AMIName, + ForceDeregister: b.config.AMIForceDeregister, + AMIName: b.config.AMIName, }, &stepCreateAMI{}, &stepCreateEncryptedAMICopy{}, diff --git a/builder/amazon/ebs/builder_acc_test.go b/builder/amazon/ebs/builder_acc_test.go index c4fe64e5d..e6ac29c3c 100644 --- a/builder/amazon/ebs/builder_acc_test.go +++ b/builder/amazon/ebs/builder_acc_test.go @@ -46,22 +46,6 @@ func TestBuilderAcc_forceDeregister(t *testing.T) { }) } -func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) { - // Build the same AMI name twice, with force_delete_snapshot on the second run - builderT.Test(t, builderT.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Builder: &Builder{}, - Template: buildForceDeleteSnapshotConfig("false", "dereg"), - SkipArtifactTeardown: true, - }) - - builderT.Test(t, builderT.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Builder: &Builder{}, - Template: buildForceDeleteSnapshotConfig("true", "dereg"), - }) -} - func TestBuilderAcc_amiSharing(t *testing.T) { builderT.Test(t, builderT.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -270,21 +254,6 @@ const testBuilderAccForceDeregister = ` } ` -const testBuilderAccForceDeleteSnapshot = ` -{ - "builders": [{ - "type": "test", - "region": "us-east-1", - "instance_type": "m3.medium", - "source_ami": "ami-76b2a71e", - "ssh_username": "ubuntu", - "force_deregister": "%s", - "force_delete_snapshot": "%s", - "ami_name": "packer-test-%s" - }] -} -` - // share with catsby const testBuilderAccSharing = ` { @@ -315,10 +284,6 @@ const testBuilderAccEncrypted = ` } ` -func buildForceDeregisterConfig(val, name string) string { - return fmt.Sprintf(testBuilderAccForceDeregister, val, name) -} - -func buildForceDeleteSnapshotConfig(val, name string) string { - return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name) +func buildForceDeregisterConfig(name, flag string) string { + return fmt.Sprintf(testBuilderAccForceDeregister, name, flag) } diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 6d67d6a5f..e428a43eb 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -248,9 +248,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe Debug: b.config.PackerDebug, }, &awscommon.StepDeregisterAMI{ - ForceDeregister: b.config.AMIForceDeregister, - ForceDeleteSnapshot: b.config.AMIForceDeleteSnapshot, - AMIName: b.config.AMIName, + ForceDeregister: b.config.AMIForceDeregister, + AMIName: b.config.AMIName, }, &StepRegisterAMI{}, &awscommon.StepAMIRegionCopy{ diff --git a/website/source/docs/builders/amazon-chroot.html.md b/website/source/docs/builders/amazon-chroot.html.md index 690dd8220..cbaa66f91 100644 --- a/website/source/docs/builders/amazon-chroot.html.md +++ b/website/source/docs/builders/amazon-chroot.html.md @@ -124,9 +124,6 @@ each category, the available configuration keys are alphabetized. - `force_deregister` (boolean) - Force Packer to first deregister an existing AMI if one with the same name already exists. Default `false`. -- `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with - AMIs, which have been deregistered by `force_deregister`. Default `false`. - - `from_scratch` (boolean) - Build a new volume instead of starting from an existing AMI root volume snapshot. Default `false`. If true, `source_ami` is no longer used and the following options become required: diff --git a/website/source/docs/builders/amazon-ebs.html.md b/website/source/docs/builders/amazon-ebs.html.md index 92e366e0e..e21c33589 100644 --- a/website/source/docs/builders/amazon-ebs.html.md +++ b/website/source/docs/builders/amazon-ebs.html.md @@ -155,9 +155,6 @@ builder. - `force_deregister` (boolean) - Force Packer to first deregister an existing AMI if one with the same name already exists. Default `false`. -- `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with - AMIs, which have been deregistered by `force_deregister`. Default `false`. - - `encrypt_boot` (boolean) - Instruct packer to automatically create a copy of the AMI with an encrypted boot volume (discarding the initial unencrypted AMI in the process). Default `false`. diff --git a/website/source/docs/builders/amazon-instance.html.md b/website/source/docs/builders/amazon-instance.html.md index b050cad81..1c2cf341f 100644 --- a/website/source/docs/builders/amazon-instance.html.md +++ b/website/source/docs/builders/amazon-instance.html.md @@ -179,9 +179,6 @@ builder. - `force_deregister` (boolean) - Force Packer to first deregister an existing AMI if one with the same name already exists. Default `false`. -- `force_delete_snapshot` (boolean) - Force Packer to delete snapshots associated with - AMIs, which have been deregistered by `force_deregister`. Default `false`. - - `iam_instance_profile` (string) - The name of an [IAM instance profile](https://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html) to launch the EC2 instance with.