awsclean 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3cecacbeb7d9e801bc4b3571f6958bdbc9110f7
-  data.tar.gz: 3c0c1d0c23b1dd948e6660803eddc0f7d50d32ce
+SHA256:
+  metadata.gz: 85e8e88ab01e03117ce712c5c67f0ad5abd3f9f1b34af56532ec41e2fb96f906
+  data.tar.gz: e0799e7ba427ef13dbab6353eee09ba2908acd3cdf6de9a923692969e6d1e26a
 SHA512:
-  metadata.gz: e7708fc702c34508450fa3d88b90de7e75e1009d951354f14b40ecf747de5e5f9ebdc95beacd20bdb4a8d42aed427169a4ad566c68ec5bf4ff42b25ccfc7e74b
-  data.tar.gz: 02ca4a17b82529c5677f5c4f3facb732400c661fa78d4e76aceae890753865cb95836eb3c5e69e8c4a0bd4fcd739fa56fb059e742d462a486047884b8694508b
+  metadata.gz: f88083fa73bf4e057983a520a57c1e314813bf7d7e990389ca3f94fb769bd79eb327ce5ec8311853975ec2206d65e04e3a5c2d5e4d1b7b49057c95f12a423c33
+  data.tar.gz: 898f34a86760599b8ce5fca81c1bac04181619527cbd2307823ce90a503e4ed10c4efba24b3170fd8b8f553f0923edd5cdca9072e5ee4382d80e4b687005e9e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    awsclean (1.0)
+    awsclean (1.1)
       aws-sdk (~> 2.7.4)
       bundler (~> 1.14)
       pry
@@ -70,4 +70,4 @@ RUBY VERSION
    ruby 2.3.3p222
 
 BUNDLED WITH
-   1.15.1
+   1.17.1

data/README.md

@@ -34,7 +34,7 @@ Locates and deletes stale docker images stored in Amazon ECR.
 An ECR image is considered stale when:
 
 1. It was created over `--e` days ago (default: 60).
-2. It's not being used by any ECS active task definition.
+2. It was untagged.
 
 #### Listing images eligible for cleanup:
 
@@ -45,7 +45,7 @@ $ awsclean clean_ecr_images
 ```
 [clean_ecr_images] Checking region: us-east-2
 REGION          IN USE?     REPOSITORY URI                                            TAGS            IMAGE ID                CREATED                                   SIZE        ELEGIBLE FOR CLEANUP?
-us-east-2       true        3333344444.dkr.ecr.us-east-2.amazonaws.com/foobar         baz             sha256:464ea4713d51     2017-04-05T21:00:45+00:00 (100 days ago)  184.0 MB    false
+us-east-2       false       3333344444.dkr.ecr.us-east-2.amazonaws.com/foobar         (!TAG)          sha256:464ea4713d51     2017-04-05T21:00:45+00:00 (100 days ago)  184.0 MB    true
 us-east-2       true        3333344444.dkr.ecr.us-east-2.amazonaws.com/foobar         latest          sha256:464ea4713d51     2017-04-05T21:00:45+00:00 (100 days ago)  184.0 MB    false
 us-east-2       false       3333344444.dkr.ecr.us-east-2.amazonaws.com/foobar_v2      (!TAG)          sha256:f47d0c6acbe9     2017-06-22T22:55:44+00:00 (21 days ago)   136.0 MB    false
 us-east-2       false       3333344444.dkr.ecr.us-east-2.amazonaws.com/foobar_v2      latest          sha256:58e584fd7654     2017-06-23T16:13:22+00:00 (21 days ago)   15.0 MB     false
@@ -71,6 +71,7 @@ The following flags are available to use in both commands:
 * `--c`: delete images marked as eligible for cleanup. (default: false)
 * `--e`: images older than `--e` days are considered old. (default: 60)
 * `--r`: select which AWS regions to perform on. (default: all)
+* `--a`: specify AMIs will not be deleted. (default: [])
 
 The `--r` flag accepts a space separated list of region names.
 
@@ -78,6 +79,12 @@ The `--r` flag accepts a space separated list of region names.
 $ awsclean clean_amis -r us-east-2 ca-central-1
 ```
 
