awsutils 2.1.7 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2262e6b9cef6b2bef93be826382e6fa65adc757b
-  data.tar.gz: e1b9b6749c152bb10a1236058eb628fbcc37e371
+SHA256:
+  metadata.gz: f7be6a7b15199b892d2e54109ff3da6a684586b12abf22a9103764cdcee21c19
+  data.tar.gz: 0cc296c1b47c529ee5925f42e49d676cfe12c0527880b45bfe9edbb03d9c6a0b
 SHA512:
-  metadata.gz: ae21d554f550a4e8a6bb71b6a54898b5035317532308dccbcf3aea0fee0d0e67600617f3898746462a9343b552311b4c988993f1d52aaadd0d6278d5e726be21
-  data.tar.gz: 4999def64d2252d34bf876168a788450cf92483f376d9383c11310757378dc01d23da4c25cc8c657fddb09d4aacbbb65e24c44cc3e55c569ffc889f91bf12f04
+  metadata.gz: 972a9b9365e220317071483ccc34f8b740df251be2f14d4112beb5cee555ffaceded4a66f39391be86d724e498e73da7d737e96e755aa5d7ea901d9d76566239
+  data.tar.gz: 15b3ed991715a078fe8079a65c15c382374cd0bd2779750ffda433e60b84620f7bbb0911c48b472a3724fbd4302e7a9cc8cca7f543047f0d98deacac05db3686

data/lib/awsutils/ec2latestimage.rb

@@ -7,15 +7,40 @@ module AwsUtils
   class Ec2LatestImage
     def releases
       @releases ||= begin
-        resp = JSON.parse(
-          Net::HTTP.get(
-            URI("http://cloud-images.ubuntu.com/locator/ec2/releasesTable?_=#{(Time.now.to_f*1000).to_i}")
-          ).sub(/\],\n\]/, "]\n]")
-        )
-        parse_releases_array(resp['aaData']).select do |rel|
-          rel[:region] == 'us-east-1' &&
+        parsed_releases =
+          if opts[:ownedbyme]
+            fail 'AWS_OWNER_ID not defined' unless ENV['AWS_OWNER_ID']
+
+            require 'aws-sdk'
+
+            ubuntu_images =
+              connection.describe_images(owners: [ENV['AWS_OWNER_ID']]).images.select do |image|
+                image.name =~ %r{^ubuntu\/}
+              end
+
+            ubuntu_images.map do |image|
+              {
+                ami: image.image_id,
+                distro_version: image.name.split('/')[3].split('-')[2],
+                release: image.name.split('/')[3].split('-')[5..-1].join('-'),
+                type: image.name.split('/')[2] + ':' + image.root_device_type,
+                arch: image.architecture,
+                region: opts[:region] # overriding this because images API doesn't list a region
+              }
+            end
+          else
+            resp = JSON.parse(
+              Net::HTTP.get(
+                URI("http://cloud-images.ubuntu.com/locator/ec2/releasesTable?_=#{(Time.now.to_f*1000).to_i}")
+              ).sub(/\],\n\]/, "]\n]")
+            )
+            parse_releases_array(resp['aaData'])
+          end
+
+        parsed_releases.select do |rel|
+          rel[:region] == opts[:region] &&
           rel[:distro_version] == "#{opts[:release]}" &&
-          rel[:arch] == 'amd64'
+          %w(amd64 x86_64).include?(rel[:arch])
         end
       end
     end
@@ -28,18 +53,18 @@ module AwsUtils
 
     def print_releases
       # Print a header
-      printf("%-13s %-10s %-9s %-20s\n", 'ID', 'Version', 'Release', 'Type')
+      printf("%-13s %-10s %-20s %-9s\n", 'ID', 'Version', 'Type', 'Release')
 
-      puts('-' * 53)
+      puts('-' * 72)
 
       # Print the releases
       releases.each do |rel|
         printf(
-          "%-13s %-10s %-9s %-20s\n",
+          "%-13s %-10s %-20s %-9s\n",
           rel[:ami],
           rel[:distro_version],
-          rel[:release],
-          rel[:type]
+          rel[:type],
+          rel[:release]
         )
       end
     end
@@ -83,7 +108,11 @@ module AwsUtils
     end
 
     def opts
-      @opts ||= Trollop.options { opt :release, 'Ubuntu release', short: 'r', default: '14.04 LTS' }
+      @opts ||= Trollop.options do
+        opt :release, 'Ubuntu release', short: 'r', default: '16.04 LTS'
+        opt :ownedbyme, 'Images owned by $AWS_OWNER_ID', short: 'o', default: false
+        opt :region, 'Image region', short: 'R', default: 'us-east-1'
+      end
     end
   end
 end

data/lib/awsutils/version.rb

@@ -1,3 +1,3 @@
 module AwsUtils
-  VERSION = '2.1.7'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsutils
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.2.0
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A set of tools for interacting with AWS (summary)