cap-ec2 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 561fc6eba6d90d38c0505fd710820765574bd56a
-  data.tar.gz: 89421224859dc12c7877479343f6a0261b488b04
+  metadata.gz: a5de758bdde1c4ff1f1b7976e3e9c831b399ff31
+  data.tar.gz: 17a252437d8183443a230c7ff64a0e83bdda0823
 SHA512:
-  metadata.gz: 7f2863971ee1400fecc4d3a3784c674b177735ca14f778ef94da650e21461756b8f552d4f0ca5696e6065a9f70a52395891fe96be1728801bf2591142826089c
-  data.tar.gz: d19528a9920f318dd148f6500bf52bc5cb6e81b8820a8647cbe5bfe805fce4596fefc0638553ff7bc2b016c410590169f0a3b12274ff331fbfaca56ec981a5cd
+  metadata.gz: d11cf987ba64b1eb66ca0cec01f70fe1141bbdc60ffcb836ec5774644cc30e2e72b06d24eb22fe1085253579ce0417f3bace43e59a64a14d96a2f1173405285c
+  data.tar.gz: 7376b1916b7a6e1a7a912c9a5788b8d305d53b3a5d0a506cab550704c637043090378c6171131e7da21c6b8c1680e1eb0cf1e40dc3d5f6025d244637e542f0f2

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Cap-EC2 changelog
 
