awful 0.0.156 → 0.0.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2e4e1d43bfad8b21595bed66a0e0ace3fd6d60
-  data.tar.gz: 65b664e4c00ce9f994dd565036fda1bd8efdf604
+  metadata.gz: 99c05896c178d666894061616bd3be84723558a0
+  data.tar.gz: b93e53d0adbb16b05775c6d51fd2d9e6dbbc6687
 SHA512:
-  metadata.gz: 34d192afd958c3cba722be347cd605ce79ef74a7ee9358f364523beaf6c17ee30c410b7a46e1c0b6e15e12b19e3f3acea69724bd292b5fcfa868cd9ed0828a08
-  data.tar.gz: 6b508c4f4667af73f0113602839fd266e83ea106255fa7d7c62d88784095dd0a1d0378de2de5b4645c771f30b1498cfc3c01d6806003a071196f238c9cb6bb55
+  metadata.gz: 17a626a26ac67317a14dd5ba156bd9f67a2ffac41a2323cce9d9428b92bd0bad2f3d42f8cc6824e9ee537c41edd34305ca86a8df1c23b7a4d3fefe87ef379277
+  data.tar.gz: efa5ee2168f77efd3da46f30cf212412f6674696beafd12c1ad9484f65c10fdfeae547b0d517fb86bf8ff059435bd266f8ce9adca6709c8129f9647f9a8ed231

data/bin/eip

@@ -0,0 +1,7 @@
+#!/usr/bin/ruby
+#-*- mode: ruby; -*-
+
+require 'awful'
+require 'awful/eip'
+
+Awful::Eip.start(ARGV)

data/lib/awful/ecr.rb

@@ -21,9 +21,14 @@ module Awful
         end
       end
 
-      ## parse created date from manifest of Aws::ECR::Types::Image object
-      def parse_created(image)
-        JSON.parse(JSON.parse(image.image_manifest)['history'].first['v1Compatibility'])['created']
+      def describe_images(repository, tag_status = nil)
+        paginate(:image_details) do |next_token|
+          ecr.describe_images(
+            repository_name: repository,
+            filter: { tag_status: tag_status },
+            next_token: next_token,
+          )
+        end
       end
     end
 
@@ -87,24 +92,22 @@ module Awful
     end
 
     desc 'images REPO', 'list images for repo'
-    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
-    def images(repository, token: nil)
-      next_token = token
-      images = []
-      loop do
-        response = ecr.list_images(repository_name: repository, next_token: next_token)
-        images = images + response.image_ids
-        next_token = response.next_token
-        break unless next_token
-      end
-
-      images.output do |list|
+    method_option :long,     aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :tagged,   aliases: '-t', type: :boolean, default: false, desc: 'show only tagged images'
+    method_option :untagged, aliases: '-u', type: :boolean, default: false, desc: 'show only untagged images'
+    def images(repository)
+      tag_status = 'TAGGED'   if options[:tagged]
+      tag_status = 'UNTAGGED' if options[:untagged]
+
+      describe_images(repository, tag_status).output do |list|
         if options[:long]
           print_table list.map { |i|
-            [i.image_tag, i.image_digest]
+            tags = i.image_tags || []
+            size = "%.2f MiB" % (i.image_size_in_bytes/(1024*1024))
+            [tags.join(','), i.image_pushed_at, size, i.image_digest]
           }
         else
-          puts list.map(&:image_tag)
+          puts list.map(&:image_tags).flatten
         end
       end
     end
@@ -146,7 +149,7 @@ module Awful
       (imgs.empty? ? false : true).output(&method(:puts))
     end
 
-    desc 'reap REPO', 'reap old images for repo'
+    desc 'reap REPO DAYS', 'reap old images for repo'
     method_option :batch,   aliases: '-b', type: :numeric, default: 10,    desc: 'batch size to get and delete'
     method_option :dry_run, aliases: '-d', type: :boolean, default: false, desc: 'dry run, do not delete, implies verbose'
     method_option :verbose, aliases: '-v', type: :boolean, default: false, desc: 'print images to be deleted'
@@ -157,15 +160,13 @@ module Awful
 
       deleted = failures = 0
       loop do
