aws-ec2 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b09df35ebd69e9cb3cf1fedda041365f7b64caf4622836445dac9a54a8a1c5
-  data.tar.gz: 852c3e979764d3cdfe700d0884ba6a329a883510c34d417840cb248a716a826b
+  metadata.gz: b609d157c4ac6348d6fa370a17549c95987d2637060a34f84da9ad3dd303df80
+  data.tar.gz: d6c436bca85ddac006a853f6a6fe3bdc6cb848dc524b2e913912069047755e89
 SHA512:
-  metadata.gz: a71147807f1f6167df3c14ca3dab108f1e56037d42a352faef842a0e337a2ed6749e912539ab9d6d5ee4e07b22c55642091bd6231764c50702f49cfc4f95422b
-  data.tar.gz: 22e6360dbe5eb4cc6948cd23de0e3a7d7b951ba1e67e5feb50c5f757e358da756db9c4a40c5268b7ac6a4fd2e775c54e5df6e884f9b51257f74e91d72109aca7
+  metadata.gz: 410535c2bda5df7ab1d97bcc015158be003fa41cf41dda9c2ff5c97aa78f493a4c7eeb38080eaf3c93b14bb64344708adff7422eda516c6f987da38ff0842434
+  data.tar.gz: 44fc0c559ad6565742c66c0022097c93509bf6aad785b912d506cf75bf6d0bf728fe423555678c33cc7135cef3613369e7a828cc160baf0a86d69f8da8ac084d

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.3.0]
+- Merge pull request #7 from tongueroo/clean: aws-ec2 clean ami command
+
 ## [1.2.2]
 - add render_me_pretty as gem instead of submodule
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aws-ec2 (1.2.1)
+    aws-ec2 (1.3.0)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3

data/lib/aws-ec2.rb

@@ -13,6 +13,7 @@ module AwsEc2
   autoload :Create, "aws_ec2/create"
   autoload :Ami, "aws_ec2/ami"
   autoload :Wait, "aws_ec2/wait"
+  autoload :Clean, "aws_ec2/clean"
   autoload :Template, "aws_ec2/template"
   autoload :Script, "aws_ec2/script"
   autoload :Config, "aws_ec2/config"

data/lib/aws_ec2/clean.rb

@@ -0,0 +1,12 @@
+module AwsEc2
+  autoload :Cleaner, 'aws_ec2/cleaner'
+
+  class Clean < Command
+    desc "ami", "Clean until AMI available."
+    long_desc Help.text("clean:ami")
+    option :keep, type: :numeric, default: 2, desc: "Number of images to keep"
+    def ami(query)
+      Cleaner::Ami.new(options.merge(query: query)).clean
+    end
+  end
+end

data/lib/aws_ec2/cleaner.rb

@@ -0,0 +1,5 @@
+module AwsEc2
+  module Cleaner
+    autoload :Ami, 'aws_ec2/cleaner/ami'
+  end
+end

data/lib/aws_ec2/cleaner/ami.rb

@@ -0,0 +1,40 @@
+module AwsEc2::Cleaner
+  class Ami < AwsEc2::Base
+    include AwsEc2::AwsService
+
+    def clean
+      query = @options[:query] + "*" # use query as base of name for search
+      keep = @options[:keep] || 2
+      puts "Cleaning out old AMIs with base name: #{@options[:query]}"
+      return if ENV['TEST']
+
+      images = search_ami(query)
+      images.sort_by! { |i| i.name }.reverse
+      delete_list = images[keep..-1] || []
+      puts "Deleting #{delete_list.size} images."
+      delete_list.each do |i|
+        puts "Deleting image: #{i.image_id} #{i.name}"
+        delete(i.image_id)
+      end
+    end
+
+  private
+    def delete(image_id)
+      ec2.deregister_image(image_id: image_id)
+    rescue Aws::EC2::Errors::InvalidAMIIDUnavailable
+      # happens when image was just deleted but its still
+      # showing up as available when calling describe_images
+      puts "WARN: #{e.message}"
+    end
+
+    def search_ami(query, owners=["self"])
+      ec2.describe_images(
+        owners: owners,
+        filters: [
+          {name: "name", values: [query]},
+          {name: "state", values: ["available"]}
+        ]
+      ).images
+    end
+  end
+end

data/lib/aws_ec2/cli.rb

@@ -3,6 +3,10 @@ module AwsEc2
     class_option :noop, type: :boolean
     class_option :profile, desc: "profile name to use"
 
+    desc "clean SUBCOMMAND", "clean subcommands"
+    long_desc Help.text(:clean)
+    subcommand "clean", Clean
+
     desc "wait SUBCOMMAND", "wait subcommands"
     long_desc Help.text(:wait)
     subcommand "wait", Wait

data/lib/aws_ec2/help/clean/ami.md

@@ -0,0 +1,21 @@
+Examples:
+
+    $ aws-ec2 clean ami base-amazonlinux2
+    $ aws-ec2 clean ami base-ubuntu --keep 5
+
+Deletes old AMIs using the provided name as the base portion of the AMI name to search for.
+
+Let's say you have these images:
+
+    base-ubuntu_2018-03-25-04-20
+    base-ubuntu_2018-03-25-03-39
+    base-ubuntu_2018-03-25-02-57
+    base-ubuntu_2018-03-25-02-47
+    base-ubuntu_2018-03-25-02-43
+    base-ubuntu_2018-03-23-00-15
+
+Running:
+
+    $ aws-ec2 clean ami base-ubuntu
+
+Would delete all images and keep the 2 most recent AMIs.  The default `--keep` value is 2.

data/lib/aws_ec2/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/lib/aws_ec2/wait.rb

@@ -2,7 +2,6 @@ module AwsEc2
   autoload :Waiter, 'aws_ec2/waiter'
 
   class Wait < Command
-
     desc "ami", "Wait until AMI available."
     long_desc Help.text("wait:ami")
     option :timeout, type: :numeric, default: 1800, desc: "Timeout in seconds."

data/spec/lib/cli_spec.rb

@@ -19,6 +19,11 @@ describe AwsEc2::CLI do
       expect(out).to include("Waiting for")
     end
 
+    it "clean ami" do
+      out = execute("exe/aws-ec2 clean ami imagebasename")
+      expect(out).to include("Cleaning out old AMIs")
+    end
+
     commands = {
       "am" => "ami",
       "compile" => "--profile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -253,6 +253,9 @@ files:
 - lib/aws_ec2/ami.rb
 - lib/aws_ec2/aws_service.rb
 - lib/aws_ec2/base.rb
+- lib/aws_ec2/clean.rb
+- lib/aws_ec2/cleaner.rb
+- lib/aws_ec2/cleaner/ami.rb
 - lib/aws_ec2/cli.rb
 - lib/aws_ec2/command.rb
 - lib/aws_ec2/completer.rb
@@ -266,6 +269,7 @@ files:
 - lib/aws_ec2/dotenv.rb
 - lib/aws_ec2/help.rb
 - lib/aws_ec2/help/ami.md
+- lib/aws_ec2/help/clean/ami.md
 - lib/aws_ec2/help/compile.md
 - lib/aws_ec2/help/completion.md
 - lib/aws_ec2/help/completion_script.md