awsam 0.0.6 → 0.1.0

data/awsam.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'right_aws', '3.1.0'
+  spec.add_dependency 'aws-sdk', '~> 2.3.22'
   spec.add_dependency 'trollop', '2.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/bin/ascp

@@ -41,15 +41,15 @@ keyfile = nil
       exit 1
     end
 
-    if inst[:aws_state] != "running"
-      puts "Instance #{instance_id} is not running, it's #{inst[:aws_state]}"
+    if inst.state.name != "running"
+      puts "Instance #{instance_id} is not running, it's #{inst.state.name}"
       exit 1
     end
 
     hostname = Awsam::Ec2::instance_hostname(inst)
     args[i] = args[i].gsub(instance_id, hostname)
 
-    key = acct.find_key(inst[:ssh_key_name])
+    key = acct.find_key(inst.key_name)
     keyfile = key.path if key
     break
   end

data/bin/assh

@@ -32,6 +32,11 @@ end
 user = "root"
 instance_id = ARGV[0]
 
+if ARGV.length < 1
+  puts "Usage: assh <host>"
+  exit 1
+end
+
 if instance_id.include?("@")
   (user, instance_id) = instance_id.split("@")
 elsif ENV['AWS_DEFAULT_USER'].to_s.length > 0
@@ -52,7 +57,7 @@ unless inst
   exit 1
 end
 
-if inst[:aws_state] != "running"
+if inst.state.name != "running"
   puts "Instance #{instance_id} is not running, it's #{inst[:aws_state]}"
   exit 1
 end
@@ -62,7 +67,7 @@ hostname = Awsam::Ec2::instance_hostname(inst)
 puts "Logging in as #{user} to #{hostname}"
 puts
 
-key = acct.find_key(inst[:ssh_key_name])
+key = acct.find_key(inst.key_name)
 
 if key
   exec "ssh -i #{key.path} -o IdentitiesOnly=yes #{user}@#{hostname}"

data/lib/awsam.rb

@@ -2,10 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__), 'awsam')
 
 require 'fileutils'
 
-$:.unshift File.join(File.dirname(__FILE__), '../vendor/right_aws/lib')
-$:.unshift File.join(File.dirname(__FILE__), '../vendor/right_http_connection/lib')
-
-require 'right_aws'
+require 'aws-sdk'
 
 require 'accounts'
 require 'ec2'

data/lib/awsam/ec2.rb

@@ -4,19 +4,14 @@ module Awsam
     LOOKUP_TAGS = ["Name", "aws:autoscaling:groupName", "AlsoKnownAs"].freeze
 
     def self.instance_hostname(inst)
-      hostname = inst[:dns_name]
-      # Are we in a VPC?
-      if inst[:vpc_id]
-        hostname = inst[:private_ip_address]
-      end
-      hostname
+      # Always use private IP address
+      inst.private_ip_address
     end
 
     def self.find_instance(acct, instance_id)
-      logger = Logger.new(File.open("/dev/null", "w"))
-      ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key,
-                              :logger => logger,
-                              :endpoint_url => acct.ec2_url)
+      ec2 = Aws::EC2::Client.new(:access_key_id => acct.access_key,
+                                 :secret_access_key => acct.secret_key,
+                                 :region => acct.aws_region)
 
       unless ec2
         puts "Unable to connect to EC2"
@@ -36,9 +31,10 @@ module Awsam
 
     def self.find_by_instance_id(ec2, instance_id)
       begin
-        ec2.describe_instances(instance_id).first
-      rescue RightAws::AwsError
-        puts "instance_id does not exist"
+        resp = ec2.describe_instances(:instance_ids => [instance_id])
+        resp.reservations.length > 0 ? resp.reservations[0].instances.first : nil
+      rescue => e
+        puts "error describing instance: #{instance_id}: #{e}"
         exit 1
       end
     end
@@ -46,11 +42,16 @@ module Awsam
     def self.find_by_tag(ec2, instance_id)
       results = []
 
