elastic-beanstalk 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d354c6756a2e698c5ca9e83c732a58715544ebef
-  data.tar.gz: ba0cd850520daa047c87e9b7cce7c93909718d83
+  metadata.gz: a2f7ad000128a315ac2e977837675b9748b2a3c8
+  data.tar.gz: b9635f456392b73eb7fc0c7e006b84762e36a042
 SHA512:
-  metadata.gz: d165b0319d7b084bb924638c818850ef6497a4a3b71f244a1e58a8ec2624884133d4a8d88c31ade14f674a1baeea36e6ed5cd20a5bbc90a93c6ddc45b08b2a1d
-  data.tar.gz: 0289195957213234ebd3c3bda1a38a6d825f901f3e677012a544a88d7dbd27d57f38ce631ca5665f975dfd2a9cf91a240cd07c6c74a9bd5207280954749cf0ec
+  metadata.gz: 1193ddd38c373267a2d57c0fe1818311abe45a186acad424a70206d67151f98e0ea5d6280f526ca0706053540bfa5b15b7e71533d994daad26d9df90427c061d
+  data.tar.gz: e3ac2c58fb5d4b77eda3fa319736b3f181f39509439bea46a8d594299e76d6d056d6ed3938826aae4af85125f63a9c8bc2e20013ddd315fc91d7b4314719c425

data/README.md

@@ -213,6 +213,15 @@ options:
 
   aws:elasticbeanstalk:application:
     Application Healthcheck URL: '/health'
+    
+#---
+# Set "inactive_settings" for saving cost on blue green deployment
+#  https://github.com/ThoughtWorksStudios/eb_deployer/wiki/Elastic-Beanstalk-Tips-and-Tricks#set-inactive_settings-for-saving-cost-on-blue-green-deployment    
+inactive:
+  aws:autoscaling:asg:
+    MinSize: 0
+    Cooldown: 900    
+
 #---
 development:
   options:
@@ -228,6 +237,19 @@ production:
       InstanceType: t1.small
 ```
 
+## ENV interpolation
+
+ENV variable interpolation is provided by [dry-config](https://github.com/alienfast/dry-config/blob/master/README.md#env-interpolationsubstitutionexpansion).  Any of the values in the `eb.yml` may contain interpolated values. 
+
+The following formats are acceptable:
+
+```yaml
+  - ~/foo
+  - $HOME/foo
+  - ${HOME}/foo
+  - #{HOME}/foo
+```
+
 ## Additional options
 Most of the configurations are defaulted.  The following are less obvious but may be useful:
 
@@ -242,6 +264,7 @@ package:
 The following are passed if not nil, otherwise eb_deployer assigns an appropriate default.
 
 ```ruby
+inactive_settings:  (nil if unspecified)
 package_bucket:
 keep_latest:        (if unspecified, it will keep all past versions in the S3 bucket)
 version_prefix:

data/lib/elastic/beanstalk/config.rb

@@ -22,7 +22,7 @@ module Elastic
         # seed the sensible defaults here
         options = {
             symbolize: true,
-            interpolation: true,
+            interpolation: false,
             default_configuration: {
                 environment: nil,
                 secrets_dir: '~/.aws',
@@ -35,7 +35,8 @@ module Elastic
                     exclude_files: [],
                     exclude_dirs: %w(pkg tmp log test-reports)
                 },
-                options: {}
+                options: {},
+                inactive: {}
             }
         }.merge(options)
         super(options)
@@ -57,39 +58,58 @@ module Elastic
         end
       end
 
-      # def options
-      #   @configuration[:options]
-      # end
-
       # custom methods for the specifics of eb.yml settings
       def option_settings
-        result = []
-        options.each_key do |namespace|
-          options[namespace].each do |option_name, value|
-            result << to_option_setting(namespace, option_name, value)
-          end
-        end
+        generate_settings(options)
+      end
 
-        #{"option_settings" => result}
-        result
+      def inactive_settings
+        generate_settings(inactive)
       end
 
       def set_option(namespace, option_name, value)
-        namespace = namespace.to_sym
-
-        if options[namespace].nil?
-          options[namespace] = {option_name.to_sym => value}
-        else
-          options[namespace][option_name.to_sym] = value
-        end
+        current_options = to_option_setting(namespace, option_name, value)
+        namespace = current_options[:namespace].to_sym
+        option_name = current_options[:option_name].to_sym
 