-        ## get a batch of image ids
-        response = ecr.list_images(repository_name: repository, next_token: next_token, max_results: options[:batch])
+        response = ecr.describe_images(repository_name: repository, next_token: next_token, max_results: options[:batch])
 
-        ## get details for the batch of images and calculate age
-        old_images = ecr.batch_get_image(repository_name: repository, image_ids: response.image_ids).images.select do |image|
-          date = Time.parse(parse_created(image)).utc
+        old_images = response.image_details.select do |image|
+          date = image.image_pushed_at.utc
           age = ((now - date)/(24*60*60)).to_i
           if age > days.to_i
-            puts "#{date} #{age} #{image.image_id.image_tag}" if verbose
+            puts "#{date} #{age} #{image.image_digest} #{image.image_tags}" if verbose
             true
           else
             false
@@ -174,7 +175,10 @@ module Awful
 
         ## delete old images
         unless options[:dry_run] || old_images.empty?
-          r = ecr.batch_delete_image(repository_name: repository, image_ids: old_images.map(&:image_id))
+          r = ecr.batch_delete_image(
+            repository_name: repository,
+            image_ids: old_images.map { |i| {image_digest: i.image_digest} }
+          )
           deleted  += r.image_ids.count
           failures += r.failures.count
         end

data/lib/awful/eip.rb

@@ -0,0 +1,67 @@
+module Awful
+  module Short
+    def eip(*args)
+      Awful::Eip.new.invoke(*args)
+    end
+  end
+
+  class Eip < Cli
+    no_commands do
+
+      ## get an EIP by id or public ip
+      def find_eip(thing)
+        ec2.describe_addresses.addresses.find do |eip|
+          (thing == eip.public_ip) || (thing == eip.allocation_id) || (thing == eip.association_id)
+        end
+      end
+    end
+
+    desc 'ls', 'list elastic IPs'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'long listing'
+    def ls
+      ec2.describe_addresses.addresses.output do |eips|
+        if options[:long]
+          print_table eips.map { |i|
+            [i.public_ip, i.allocation_id, i.instance_id, i.private_ip_address, i.domain, i.association_id, i.network_interface_id, i.network_interface_owner_id]
+          }.sort
+        else
+          puts eips.map(&:public_ip).sort
+        end
+      end
+    end
+
+    desc 'allocate', 'acquire an elastic IP'
+    method_option :domain, aliases: '-d', type: :string, default: 'vpc', desc: 'domain: vpc or standard (ec2 classic)'
+    def allocate
+      ec2.allocate_address(domain: options[:domain]).output do |eip|
+        puts eip.public_ip
+      end
+    end
+
+    desc 'release ID', 'release elastic IP back to pool'
+    def release(id)
+      find_eip(id).tap do |eip|
+        unless eip.nil?
+          if eip.domain == 'vpc'
+            ec2.release_address(allocation_id: eip.allocation_id)
+          else
+            ec2.release_address(public_ip: eip.public_ip)
+          end
+        end
+      end
+    end
+
+    desc 'associate ID INSTANCE', 'associate EIP with an instance'
+    def associate(id, instance)
+      ec2.associate_address(
+        allocation_id: find_eip(id).allocation_id,
+        instance_id: instance
+      ).association_id.output(&method(:puts))
+    end
+
+    desc 'disassociate ID', 'disassociate EIP from current instance association'
+    def disassociate(id)
+      ec2.disassociate_address(association_id: find_eip(id).association_id)
+    end
+  end
+end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.156'
+  VERSION = '0.0.157'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.156
+  version: 0.0.157
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ executables:
 - ec2
 - ecr
 - ecs
+- eip
 - elasticache
 - elb
 - iam
@@ -141,6 +142,7 @@ files:
 - bin/ec2
 - bin/ecr
 - bin/ecs
+- bin/eip
 - bin/elasticache
 - bin/elb
 - bin/iam
@@ -181,6 +183,7 @@ files:
 - lib/awful/ec2.rb
 - lib/awful/ecr.rb
 - lib/awful/ecs.rb
+- lib/awful/eip.rb
 - lib/awful/elasticache.rb
 - lib/awful/elb.rb
 - lib/awful/iam.rb