-      ec2.describe_tags(:filters => {
-                          "resource-type" => "instance"
-                        }).each do |tag|
-        if LOOKUP_TAGS.include?(tag[:key]) &&
-            tag[:value].downcase.include?(instance_id.downcase)
+      params = {
+        :filters => [{
+                       :name => "resource-type",
+                       :values => ["instance"]
+                     }]
+      }
+      resp = ec2.describe_tags(params)
+      resp.tags.each do |tag|
+        if LOOKUP_TAGS.include?(tag.key) &&
+            tag.value.downcase.include?(instance_id.downcase)
           results << tag
         end
       end
@@ -60,18 +61,25 @@ module Awsam
         exit 1
       end
 
-      results.uniq! { |a| a[:resource_id] }
-      results.sort! { |a,b| a[:value] <=> b[:value] }
+      results.uniq! { |a| a.resource_id }
+      results.sort! { |a,b| a.value <=> b.value }
 
       rmap = {}
-      ec2.describe_instances(results.map{|a| a[:resource_id]},
-                             :filters => {
-                               "instance-state-name" => "running"
-                             }).each do |inst|
-        rmap[inst[:aws_instance_id]] = inst
+      params = {
+        :instance_ids => results.map{|a| a.resource_id},
+        :filters => [{
+                       :name => "instance-state-name",
+                       :values => ["running"]
+                     }]
+      }
+      resp = ec2.describe_instances(params)
+      resp.reservations.each do |resv|
+        resv.instances.each do |inst|
+          rmap[inst.instance_id] = inst
+        end
       end
 
-      results.reject! { |a| rmap[a[:resource_id]].nil? }
+      results.reject! { |a| rmap[a.resource_id].nil? }
 
       if results.length == 0
         puts "No running instances by that tag name are available"
@@ -88,30 +96,31 @@ module Awsam
         instmax = 0
         ipmax = 0
         results.each_with_index do |elem, i|
-          inst = rmap[elem[:resource_id]]
-          if elem[:value].length > namemax
-            namemax = elem[:value].length
+          inst = rmap[elem.resource_id]
+          if elem.value.length > namemax
+            namemax = elem.value.length
           end
-          if inst[:aws_instance_id].length > instmax
-            instmax = inst[:aws_instance_id].length
+          if inst.instance_id.length > instmax
+            instmax = inst.instance_id.length
           end
-          if inst[:private_ip_address].length > ipmax
-            ipmax =inst[:private_ip_address].length
+          if inst.private_ip_address.length > ipmax
+            ipmax = inst.private_ip_address.length
           end
         end
 
         countmax = results.size.to_s.length
         results.each_with_index do |elem, i|
-          inst = rmap[elem[:resource_id]]
+          inst = rmap[elem.resource_id]
 
-          puts "%*d) %-*s (%*s %*s %11s %s %s)" %
+          launchtime = inst.launch_time
+          puts "%*d) %-*s (%*s %-*s %-11s %s %s)" %
             [countmax, i + 1,
-             namemax, elem[:value],
-             instmax, inst[:aws_instance_id],
-             ipmax, inst[:private_ip_address],
-             inst[:aws_instance_type],
-             inst[:aws_availability_zone],
-             inst[:aws_launch_time]]
+             namemax, elem.value,
+             instmax, inst.instance_id,
+             ipmax, inst.private_ip_address,
+             inst.instance_type,
+             inst.placement.availability_zone,
+             launchtime.strftime("%Y-%m-%d")]
         end
         puts "%*s) Quit" % [countmax, "q"]
         puts
@@ -126,7 +135,7 @@ module Awsam
         node = results[sel - 1]
       end
 
-      return rmap[node[:resource_id]]
+      return rmap[node.resource_id]
     end
   end
 end

data/lib/awsam/version.rb

@@ -1,3 +1,3 @@
 module Awsam
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsam
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: right_aws
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.3.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.3.22
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1945513254015237322
+      hash: -1707018493688553301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1945513254015237322
+      hash: -1707018493688553301
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2