+## 1.1.1
+
+Require aws-sdk v2 instead of v1
+
+* Require aws-sdk v2 instead of v1 [@hajder](https://github.com/hajder)
+
+## 1.1.0
+
+Upgrade to AWS's v2 SDK
+
+* Upgrade to AWS's v2 SDK [@kylev](https://github.com/kylev)
+
 ## 1.0.0
 
 Cap-EC2 is pretty stable, and the rate of PRs has decreased, so I've
@@ -28,7 +40,7 @@ decided to bump the version to 1.0.0.
 
 ## 0.0.15
 
-* Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK` 
+* Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK`
   for their EC2 status checks. [@tomconroy](https://github.com/tomconroy)
 
 ## 0.0.14

data/README.md

@@ -50,30 +50,36 @@ set :ec2_stages_tag, 'Stages'
 
 set :ec2_access_key_id, nil
 set :ec2_secret_access_key, nil
-set :ec2_region, %w{}
+set :ec2_region, %w{} # REQUIRED
 set :ec2_contact_point, nil
 
 set :ec2_filter_by_status_ok?, nil
 ```
 
 #### Order of inheritance
+
 `cap-ec2` supports multiple methods of configuration. The order of inheritance is:
 YAML File > User Capistrano Config > Default Capistrano Config > ENV variables.
 
 #### Regions
-`:ec2_region` is an array of [AWS regions](http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region), if not present all regions will be checked for matching instances - this the default behavior and can be slow, if speed is an issue consider setting your required regions.
 
-If`:ec2_access_key_id` or `:ec2_secret_access_key` are not set in any configuration the environment variables
-`AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` will be checked.
-If running on EC2 the IAM instance profile credentials will be used if credentials are not set by any other method.
+`:ec2_region` is an array of
+[AWS regions](http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region)
+and is required. Only list regions which you wish to query for
+instances; extra values simply slow down queries.
 
+If `:ec2_access_key_id` or `:ec2_secret_access_key` are not set in any
+configuration the environment variables `AWS_ACCESS_KEY_ID`,
+`AWS_SECRET_ACCESS_KEY` and `AWS_REGION` will be checked and the
+default credential load order (including instance profiles
+credentials) will be honored.
 
 #### Misc settings
 
 * project_tag
 
-  Cap-EC2 will look for a tag with this name when searching for instances that belong to this project. 
-  Cap-EC2 will look for a value which matches the :application setting in your deploy.rb. 
+  Cap-EC2 will look for a tag with this name when searching for instances that belong to this project.
+  Cap-EC2 will look for a value which matches the :application setting in your deploy.rb.
   The tag name defaults to "Project" and must be set on your instances.
 
 * stages_tag

data/cap-ec2.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "aws-sdk-v1"
+  spec.add_dependency "aws-sdk", "~> 2.0"
   spec.add_dependency "capistrano", ">= 3.0"
   spec.add_dependency "terminal-table"
   spec.add_dependency "colorize"

data/lib/cap-ec2/capistrano.rb

@@ -1,5 +1,5 @@
 require 'capistrano/configuration'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'colorize'
 require 'terminal-table'
 require 'yaml'

data/lib/cap-ec2/ec2-handler.rb

@@ -1,3 +1,5 @@
+require 'aws-sdk'
+
 module CapEC2
   class EC2Handler
     include CapEC2::Utils
@@ -12,8 +14,7 @@ module CapEC2
     end
 
     def ec2_connect(region=nil)
-      AWS.start_memoizing
-      AWS::EC2.new(
+      Aws::EC2::Client.new(
         access_key_id: fetch(:ec2_access_key_id),
         secret_access_key: fetch(:ec2_secret_access_key),
         region: region
@@ -30,7 +31,7 @@ module CapEC2
       puts defined_roles.map {|r| get_servers_for_role(r)}
                    .flatten
                    .uniq {|i| i.instance_id}
-                   .map {|i| i.tags["Name"]}
+                   .map {|i| tag_value(i, 'Name')}
                    .join("\n")
     end
 
@@ -59,19 +60,25 @@ module CapEC2
     end
 
     def get_servers_for_role(role)
+      filters = [
+        {name: 'tag-key', values: [stages_tag, project_tag]},
+        {name: tag(project_tag), values: ["*#{application}*"]},
+        {name: 'instance-state-name', values: %w(running)}
+      ]
+
       servers = []
       @ec2.each do |_, ec2|
-        instances = ec2.instances
-          .filter(tag(project_tag), "*#{application}*")
-          .filter('instance-state-name', 'running')
-        servers << instances.select do |i|
-          instance_has_tag?(i, roles_tag, role) &&
-            instance_has_tag?(i, stages_tag, stage) &&
-            instance_has_tag?(i, project_tag, application) &&
-            (fetch(:ec2_filter_by_status_ok?) ? instance_status_ok?(i) : true)
+        ec2.describe_instances(filters: filters).reservations.each do |r|
+          servers += r.instances.select do |i|
+              instance_has_tag?(i, roles_tag, role) &&
+                instance_has_tag?(i, stages_tag, stage) &&
+                instance_has_tag?(i, project_tag, application) &&
+                (fetch(:ec2_filter_by_status_ok?) ? instance_status_ok?(i) : true)
+          end
         end
       end
-      servers.flatten.sort_by {|s| s.tags["Name"] || ''}
+
+      servers.sort_by { |s| tag_value(s, 'Name') || '' }
     end
 
     def get_server(instance_id)
@@ -83,16 +90,15 @@ module CapEC2
     private
 
     def instance_has_tag?(instance, key, value)
-      (instance.tags[key] || '').split(',').map(&:strip).include?(value.to_s)
+      (tag_value(instance, key) || '').split(',').map(&:strip).include?(value.to_s)
     end
 
     def instance_status_ok?(instance)
       @ec2.any? do |_, ec2|
-        response = ec2.client.describe_instance_status(
-          instance_ids: [instance.id],
+        ec2.describe_instance_status(
+          instance_ids: [instance.instance_id],
           filters: [{ name: 'instance-status.status', values: %w(ok) }]
-        )
-        response.data.has_key?(:instance_status_set) && response.data[:instance_status_set].any?
+        ).instance_statuses.length == 1
       end
     end
   end

data/lib/cap-ec2/status-table.rb

@@ -1,12 +1,12 @@
 module CapEC2
   class StatusTable
     include CapEC2::Utils
-    
+
     def initialize(instances)
       @instances = instances
       output
     end
-    
+
     def header_row
       [
         bold("Num"),
@@ -19,7 +19,7 @@ module CapEC2
         bold("Stages")
       ]
     end
-    
+
     def output
       table = Terminal::Table.new(
         :style => {
@@ -38,13 +38,13 @@ module CapEC2
     def instance_to_row(instance, index)
       [
         sprintf("%02d:", index),
-        green(instance.tags["Name"] || ''),
-        red(instance.id),
+        green(tag_value(instance, 'Name') || ''),
+        red(instance.instance_id),
         cyan(instance.instance_type),
         bold(blue(CapEC2::Utils.contact_point(instance))),
-        magenta(instance.availability_zone),
-        yellow(instance.tags[roles_tag]),
-        yellow(instance.tags[stages_tag])
+        magenta(instance.placement.availability_zone),
+        yellow(tag_value(instance, roles_tag)),
+        yellow(tag_value(instance, stages_tag))
       ]
     end
 
@@ -62,4 +62,3 @@ module CapEC2
 
   end
 end
-

data/lib/cap-ec2/utils.rb

@@ -20,6 +20,10 @@ module CapEC2
       fetch(:ec2_stages_tag)
     end
 
+    def tag_value(instance, key)
+      instance.tags.find({}) { |t| t[:key] == key.to_s }[:value]
+    end
+
     def self.contact_point_mapping
       {
         :public_dns => :public_dns_name,
@@ -57,8 +61,7 @@ module CapEC2
       unless regions_array.nil? || regions_array.empty?
         return regions_array
       else
-        @ec2 = ec2_connect
-        @ec2.regions.map(&:name)
+        fail "You must specify at least one EC2 region."
       end
     end
 

data/lib/cap-ec2/version.rb

@@ -1,3 +1,3 @@
 module CapEC2
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andy Sykes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2