aws_ami_cleanup 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f995865e05bc638aa49921b3a41e44490162333f63cf48498c90253c03c7998
-  data.tar.gz: 15f352aef72ad76110950ea2b0a2f6e0da48c22d6bd0e5ac3ae71f81d2d94eaf
+  metadata.gz: 25ac02ebfcda946944410be7a4044e5a01949152337baa037f3fa9ea9be8b9a2
+  data.tar.gz: 91e0c6ceb77364a9ba929b693b7f33a0ff2e742ce889eeb33cfb1bf29368b007
 SHA512:
-  metadata.gz: 5cbb4cdf40523ace6141d987c089f20a500119c47316e5f45c9ec802dac099caef79b7b4b05f5b07da1b24b824274fafb261ae8f4fe283bb43c40dde11b07bde
-  data.tar.gz: 36ca22c54797eef7984e64a36b190e83af58365d6bf277ebd7ebc0cf5dad1e0e118b8ea2ac1321f39833b295d710b15c4afdae4c916dcfdb6e415b7719a99f74
+  metadata.gz: 797cdde4f267868ae2287ae5fc46ac8c30dc711dee230dda7563ee498dc0d523eee165543808f7474c6ec00ee135f08dd9037dfc4a627eec6c5c605c815fd756
+  data.tar.gz: 4dc150e871dece040998b2e87ef6fe851e636869c4768578b7b629b226bd4e2aa01606ae2097bf12ffc209615495edcc650d2d0b4ebd1ffa9420786dfbae7559

data/README.md

@@ -17,4 +17,9 @@ cleanup_amis clean_amis --ami_name 'my-ami' --ami_owner 'self'
 
 Where `ami_owner` can be a combination of AWS account IDs, `self`, `amazon`, and `aws-marketplace`.
 
-Additionally you can provide the `number_of_amis_to_keep` argument to specify how many AMIs to keep (default is 3), `region` for the AWS region (default is `us-east-1`) and `dry_run` for running without deleting any resources in AWS.
+Additionally you can provide the following arguments:
+
+- `number_of_amis_to_keep` to specify how many AMIs to keep (default is 3).
+- `region` for the AWS region (default is `us-east-1`).
+- `dry_run` for running without deleting any resources in AWS.
+- `skip_image_under_use_verification` for skipping verification on whether the AMI is being used by any auto scaling group or reserved EC2 instance.

data/lib/aws_ami_cleanup/cleanup_amis.rb

@@ -7,15 +7,17 @@ module AwsAmiCleanup
   class CleanupAmis
     DEFAULT_NUMBER_OF_AMIS_TO_KEEP = 3
 
-    attr_accessor :region, :number_of_amis_to_keep
+    attr_accessor :region, :number_of_amis_to_keep, :skip_image_under_use_verification
 
-    def initialize(region, number_of_amis_to_keep)
+    def initialize(region, number_of_amis_to_keep, skip_image_under_use_verification)
       @region = region
 
       @number_of_amis_to_keep = number_of_amis_to_keep || DEFAULT_NUMBER_OF_AMIS_TO_KEEP
       if number_of_amis_to_keep <= 0
         raise 'Number of AMIs to keep must be higher than 0.'
       end
+
+      @skip_image_under_use_verification = skip_image_under_use_verification
     end
 
     def execute!(ami_name:, ami_owner:, dry_run:)
@@ -23,7 +25,13 @@ module AwsAmiCleanup
 
       potential_amis_to_remove = amis(ami_name, ami_owner)
       ami_ids = potential_amis_to_remove.collect(&:image_id)
-      ami_ids_to_remove = ami_ids - amis_in_use
+
+      if skip_image_under_use_verification
+        ami_ids_to_remove = ami_ids
+      else
+        ami_ids_to_remove = ami_ids - amis_in_use
+      end
+
       potential_amis_to_remove.keep_if {|a| ami_ids_to_remove.include?(a.image_id) }
 
       if potential_amis_to_remove.count > number_of_amis_to_keep
@@ -35,7 +43,13 @@ module AwsAmiCleanup
         amis_to_remove.each do |ami|
           ebs_mappings = ami.block_device_mappings
           puts "Deregistering #{ami.image_id}"
-          ami.deregister unless dry_run
+
+          begin
+            ec2.deregister_image(image_id: ami.image_id, dry_run: dry_run)
+          rescue Aws::EC2::Errors::DryRunOperation
+            # When running in dry mode, EC2 raises this exception if operation would have succeeded, we catch them so the full process can run
+          end
+
           delete_ami_snapshots(ebs_mappings, dry_run)
         end
 
@@ -110,10 +124,10 @@ module AwsAmiCleanup
 
         snapshot_id = ebs_mapping.ebs.snapshot_id
         puts "Deleting snapshot #{snapshot_id}"
-
-        unless dry_run
-          snapshot = Aws::EC2::Snapshot.new(snapshot_id)
-          snapshot.delete
+        begin
+          ec2.delete_snapshot(snapshot_id: snapshot_id, dry_run: dry_run)
+        rescue Aws::EC2::Errors::DryRunOperation
+          # When running in dry mode, EC2 raises this exception if operation would have succeeded, we catch them so the full process can run
         end
       end
     end

data/lib/aws_ami_cleanup/commands.rb

@@ -7,13 +7,18 @@ module AwsAmiCleanup
     option :ami_owner, required: true
     option :number_of_amis_to_keep, required: false
     option :region, required: false
-    option :dry_run, required: false
+    option :skip_verification, type: :boolean, required: false
+    option :dry_run, type: :boolean, required: false
     def clean_amis
-      cleanup_amis = AwsAmiCleanup::CleanupAmis.new(region, options[:number_of_amis_to_keep]&.to_i)
+      cleanup_amis = AwsAmiCleanup::CleanupAmis.new(
+                      region,
+                      options[:number_of_amis_to_keep]&.to_i,
+                      options[:skip_verification]
+                    )
 
       cleanup_amis.execute!(ami_name: options[:ami_name],
                             ami_owner: options[:ami_owner],
-                            dry_run: options[:dry_run]&.casecmp?('true'))
+                            dry_run: options[:dry_run])
     end
 
     desc "console", "interactive session"

data/lib/aws_ami_cleanup/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module AwsAmiCleanup
-  VERSION = "0.2"
+  VERSION = "0.3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_ami_cleanup
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Diego Marcet