-        #puts '888888hello'
+        options[namespace] = {} if options[namespace].nil?
+        options[namespace][option_name] = value
       end
 
       def find_option_setting(name)
+        find_setting(name, options)
+      end
+
+      def find_option_setting_value(name)
+        find_setting_value(name, options)
+      end
+
+      def find_inactive_setting(name)
+        find_setting(name, inactive)
+      end
+
+      def find_inactive_setting_value(name)
+        find_setting_value(name, inactive)
+      end
+
+      def to_option_setting(namespace, option_name, value)
+        erb_value = "#{value}".scan(/<%=.*%>/).first
+        unless erb_value.nil?
+          value = ERB.new(erb_value).result
+        end
+        {
+            :'namespace' => "#{namespace}",
+            :'option_name' => "#{option_name}",
+            :'value' => "#{value}"
+        }
+      end
+
+      private
+
+      def find_setting(name, settings_root)
         name = name.to_sym
-        options.each_key do |namespace|
-          options[namespace].each do |option_name, value|
+        settings_root.each_key do |namespace|
+          settings_root[namespace].each do |option_name, value|
             if option_name.eql? name
               return to_option_setting(namespace, option_name, value)
             end
@@ -98,17 +118,21 @@ module Elastic
         return nil
       end
 
-      def find_option_setting_value(name)
-        o = find_option_setting(name)
+      def find_setting_value(name, settings_root)
+        o = find_setting(name, settings_root)
         o[:value] unless o.nil?
       end
 
-      def to_option_setting(namespace, option_name, value)
-        {
-            :'namespace' => "#{namespace}",
-            :'option_name' => "#{option_name}",
-            :'value' => "#{value}"
-        }
+      def generate_settings(settings_root)
+        result = []
+        settings_root.each_key do |namespace|
+          settings_root[namespace].each do |option_name, value|
+            result << to_option_setting(namespace, option_name, value)
+          end
+        end
+
+        #{"option_settings" => result}
+        result
       end
     end
   end

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -316,7 +316,8 @@ namespace :eb do
         environment: EbConfig.environment,
         version_label: find_option_app_version,
         solution_stack_name: EbConfig.solution_stack_name,
-        settings: EbConfig.option_settings,
+        option_settings: EbConfig.option_settings,
+        inactive_settings: EbConfig.inactive_settings,
         strategy: EbConfig.strategy.to_sym,
         package: package
     }

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '1.1.11'
+    VERSION = '1.1.12'
   end
 end

data/spec/lib/elastic/beanstalk/eb_config_spec.rb

@@ -7,33 +7,49 @@ describe EbConfig do
   #  puts 'clear'
   #end
 
+  before(:each) do
+     EbConfig.clear
+  end
+
   it '#set_option' do
-    EbConfig.clear
     EbConfig.set_option('aws:elasticbeanstalk:application:environment', 'RACK_ENV', 'staging')
     expect(EbConfig.options[:'aws:elasticbeanstalk:application:environment'][:'RACK_ENV']).to eq 'staging'
   end
 
   it '#find_option_setting_value' do
-    EbConfig.clear
     EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', 'staging')
     expect(EbConfig.find_option_setting_value('RACK_ENV')).to eql 'staging'
   end
   it '#find_option_setting' do
-    EbConfig.clear
     EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', 'staging')
     expect(EbConfig.find_option_setting('RACK_ENV')).to eql ({:namespace => 'aws:elasticbeanstalk:application:environment', :option_name => 'RACK_ENV', :value => 'staging'})
   end
 
   it '#set_option should allow options to be overridden' do
-    EbConfig.clear
     EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', 'staging')
     assert_option 'RACK_ENV', 'staging'
     EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', 'foo')
     assert_option 'RACK_ENV', 'foo'
   end
 
+  it '#set_option should work with strings or deep symbols' do
+    option_input = [ :'aws:elasticbeanstalk:application:environment', :'RACK_ENV', :TEST_VALUE ]
+    method_order = [:to_sym, :to_s, :to_sym]
+    method_order.each do |current_method|
+      option_input.map!(&current_method)
+      EbConfig.clear
+      EbConfig.set_option(*option_input)
+      assert_option option_input[1].to_s, option_input[2].to_s
+    end
+  end
+
+  it '#set_option should work with environment variable interpolation' do
+    ENV['test_value'] = 'foo'
+    EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'TEST_VAR', '<%= ENV["test_value"] %>')
+    assert_option 'TEST_VAR', 'foo'
+  end
+
   it 'should read file with nil environment' do
