capistrano-asg 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1680ae513823f0f0424fd658bb227f17fda46ab729aa3e9f6d587aba46a857a4
-  data.tar.gz: 92ba04736530880bd4e8711ade8b9a035893288ea48207112612de9d7c724682
+  metadata.gz: c5cf7466ccf300560f72599cca1617b23dc97a0fc9fb47f555d947e4aed9754f
+  data.tar.gz: f2dae7eaf2acbfacc9d5aef30e92b18c77584ad4f0958cee985992b6d0ff85dc
 SHA512:
-  metadata.gz: 85390054c2513c1a0f941b2bf6d4f55d7a3ccfa56fc4ad5bd0f9d67eee9bdbb787c31f4c00c58ef6f17b975e1e0da4b5d3b7694fd53b5fd3ace450d893dccd82
-  data.tar.gz: 85737a500e447723154316b37845f424ac3bde6a51bc785f94c9c9f182eaff3b4df3c3489dee7e90be280b20a37135fe82fb4523dda05fcfba96d1fdf90eb973
+  metadata.gz: 476cf23e974d98864f846cf4153b21a670b4c215f5d2edb2c866a564938bb5c6050ed32a4ceffd0667b51b0dbd230d9bc1186be1b20b0f0b667ced90fc305a29
+  data.tar.gz: ebe4e1fc3dc267076174e5d89d676694d2bfa212e7a6769c81c99f49bebeceaf5cc314df07f3110748d7ac6b2ccf5b37cbe40e3f437fef6d537779ea6315f2c2

data/.travis.yml

@@ -2,14 +2,17 @@ language: ruby
 cache: bundler
 rvm:
 - 2.3.3
-- 2.4.1
+- 2.4.3
+- 2.5.1
 sudo: false
 env:
   - AWS_REGION: us-west-2
+  - AWS_ACCESS_KEY_ID: AK123456789
+  - AWS_SECRET_ACCESS_KEY: abcdefg123456
 deploy:
   provider: rubygems
   gem:
     master: capistrano-asg
   on:
-    repo: sixfeetover/capistrano-asg
+    repo: veracross/capistrano-asg
     branch: master

data/CHANGELOG.md

@@ -1,6 +1,12 @@
+# 0.7.0
+
+* Update to AWS SDK v3. Thanks @jpatters and @milgner
+* Set iam_instance_profile on newly created launch configurations
+
 # 0.6.1
 
 * Provide a way to bypass new AMI/LC generation by setting `set :create_ami, false`.
+
 # 0.6.0
 
 * Breaking change/bug fix: Region-specific settings were not being preserved. A

data/capistrano-asg.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'byebug'
 
-  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'aws-sdk-ec2', '~> 1'
+  spec.add_dependency 'aws-sdk-autoscaling', '~> 1'
   spec.add_dependency 'capistrano', '> 3.0.0'
   spec.add_dependency 'activesupport', '>= 4.0.0'
 end

data/lib/capistrano/asg.rb

@@ -1,4 +1,5 @@
-require 'aws-sdk'
+require 'aws-sdk-ec2'
+require 'aws-sdk-autoscaling'
 require 'capistrano/all'
 require 'active_support/concern'
 
@@ -7,6 +8,7 @@ require 'capistrano/asg/retryable'
 require 'capistrano/asg/taggable'
 require 'capistrano/asg/logger'
 require 'capistrano/asg/aws/credentials'
+require 'capistrano/asg/aws/region'
 require 'capistrano/asg/aws/autoscaling'
 require 'capistrano/asg/aws/ec2'
 require 'capistrano/asg/aws_resource'
@@ -18,7 +20,6 @@ module Capistrano
   end
 end
 
-require 'aws-sdk'
 require 'capistrano/dsl'
 
 load File.expand_path('../asg/tasks/asg.rake', __FILE__)

data/lib/capistrano/asg/aws/autoscaling.rb

@@ -7,10 +7,11 @@ module Capistrano
       module AutoScaling
         extend ActiveSupport::Concern
         include Credentials
+        include Region
         include Capistrano::DSL
 
         def autoscaling_client
-          @_autoscaling_client ||= ::Aws::AutoScaling::Client.new(credentials)
+          @_autoscaling_client ||= ::Aws::AutoScaling::Client.new(region: region, credentials: credentials)
         end
 
         def autoscaling_resource

data/lib/capistrano/asg/aws/credentials.rb

@@ -8,11 +8,9 @@ module Capistrano
         include Capistrano::DSL
 
         def credentials
-          {
-            access_key_id:     fetch(:aws_access_key_id,     ENV['AWS_ACCESS_KEY_ID']),
-            secret_access_key: fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']),
-            region:            fetch(:aws_region,            ENV['AWS_REGION'])
-          }
+          access_key_id = fetch(:aws_access_key_id, ENV['AWS_ACCESS_KEY_ID'])
+          secret_access_key = fetch(:aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
+          ::Aws::Credentials.new(access_key_id, secret_access_key)
         end
       end
     end

data/lib/capistrano/asg/aws/ec2.rb

@@ -7,6 +7,7 @@ module Capistrano
       module EC2
         extend ActiveSupport::Concern
         include Credentials
+        include Region
         include Capistrano::DSL
 
         def ec2_resource
@@ -20,7 +21,7 @@ module Capistrano
         private
 
         def ec2_client
-          ::Aws::EC2::Client.new(credentials)
+          ::Aws::EC2::Client.new(region: region, credentials: credentials)
         end
       end
     end

data/lib/capistrano/asg/aws/region.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Capistrano
+  module Asg
+    module Aws
+      module Region
+        extend ActiveSupport::Concern
+        include Capistrano::DSL
+
+        def region
+          fetch(:aws_region, ENV['AWS_REGION'])
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/asg/aws_resource.rb

@@ -22,7 +22,7 @@ module Capistrano
       private
 
       def base_ec2_instance
-        autoscaling_group.instances[0]
+        autoscaling_group.instances.first
       end
 
       def environment

data/lib/capistrano/asg/launch_configuration.rb

@@ -4,7 +4,7 @@ module Capistrano
     class LaunchConfiguration < AWSResource
       attr_reader :region_config
 
-      def self.create(ami, region_config, &_block)
+      def self.create(ami, region_config = {}, &_block)
         lc = new(region_config)
         lc.cleanup do
           lc.save(ami)
@@ -19,6 +19,7 @@ module Capistrano
       def save(ami)
         info "Creating an EC2 Launch Configuration for AMI: #{ami.aws_counterpart.id}"
         ec2_instance = ec2_resource.instance(base_ec2_instance.id)
+
         with_retry do
           @aws_counterpart = autoscaling_resource.create_launch_configuration(
             launch_configuration_name: name,
@@ -29,7 +30,8 @@ module Capistrano
             instance_monitoring: {
               enabled: fetch(:aws_launch_configuration_detailed_instance_monitoring, true)
             },
-            user_data: region_config.fetch(:aws_launch_configuration_user_data, nil)
+            user_data: region_config.fetch(:aws_launch_configuration_user_data, nil),
+            iam_instance_profile: ec2_instance.iam_instance_profile.arn
           )
         end
       end

data/lib/capistrano/asg/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module Asg
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-asg
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Logan Serman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,19 +83,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-autoscaling
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - lib/capistrano/asg/aws/autoscaling.rb
 - lib/capistrano/asg/aws/credentials.rb
 - lib/capistrano/asg/aws/ec2.rb
+- lib/capistrano/asg/aws/region.rb
 - lib/capistrano/asg/aws_resource.rb
 - lib/capistrano/asg/launch_configuration.rb
 - lib/capistrano/asg/logger.rb