capistrano-ec2 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d49bd03dc7164feac8b3857fc6aefd82c845aa0
-  data.tar.gz: 96ae1cca4d6c6330dc9e5469f7e204d8ccd07e83
+  metadata.gz: a565dadc8f1f7ffba685488bf8a804a4633a2a18
+  data.tar.gz: be80c99f0570af72dd553571b079fdd08fe3fa72
 SHA512:
-  metadata.gz: '0292e3718d4f1afd8e2c3e57fa59bd66f4d55f542f5d215d43f33d9d3bdfc37ceffe33bf75485426fc9846d3835156577205d780162d8d8618f1049620f9b2bd'
-  data.tar.gz: c5e233c40c7324e753e02dad5d862231f1006dcca57c1c7b0734ff1ac6b561333fd8c93021326a44b17dc6649a01b764582d68096dc61579fc70ef7ba5048cc7
+  metadata.gz: ff5558324541bf6832b335cb1f90fe189943bc91bd6b963f646ce6afad1e80e0be9744868d30e34351de31ac0b50739c07f0aea8258a6442739fc6536fe3b99f
+  data.tar.gz: 6484ea5bc858ff7d4adee69a0bef087c851f2bba5412280c9feba2af0dfa9ec156c2764df20ca252a3da44bcfa5e197447993fc12579face04c9881e09c9c978

data/lib/capistrano/ec2/capistrano_monkey_patch.rb

@@ -3,15 +3,10 @@ require 'fog/aws'
 module Capistrano
   class Configuration
     def for_each_ec2_server(ec2_env:, ec2_role:, &block)
-      ec2 = Fog::Compute.new \
-        provider: 'AWS',
-        region: fetch(:region),
-        use_iam_profile: fetch(:use_iam_profile, false)
-
-      filters = { 
-        "tag:ec2_env" => ec2_env, 
-        "tag:role" => ec2_role, 
-        'instance-state-name': 'running' 
+      filters = {
+        'tag:ec2_env' => ec2_env,
+        'tag:role' => ec2_role,
+        'instance-state-name': 'running'
       }
 
       ec2.servers.all(filters).map.with_index do |ec2_server, index|
@@ -20,6 +15,45 @@ module Capistrano
         yield ec2_server, index
       end
     end
+
+    private
+
+    def ec2
+      @ec2 ||= Fog::Compute.new(fog_arguments)
+    end
+
+    def fog_arguments
+      default_options = {
+        provider: 'AWS',
+        region: region,
+      }
+
+      if use_iam_profile
+        default_options.merge(iam_profile_options)
+      else
+        default_options.merge(access_key_options)
+      end
+    end
+
+    def region
+      fetch(:region)
+    end
+
+    def use_iam_profile
+      fetch(:use_iam_profile, false)
+    end
+
+    def iam_profile_options
+      { use_iam_profile: true }
+    end
+
+    def access_key_options
+      {
+        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+        aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        aws_session_token: ENV['AWS_SESSION_TOKEN'],
+      }
+    end
   end
 
   module DSL

data/lib/capistrano/ec2/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Ec2
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tom de Vries