+The `--a` flag accepts a space separated list of AMI IDs.
+
+```
+$ awsclean clean_amis -a ami-xxxxxx ami-yyyyyy
+```
+
 ## Development
 After checking out the repo, run `bin/setup` to install dependencies.
 

data/lib/awsclean/ami_clean.rb

@@ -6,8 +6,8 @@ module Awsclean
 
     SERVICE_IDENTIFIER = "EC2"
 
-    IMAGE_LIST_HEADER = ['REGION', 'IN USE?', 'AMI ID', 'CREATED', 'ELEGIBLE FOR CLEANUP?']
-    IMAGE_LIST_FORMAT = '%-16s%-12s%-16s%-42s%-24s'
+    IMAGE_LIST_HEADER = ['REGION', 'IN USE?', 'NAME', 'AMI ID', 'CREATED', 'ELEGIBLE FOR CLEANUP?']
+    IMAGE_LIST_FORMAT = '%-10s%-10s%-24s%-24s%-42s%-6s'
 
     def self.run options
       regions = filter_regions(options[:r])
@@ -31,6 +31,14 @@ module Awsclean
         instances   = res.reservations.flat_map(&:instances)
         amis_in_use = instances.map(&:image_id).uniq
 
+        # Allow user to define a list of locked AMIs
+        if !options[:a].empty?
+          options[:a].each do |ami|
+            puts "Locked AMI: #{ami}"
+            amis_in_use << ami
+          end
+        end
+
         # Get a list of all of AMI's owned by the account.
         #
         res = ec2.describe_images(owners: %w(self))
@@ -72,7 +80,7 @@ module Awsclean
       created << " (#{image.days_since_creation} days ago)"
 
       sprintf(IMAGE_LIST_FORMAT,
-              region, image.in_use, image.image_id,
+              region, image.in_use, image.name, image.image_id,
               created, image.elegible_for_cleanup)
     end
   end

data/lib/awsclean/commands.rb

@@ -10,12 +10,14 @@ module Awsclean
 -- -e [days] the number of days considered "unused", default is 60
 -- -l and -c can be used with -e but -l and -c cannot be used together. Default mode is -l.
 -- -r [regions] to specify regions to check, in the form of "us-west-1,us-east-1,..." separated by comma
+-- -a [amis] to specify amis to skip for deletion, in the form of "ami-xxxxxx,ami-yyyyyy,..." separated by comma
 =end
 
     option :l, type: :boolean, default: true #list
     option :c, type: :boolean
     option :e, type: :numeric, default: 60
     option :r, type: :array, default: %w(all)
+    option :a, type: :array, default: %w()
 
     # TODO: dynamically generate these based on listing out subclasses of AwsCommand?
 

data/lib/awsclean/ecr_clean.rb

@@ -20,19 +20,6 @@ module Awsclean
         exit 1
       end
 
-      # List images used in active task definitions from all regions.
-      # This is a global operation so we run it once.
-      #
-      images_in_active_task_defs = supported_regions.flat_map do |region|
-        ecs = Aws::ECS::Client.new(region: region)
-        res = ecs.list_task_definitions(status: 'ACTIVE', max_results: 100)
-
-        res.task_definition_arns.flat_map do |td|
-          ecs.describe_task_definition(task_definition: td)
-            .task_definition.container_definitions.map(&:image)
-        end
-      end
-
       regions.each do |region|
         puts "[clean_ecr_images] Checking region: #{region}"
 
@@ -48,7 +35,7 @@ module Awsclean
 
         images.each do |image|
           image.region = region
-          image.in_use = !(images_in_active_task_defs & image.image_uris).empty?
+          image.in_use = !image.image_uris.empty?
           image.elegible_for_cleanup = (image.stale?(options[:e]) && !image.in_use)
         end
 

data/lib/awsclean/version.rb

@@ -2,6 +2,6 @@
 #
 
 module Awsclean
-  VERSION = "1.0"
+  VERSION = "1.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsclean
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: CLI to clean up AWS AMIs and ECR images