-    EbConfig.clear
     sleep 1
     #expect(EbConfig.strategy).to be_nil
 
@@ -44,20 +60,7 @@ describe EbConfig do
     expect(EbConfig.environment).to be_nil
   end
 
-  it '#should read file with environment variable interpolation' do
-    EbConfig.clear
-    sleep 1
-    EbConfig.load!(nil, config_file_path)
-    assert_option 'TEST_VAR', ''
-
-    ENV['TEST_VAR'] = 'TEST_VALUE'
-    EbConfig.clear
-    EbConfig.load!(nil, config_file_path)
-    assert_option 'TEST_VAR', 'TEST_VALUE'
-  end
-
   it 'should read file and override with development environment' do
-    EbConfig.clear
     EbConfig.load!(:development, config_file_path)
     assert_option 'InstanceType', 't1.micro'
     expect(EbConfig.strategy).to eql 'inplace-update'
@@ -65,7 +68,6 @@ describe EbConfig do
   end
 
   it 'should read file and override with production environment' do
-    EbConfig.clear
     EbConfig.load!(:production, config_file_path)
     assert_option 'InstanceType', 't1.small'
     expect(EbConfig.environment).to eql :production
@@ -76,6 +78,10 @@ describe EbConfig do
     expect(EbConfig.find_option_setting_value(name)).to eql value
   end
 
+  def assert_inactive(name, value)
+    expect(EbConfig.find_inactive_setting_value(name)).to eql value
+  end
+
   def assert_common_top_level_settings
     expect(EbConfig.app).to eql 'acme'
     expect(EbConfig.region).to eql 'us-east-1'
@@ -108,6 +114,9 @@ describe EbConfig do
     assert_option 'Stickiness Policy', 'true'
     assert_option 'Notification Endpoint', 'alerts@acme.com'
     assert_option 'Application Healthcheck URL', '/healthcheck'
+
+    assert_inactive 'MinSize', '0'
+    assert_inactive 'Cooldown', '900'
   end
 
   def config_file_path

data/spec/lib/elastic/beanstalk/eb_spec.yml

@@ -15,11 +15,31 @@ ebextensions:
       01seed:
         command: rake db:seed
         leader_only: true
+
+  05-start-faye-server.config:
+    files:
+      "/opt/elasticbeanstalk/hooks/appdeploy/post/05_start_faye_server.sh":
+        mode: "000755"
+        owner: root
+        group: root
+        content:  |
+          #!/usr/bin/env bash
+          # Loading environment data
+          EB_APP_USER=$(/opt/elasticbeanstalk/bin/get-config container -k app_user)
+          EB_APP_DEPLOY_DIR=$(/opt/elasticbeanstalk/bin/get-config container -k app_deploy_dir)
+          EB_SCRIPT_DIR=$(/opt/elasticbeanstalk/bin/get-config container -k script_dir)
+          EB_SUPPORT_DIR=$(/opt/elasticbeanstalk/bin/get-config container -k support_dir)
+          # Setting up correct environment and ruby version so that bundle can load all gems
+          . $EB_SUPPORT_DIR/envvars
+          . $EB_SCRIPT_DIR/use-app-ruby.sh
+          # Now we can do the actual restart of the worker. Make sure to have double quotes when using env vars in the command.
+          cd $EB_APP_DEPLOY_DIR
+          su -s /bin/bash -c "RAILS_ENV=production bundle exec thin -C config/private_pub_thin.yml --timeout 60 start -d" $EB_APP_USER
+
 #---
 options:
   aws:elasticbeanstalk:application:environment:
     RAILS_ENV: foobar
-    TEST_VAR: #{TEST_VAR}
 
   aws:autoscaling:launchconfiguration:
     InstanceType: foo
@@ -42,6 +62,12 @@ options:
 
   aws:elasticbeanstalk:application:
     Application Healthcheck URL: '/healthcheck'
+
+inactive:
+  aws:autoscaling:asg:
+    MinSize: 0
+    Cooldown: 900
+
 #---
 development:
   strategy: inplace-update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler