capistrano-asg 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b36a3b950014b5056f72b8e6203747165cf029
-  data.tar.gz: d776ac1d3f9c8c000ab39346dbaf2503f6db181a
+  metadata.gz: a6445f3862b4f6a3f1696ee063ff9b33a7cd8788
+  data.tar.gz: c8ee258495a21de210c5e875c54a1030c8ee846a
 SHA512:
-  metadata.gz: 54920d7b80aee2362185620a411bf3a0a8709563681f7c786b1de99d326ac4c4f433ec11b19502bae1eae7333901cfdb834a3a4db2c5c4f36eb045fa5f34eb6b
-  data.tar.gz: 76294d9cf6439cc407fbcc7b82e7cad5f12796e2acaba37f708a1b11bba1eb087daa1043c00f1180d4c00ce2202de81a8e2f1d82f95ad3e35466f20b73b6a8b4
+  metadata.gz: 27d46985467271ba6ac8c056183e5103db62a411ef250d4b4515a32466ab95c12e023b9cbc7103faff76578541a8b82affab6a0adc3930dbe08be91cce886a3b
+  data.tar.gz: fa39d32720fa2324ac208fce1ba2b80d9f5d9c98f6d04cc418cecde6880cd7853bc5ae0f32706ace37cf4ed8377d543ff1e09cbc424944fc0276b0f272854f42

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.6.0
+
+* Breaking change/bug fix: Region-specific settings were not being preserved. A
+  new construct is required to set region specific settings. Do this:
+
+```ruby
+set 'us-east-1'.to_sym, {
+  aws_autoscale_instance_size: 't2.medium',
+  aws_lc_name_prefix: 'lc-'
+}
+```
+
+See the README for more details.
+
 # 0.5.5
 
 * Support setting name prefixes for newly created launch configurations and AMIs

data/README.md

@@ -30,11 +30,14 @@ set :aws_access_key_id,     ENV['AWS_ACCESS_KEY_ID']
 set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
 set :aws_region,            ENV['AWS_REGION']
 
-set :aws_no_reboot_on_create_ami, true
-set :aws_autoscale_instance_size, 'm1.small'
+# To set region specific things:
+set ENV['AWS_REGION'].to_sym, {
+  aws_no_reboot_on_create_ami: true,
+  aws_autoscale_instance_size: 'm1.small',
+  aws_launch_configuration_detailed_instance_monitoring: true,
+  aws_launch_configuration_associate_public_ip: true
+}
 
-set :aws_launch_configuration_detailed_instance_monitoring, true
-set :aws_launch_configuration_associate_public_ip, true
 ```
 
 ## Usage
@@ -61,6 +64,9 @@ regions = %w(us-east-1 eu-west-1)
 
 regions.each do |region|
   set :aws_region, region
+  set region.to_sym, {
+    aws_autoscale_instance_size: 't2.medium'
+  }
   autoscale 'production', user: 'apps', roles: [:app, :web, :db]
 end
 ```

data/lib/capistrano/asg/launch_configuration.rb

@@ -2,14 +2,20 @@ module Capistrano
   module Asg
     # Create launch configuration
     class LaunchConfiguration < AWSResource
-      def self.create(ami, &_block)
-        lc = new
+      attr_reader :region_config
+
+      def self.create(ami, region_config, &_block)
+        lc = new(region_config)
         lc.cleanup do
           lc.save(ami)
           yield lc
         end
       end
 
+      def initialize(region_config = {})
+        @region_config = region_config
+      end
+
       def save(ami)
         info "Creating an EC2 Launch Configuration for AMI: #{ami.aws_counterpart.id}"
         ec2_instance = ec2_resource.instance(base_ec2_instance.id)
@@ -19,12 +25,11 @@ module Capistrano
             image_id: ami.aws_counterpart.id,
             instance_type: instance_size,
             security_groups: ec2_instance.security_groups.map(&:group_id),
-            associate_public_ip_address:
-              fetch(:aws_launch_configuration_associate_public_ip, true),
+            associate_public_ip_address: region_config.fetch(:aws_launch_configuration_associate_public_ip, true),
             instance_monitoring: {
               enabled: fetch(:aws_launch_configuration_detailed_instance_monitoring, true)
             },
-            user_data: fetch(:aws_launch_configuration_user_data, nil)
+            user_data: region_config.fetch(:aws_launch_configuration_user_data, nil)
           )
         end
       end
@@ -46,15 +51,15 @@ module Capistrano
       private
 
       def name
-        timestamp fetch(:aws_lc_name_prefix, "cap-asg-#{environment}-#{autoscaling_group_name}-lc")
+        timestamp region_config.fetch(:aws_lc_name_prefix, "cap-asg-#{environment}-#{autoscaling_group_name}-lc")
       end
 
       def instance_size
-        fetch(:aws_autoscale_instance_size, 'm1.small')
+        region_config.fetch(:aws_autoscale_instance_size, 'm1.small')
       end
 
       def deployed_with_asg?(lc)
-        lc.name.include? "cap-asg-#{environment}-#{autoscaling_group_name}-lc"
+        lc.name.include? region_config.fetch(:aws_lc_name_prefix, "cap-asg-#{environment}-#{autoscaling_group_name}-lc")
       end
 
       def trash

data/lib/capistrano/asg/tasks/asg.rake

@@ -19,7 +19,7 @@ namespace :asg do
         set :aws_autoscale_group, asg
         Capistrano::Asg::AMI.create do |ami|
           puts "Autoscaling: Created AMI: #{ami.aws_counterpart.id} from region #{region} in ASG #{asg}"
-          Capistrano::Asg::LaunchConfiguration.create(ami) do |lc|
+          Capistrano::Asg::LaunchConfiguration.create(ami, fetch(region.to_sym, {})) do |lc|
             puts "Autoscaling: Created Launch Configuration: #{lc.aws_counterpart.name} from region #{region} in ASG #{asg}"
             asg_launch_config[region][asg] = lc.aws_counterpart.name
             asg_ami_id[region][asg] = ami.aws_counterpart.id

data/lib/capistrano/asg/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module Asg
-    VERSION = '0.5.5'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-asg
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Logan Serman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler