elastic_beans 0.13.0.alpha3 → 0.13.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f706a4e17c133611b418f5ac6b7f57a7859d7ef2
-  data.tar.gz: dd94a36a7bf6cf844972158a84dc30ecb57330f0
+  metadata.gz: a69e6d19ef9b23f9db1ccddb65d7f49644e72233
+  data.tar.gz: 1b2b65654a6abcc05e7033946f13464d5f51a85b
 SHA512:
-  metadata.gz: 8d0efdaff74f60b3c64bac5950fa57aa2faa35f679e8c82dc6436539e66b748f902aa6ad1382d07a9d605f8d1c7d1ff409124edf6ac0c14a2fa7e59792d608be
-  data.tar.gz: 32b43316bb1848aa77638d6777c3e80daa547ee10ab10b5221edb963bb27d6afaf9dabdd10773047c003611c6e7d28f46c3d60b96a8eef30f6f1f19d6a405629
+  metadata.gz: ced50156c632ae34c5219d7d8f4384cf7ccf1243611dd23e06c57eb552707907305d6bbd03a9bfda390126c220a96ff35a7b363649d72ea94bebc41da91dd5a7
+  data.tar.gz: 87f4ec5eb18640de5d43327b24a29a0539c4d22fbffb08c3fb8968054de09d0d2bff152f38467722ea625e70b68b932a362694846ca00c4872cc2c016ff07bef

data/README.md

@@ -24,8 +24,9 @@ As the SDK documentation suggests, using environment variables is recommended.
 
     # Pre-configure the application before creating environments
     beans configure -n myapp-networking -a myapp \
-      -p INTERNAL_PUBLIC_KEY -s SSL_CERTIFICATE_ARN \
-      -k KEYPAIR [-i IMAGE_ID] [-t INSTANCE_TYPE]
+      -p INTERNAL_PUBLIC_KEY -s SSL_CERTIFICATE_ARN -k KEYPAIR \
+      [--solution-stack '64bit Amazon Linux 2017.03 v2.4.2 running Ruby 2.3 (Puma)'] \
+      [-o 'OPTION_SETTING_NAMESPACE/OPTION_NAME=VALUE'...]
     beans setenv -a myapp \
       DATABASE_URL=mysql2://db.example.com:3306/myapp \
       SECRET_KEY_BASE=abc123
@@ -65,8 +66,9 @@ As the SDK documentation suggests, using environment variables is recommended.
 
     # Update all existing environments and configuration
     beans configure -n myapp-networking -a myapp \
-      [-p INTERNAL_PUBLIC_KEY] [-s SSL_CERTIFICATE_ARN] \
-      [-k KEYPAIR] [-i IMAGE_ID] [-t INSTANCE_TYPE]
+      [-p INTERNAL_PUBLIC_KEY] [-s SSL_CERTIFICATE_ARN] [-k KEYPAIR] \
+      [--solution-stack '64bit Amazon Linux 2017.03 v2.4.2 running Ruby 2.3 (Puma)'] \
+      [-o 'OPTION_SETTING_NAMESPACE/OPTION_NAME=VALUE'...]
 
 ### API
 

data/lib/elastic_beans/application.rb

@@ -29,7 +29,7 @@ module ElasticBeans
       live_environments = response.environments.select { |environment| environment.status !~ /Terminat/ }
       environment = live_environments.max_by(&:date_updated)
       if environment
-        ElasticBeans::ApplicationVersion.new(environment.version_label)
+        ElasticBeans::ApplicationVersion.new(environment.version_label, application: self, elastic_beanstalk: elastic_beanstalk)
       end
     rescue ::Aws::ElasticBeanstalk::Errors::Throttling
       sleep 5
@@ -226,11 +226,22 @@ module ElasticBeans
 
     # Returns an ElasticBeans::ApplicationVersion for each version of the Elastic Beanstalk application.
     def versions
-      response = elastic_beanstalk.describe_application_versions(application_name: name)
-      response.application_versions.map { |version| ElasticBeans::ApplicationVersion.new(version.version_label) }
-    rescue ::Aws::ElasticBeanstalk::Errors::Throttling
-      sleep 5
-      retry
+      application_versions = []
+      next_token = nil
+      loop do
+        begin
+          response = elastic_beanstalk.describe_application_versions(application_name: name, next_token: next_token)
+          next_token = response.next_token
+          application_versions += response.application_versions.map { |version|
+            ElasticBeans::ApplicationVersion.new_from_existing(version, application: self, elastic_beanstalk: elastic_beanstalk)
+          }
+          break unless next_token
+        rescue ::Aws::ElasticBeanstalk::Errors::Throttling
+          sleep 5
+          retry
+        end
+      end
+      application_versions
     end
 
     # Returns the +Worker{QUEUE}QueueUrl+ from the application CloudFormation stack.

data/lib/elastic_beans/application_version.rb

@@ -7,11 +7,23 @@ require "elastic_beans/error"
 
 module ElasticBeans
   class ApplicationVersion
-    attr_reader :version_label
+    attr_reader :version_label, :application
+    attr_writer :version_description
 
     # Create a representation of an existing application version in Elastic Beanstalk.
-    def initialize(version_label)
+    # Details will be fetched from the Elastic Beanstalk API.
+    def initialize(version_label, application:, elastic_beanstalk:)
       @version_label = version_label
+      @application = application
+      @elastic_beanstalk = elastic_beanstalk
+    end
+
+    # Create a representation of an existing application version in Elastic Beanstalk.
+    # +version_description+ should be the +Aws::ElasticBeanstalk::Types::ApplicationVersionDescription+ from the AWS API.
+    def self.new_from_existing(version_description, application:, elastic_beanstalk:)
+      version = new(version_description.version_label, application: application, elastic_beanstalk: elastic_beanstalk)
+      version.version_description = version_description
+      version
     end
 
     class << self
@@ -24,7 +36,7 @@ module ElasticBeans
       def create(working_directory:, application:, elastic_beanstalk:, s3:)
         version_label = fetch_version_label(working_directory)
         if application.versions.any? { |version| version.version_label == version_label }
-          return new(version_label)
+          return new(version_label, application: application, elastic_beanstalk: elastic_beanstalk)
         end
 
         archive_path = File.join(working_directory, ".elasticbeanstalk", "#{version_label}.zip")
@@ -36,7 +48,7 @@ module ElasticBeans
           elastic_beanstalk: elastic_beanstalk,
           s3: s3,
         )
-        new(version_label)
+        new(version_label, application: application, elastic_beanstalk: elastic_beanstalk)
       end
 
       private
@@ -164,12 +176,40 @@ module ElasticBeans
       end
     end
 
+    def delete
+      elastic_beanstalk.delete_application_version(
+        application_name: application.name,
+        version_label: version_label,
+        delete_source_bundle: true,
+      )
+    rescue ::Aws::ElasticBeanstalk::Errors::Throttling
+      sleep 5
+      retry
+    end
+
+    def date_updated
+      version_description.date_updated
+    end
+
     def ==(other)
-      version_label == other.version_label
+      version_label == other.version_label &&
+        application.name == other.application.name
     end
 
     private
 
+    attr_reader :elastic_beanstalk
+
+    def version_description
+      @version_description ||= elastic_beanstalk.describe_application_versions(
+        application_name: application.name,
+        version_labels: [version_label],
+      ).application_versions[0]
+    rescue ::Aws::ElasticBeanstalk::Errors::Throttling
+      sleep 5
+      retry
+    end
+
     # :nodoc: all
     # @!visibility private
     class FailedApplicationVersion < ElasticBeans::Error

data/lib/elastic_beans/aws/cloudformation_stack.rb

@@ -55,8 +55,8 @@ module ElasticBeans
         end
 
         def message
-          "CloudFormation stack `#{@stack_name}' not found." \
-            " Make sure the stack exists and matches the outputs required."
+          "CloudFormation stack `#{@stack_name}' is in progress or does not exist." \
+            " Make sure the stack exists, is stable, and matches the outputs required."
         end
       end
 

data/lib/elastic_beans/cli.rb

@@ -16,21 +16,23 @@ class ElasticBeans::CLI < Thor
   long_desc ElasticBeans::Command::Configure::LONG_DESC
   option :application, aliases: %w(-a), required: true, desc: APPLICATION_DESC
   option :network, aliases: %w(-n), required: true, desc: "The name of the CloudFormation stack that contains networking settings"
-  option :image_id, aliases: %w(-i), desc: "A custom AMI to use instead of the default Ruby Elastic Beanstalk AMI"
-  option :instance_type, aliases: %w(-t), desc: "A default instance type to use for all environments instead of c4.large"
   option :internal, type: :boolean, desc: "Configure the webserver to only be available for internal VPC access"
   option :keypair, aliases: %w(-k), desc: "Required on first run. The EC2 keypair to use for Elastic Beanstalk instances"
+  option :option_settings, aliases: %w(-o), type: :array, default: [], desc: "Option settings to configure, format is NAMESPACE/OPTION_NAME=VALUE, e.g. aws:ec2:vpc/ELBScheme=internal"
+  option :option_settings_to_remove, aliases: %w(-r), type: :array, default: [], desc: "Option settings to remove, format is NAMESPACE/OPTION_NAME, e.g. aws:ec2:vpc/ELBScheme"
   option :public_key, aliases: %w(-p), desc: "For end-to-end encryption. The public key of the SSL certificate the ELB will verify to communicate with your Rails app"
   option :ssl_certificate_arn, aliases: %w(-s), desc: "The ARN of the SSL server certificate stored in IAM to attach to the ELB"
+  option :solution_stack, desc: "Solution stack name to deploy the application on. Defaults to the latest Ruby Puma solution stack."
   def configure
     @verbose = options[:verbose]
     ElasticBeans::Command::Configure.new(
-      image_id: options[:image_id],
-      instance_type: options[:instance_type],
       internal: options[:internal],
       keypair: options[:keypair],
       public_key: options[:public_key],
       ssl_certificate_arn: options[:ssl_certificate_arn],
+      solution_stack: options[:solution_stack],
+      option_settings: options[:option_settings],
+      option_settings_to_remove: options[:option_settings_to_remove],
       application: application(name: options[:application]),
       network: network(stack_name: options[:network]),
       elastic_beanstalk: elastic_beanstalk_client,

data/lib/elastic_beans/command/configure.rb

@@ -16,24 +16,26 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
       LONG_DESC
 
       def initialize(
-        image_id:,
-        instance_type:,
         internal:,
         keypair:,
         public_key:,
         ssl_certificate_arn:,
+        solution_stack:,
+        option_settings:,
+        option_settings_to_remove:,
         application:,
         network:,
         elastic_beanstalk:,
         iam:,
         ui:
       )
-        @image_id = image_id
-        @instance_type = instance_type
         @internal = internal
         @keypair = keypair
         @public_key = public_key
         @ssl_certificate_arn = ssl_certificate_arn
+        @solution_stack = solution_stack
+        @option_setting_strings = option_settings
+        @option_strings_to_remove = option_settings_to_remove
         @application = application
         @network = network
         @elastic_beanstalk = elastic_beanstalk
@@ -71,9 +73,10 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         base_config.upsert(
           network: network,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          solution_stack: solution_stack,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         progressbar.increment
@@ -85,13 +88,14 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         webserver_config.upsert(
           network: network,
-          image_id: image_id,
-          instance_type: instance_type,
           internal: internal,
           keypair: keypair,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
           public_key: public_key,
           ssl_certificate_arn: ssl_certificate_arn,
+          solution_stack: solution_stack,
         )
         webserver_environment = webserver_config.environment
         if webserver_environment
@@ -109,9 +113,10 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         exec_config.upsert(
           network: network,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          solution_stack: solution_stack,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         exec_environment = exec_config.environment
@@ -130,9 +135,10 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         scheduler_config.upsert(
           network: network,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          solution_stack: solution_stack,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         scheduler_environment = scheduler_config.environment
@@ -153,9 +159,10 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           )
           worker_config.upsert(
             network: network,
-            image_id: image_id,
-            instance_type: instance_type,
             keypair: keypair,
+            solution_stack: solution_stack,
+            option_settings: option_settings,
+            options_to_remove: options_to_remove,
             iam: iam,
           )
           worker_environment = worker_config.environment
@@ -175,17 +182,76 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
       attr_reader(
         :application,
-        :image_id,
-        :instance_type,
         :internal,
         :keypair,
         :network,
         :public_key,
         :ssl_certificate_arn,
+        :solution_stack,
         :elastic_beanstalk,
         :iam,
         :ui,
       )
+
+      # Coerces +@option_setting_strings+ into object format.
+      def option_settings
+        @option_settings ||= @option_setting_strings.map { |option_setting_string|
+          setting, value = option_setting_string.split('=', 2)
+          if !setting || setting.empty? || !value || value.empty?
+            raise InvalidOptionSettingFormatError
+          end
+          namespace, option_name = setting.split('/', 2)
+          if !namespace || namespace.empty? || !option_name || option_name.empty?
+            raise InvalidOptionSettingFormatError
+          end
+          {namespace: namespace, option_name: option_name, value: value}
+        }
+      end
+
+      # Coerces +@option_strings_to_remove+ into object format.
+      def options_to_remove
+        @options_to_remove ||= @option_strings_to_remove.map { |option_setting_string|
+          namespace, option_name = option_setting_string.split('/', 2)
+          if !namespace || namespace.empty? || !option_name || option_name.empty? || option_name.include?('=')
+            raise InvalidOptionSettingFormatError
+          end
+          {namespace: namespace, option_name: option_name}
+        }
+      end
+
+      # :nodoc: all
+      # @!visibility private
+      class InvalidOptionSettingFormatError < ElasticBeans::Error
+        def message
+          require "elastic_beans/cli"
+          require "elastic_beans/cli/string_shell"
+          <<-MESSAGE
+Invalid format for --option-settings.
+Option settings should in the format 'NAMESPACE/OPTION_NAME=VALUE', e.g. 'aws:autoscaling:asg/Cooldown=180'.
+If you'd like to *remove* option settings, use --option-settings-to-remove 'NAMESPACE/OPTION_NAME'.
+Please re-run `#{command_as_string "configure"}` with updated syntax.
+
+#{command_help "configure"}
+          MESSAGE
+        end
+      end
+
+      # :nodoc: all
+      # @!visibility private
+      class InvalidOptionSettingsToRemoveFormatError < ElasticBeans::Error
+        def message
+          require "elastic_beans/cli"
+          require "elastic_beans/cli/string_shell"
+          <<-MESSAGE
+Invalid format for --option-settings-to-remove.
+Option settings to remove should in the format 'NAMESPACE/OPTION_NAME', e.g. 'aws:autoscaling:asg/Cooldown'.
+If you'd like to *set* option settings, use --option-settings 'NAMESPACE/OPTION_NAME=VALUE'.
+Please re-run `#{command_as_string "configure"}` with updated syntax.
+
+#{command_help "configure"}
+          MESSAGE
+        end
+      end
     end
   end
 end

data/lib/elastic_beans/command/deploy.rb

@@ -9,9 +9,14 @@ module ElasticBeans
       DESC = "Deploy the HEAD git commit to all environments in Elastic Beanstalk"
       LONG_DESC = <<-LONG_DESC
 Deploy the HEAD git commit of the working directory to all environments in Elastic Beanstalk.
+Cleans up old application versions in parallel to avoid reaching the 1,000 application version limit.
 
 Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.
       LONG_DESC
+      # Maximum age of application versions that are left behind and not cleaned up. 1 week.
+      APPLICATION_VERSION_MAX_AGE = 604_800
+      # Minimum number of application versions to leave around.
+      APPLICATION_VERSION_MIN_COUNT = 5
 
       def initialize(application:, elastic_beanstalk:, s3:, ui:)
         @application = application
@@ -38,15 +43,19 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
             s3: s3,
           ).version_label
         end
+        cleanup_thread = Thread.new do
+          remove_old_versions
+        end
 
         loop do
           sleep 0.5
           progressbar.increment
-          if !version_thread.alive?
+          if !version_thread.alive? && !cleanup_thread.alive?
             break
           end
         end
         version_thread.join
+        cleanup_thread.join
 
         Signal.trap("INT") do
           puts "\nInterrupting beans"
@@ -85,6 +94,21 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
       private
 
       attr_reader :application, :elastic_beanstalk, :s3, :ui
+
+      # Removes application versions that are old and just taking up space.
+      # Elastic Beanstalk has a limit of 1000 application versions, so we should keep this tidy.
+      def remove_old_versions
+        cutoff = Time.now
+        outdated_versions, leftover_versions = application.versions.partition { |version|
+          version.date_updated + APPLICATION_VERSION_MAX_AGE < cutoff
+        }
+        if leftover_versions.size < APPLICATION_VERSION_MIN_COUNT
+          outdated_versions.pop(APPLICATION_VERSION_MIN_COUNT - leftover_versions.size)
+        end
+        outdated_versions.each do |version|
+          version.delete
+        end
+      end
     end
   end
 end

data/lib/elastic_beans/configuration_template/base.rb

@@ -10,6 +10,13 @@ module ElasticBeans
         super(name: "base", **args)
       end
 
+      # Returns the specifed +solution_stack+ from #upsert.
+      # Finds the previously-configured solution stack when one was not specified.
+      # Finds the latest available Ruby Puma solution stack (matching +SOLUTION_STACK_PATTERN+) when one was never specified.
+      def solution_stack_name
+        @solution_stack_name ||= (configured_solution_stack || super)
+      end
+
       protected
 
       # Constructs the common configuration for all environments.
@@ -18,20 +25,21 @@ module ElasticBeans
         network: nil,
         keypair: nil,
         iam: nil,
-        image_id: nil,
-        instance_type: nil,
         min_size: nil,
         max_size: nil,
+        solution_stack: nil,
+        option_settings: [],
         **_
       )
+        @solution_stack_name = solution_stack
         template = configuration_settings_description("base")
 
-        instance_profile_setting = template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "IamInstanceProfile", override: instance_profile(iam))
+        instance_profile_setting = template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "IamInstanceProfile", override: instance_profile(iam), new_settings: option_settings)
         if instance_profile_setting[:value].nil?
           raise MissingInstanceProfileError
         end
 
-        keypair_setting = template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "EC2KeyName", override: keypair)
+        keypair_setting = template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "EC2KeyName", override: keypair, new_settings: option_settings)
         if keypair_setting[:value].nil?
           raise MissingOptionsError.new(
             keypair: keypair_setting[:value],
@@ -40,35 +48,57 @@ module ElasticBeans
 
         config_path = "#{application.bucket_name}/#{application.env_vars.s3_key}"
         settings = [
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "BatchSize", default: "1"),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "BatchSizeType", default: "Fixed"),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "DeploymentPolicy", default: "Rolling"),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", default: "true"),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "ELASTIC_BEANS_ENV_VARS", default: config_path),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:environment", option_name: "ServiceRole", default: "aws-elasticbeanstalk-service-role"),
-          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:healthreporting:system", option_name: "SystemType", default: "enhanced"),
-          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "AssociatePublicIpAddress", default: "false"),
-          template_option_setting(template: template, namespace: "aws:autoscaling:asg", option_name: "MinSize", default: "1", override: min_size),
-          template_option_setting(template: template, namespace: "aws:autoscaling:asg", option_name: "MaxSize", default: "4", override: max_size),
-          template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "InstanceType", default: "c4.large", override: instance_type),
-          template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "SSHSourceRestriction", default: "tcp, 22, 22, 0.0.0.0/32"),
-          template_option_setting(template: template, namespace: "aws:autoscaling:updatepolicy:rollingupdate", option_name: "RollingUpdateType", default: "Health"),
-          template_option_setting(template: template, namespace: "aws:autoscaling:updatepolicy:rollingupdate", option_name: "RollingUpdateEnabled", default: "true"),
-          template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "SecurityGroups", override: security_groups(network)),
-          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "ELBSubnets", override: elb_subnets(network)),
-          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "Subnets", override: subnets(network)),
-          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "VPCId", override: vpc_id(network)),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "BatchSize", default: "1", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "BatchSizeType", default: "Fixed", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:command", option_name: "DeploymentPolicy", default: "Rolling", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", default: "true", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "ELASTIC_BEANS_ENV_VARS", default: config_path, new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:environment", option_name: "ServiceRole", default: "aws-elasticbeanstalk-service-role", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:elasticbeanstalk:healthreporting:system", option_name: "SystemType", default: "enhanced", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "AssociatePublicIpAddress", default: "false", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:asg", option_name: "MinSize", default: "1", override: min_size, new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:asg", option_name: "MaxSize", default: "4", override: max_size, new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "SSHSourceRestriction", default: "tcp, 22, 22, 0.0.0.0/32", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:updatepolicy:rollingupdate", option_name: "RollingUpdateType", default: "Health", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:updatepolicy:rollingupdate", option_name: "RollingUpdateEnabled", default: "true", new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "SecurityGroups", override: security_groups(network), new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "ELBSubnets", override: elb_subnets(network), new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "Subnets", override: subnets(network), new_settings: option_settings),
+          template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "VPCId", override: vpc_id(network), new_settings: option_settings),
           instance_profile_setting,
           keypair_setting,
         ]
-        if image_id
-          settings << template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "ImageId", override: image_id)
+        if solution_stack
+          settings << template_option_setting(template: template, namespace: "aws:elasticbeanstalk:customoption", option_name: "SolutionStack", override: solution_stack, new_settings: option_settings)
         end
-        settings
+        super + settings
+      end
+
+      def source_configuration
+        nil
       end
 
       private
 
+      # Finds the previously-configured solution stack when one was not specified.
+      # The solution stack name is stored in a custom option named "SolutionStack",
+      # because updating the template's solution stack is not supported by Elastic Beanstalk.
+      # See http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/configuration-options-custom.html for more information on custom options.
+      # If the custom option is not set because the application was configured by an older version of beans, returns the template's configured solution stack.
+      def configured_solution_stack
+        template = configuration_settings_description("base")
+        if template
+          setting = template.option_settings.find { |setting|
+            setting.namespace == "aws:elasticbeanstalk:customoption" && setting.option_name == "SolutionStack"
+          }
+          if setting
+            return setting.value
+          else
+            return template.solution_stack_name
+          end
+        end
+      end
+
       def elb_subnets(network)
         if network
           network.elb_subnets.join(",")

data/lib/elastic_beans/configuration_template/exec.rb

@@ -12,14 +12,18 @@ module ElasticBeans
       protected
 
       # Constructs the configuration for the exec environment.
-      def build_option_settings(**_)
+      def build_option_settings(option_settings: [], **_)
         super + [
-          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "ELASTIC_BEANS_EXEC_QUEUE_URL", override: application.exec_queue_url),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true"),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "ELASTIC_BEANS_EXEC_QUEUE_URL", override: application.exec_queue_url, new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true", new_settings: option_settings),
         ]
       end
+
+      def source_configuration
+        SOURCE_CONFIGURATION
+      end
     end
   end
 end

data/lib/elastic_beans/configuration_template/scheduler.rb

@@ -11,13 +11,17 @@ module ElasticBeans
 
       # Constructs the configuration for the scheduler environment.
       # No special options here!
-      def build_option_settings(**_)
+      def build_option_settings(option_settings: [], **_)
         super + [
-          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true"),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true", new_settings: option_settings),
         ]
       end
+
+      def source_configuration
+        SOURCE_CONFIGURATION
+      end
     end
   end
 end

data/lib/elastic_beans/configuration_template/webserver.rb

@@ -13,35 +13,35 @@ module ElasticBeans
 
       # Constructs the configuration for the webserver environment.
       # All arguments are required on first run.
-      def build_option_settings(network: nil, public_key: nil, ssl_certificate_arn: nil, internal: nil, **_)
-        public_key_policy_names_setting = template_option_setting(namespace: "aws:elb:policies:backendencryption", option_name: "PublicKeyPolicyNames", default: "backendkey")
-        public_key_setting = template_option_setting(namespace: "aws:elb:policies:#{public_key_policy_names_setting[:value]}", option_name: "PublicKey", override: public_key)
-        ssl_certificate_setting = template_option_setting(namespace: "aws:elb:listener:443", option_name: "SSLCertificateId", override: ssl_certificate_arn)
+      def build_option_settings(network: nil, public_key: nil, ssl_certificate_arn: nil, internal: nil, option_settings: [], **_)
+        public_key_policy_names_setting = template_option_setting(namespace: "aws:elb:policies:backendencryption", option_name: "PublicKeyPolicyNames", default: "backendkey", new_settings: option_settings)
+        public_key_setting = template_option_setting(namespace: "aws:elb:policies:#{public_key_policy_names_setting[:value]}", option_name: "PublicKey", override: public_key, new_settings: option_settings)
+        ssl_certificate_setting = template_option_setting(namespace: "aws:elb:listener:443", option_name: "SSLCertificateId", override: ssl_certificate_arn, new_settings: option_settings)
         if public_key_setting[:value].nil? || ssl_certificate_setting[:value].nil?
           raise NoEncryptionSettingsError
         end
 
-        option_settings = [
-          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTPS:443/", allow_blank: false),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_ASSET_COMPILATION", default: "false"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "false"),
-          template_option_setting(namespace: "aws:elb:listener:443", option_name: "InstancePort", default: "443"),
-          template_option_setting(namespace: "aws:elb:listener:443", option_name: "InstanceProtocol", default: "HTTPS"),
-          template_option_setting(namespace: "aws:elb:listener:443", option_name: "ListenerProtocol", default: "HTTPS"),
-          template_option_setting(namespace: "aws:elb:loadbalancer", option_name: "ManagedSecurityGroup", override: managed_security_group(network)),
-          template_option_setting(namespace: "aws:elb:loadbalancer", option_name: "SecurityGroups", override: elb_security_groups(network)),
-          template_option_setting(namespace: "aws:elb:policies", option_name: "ConnectionDrainingEnabled", default: "true"),
-          template_option_setting(namespace: "aws:elb:policies:backendencryption", option_name: "InstancePorts", default: "443"),
+        settings = [
+          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTPS:443/", allow_blank: false, new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_ASSET_COMPILATION", default: "false", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "false", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:listener:443", option_name: "InstancePort", default: "443", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:listener:443", option_name: "InstanceProtocol", default: "HTTPS", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:listener:443", option_name: "ListenerProtocol", default: "HTTPS", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:loadbalancer", option_name: "ManagedSecurityGroup", override: managed_security_group(network), new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:loadbalancer", option_name: "SecurityGroups", override: elb_security_groups(network), new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:policies", option_name: "ConnectionDrainingEnabled", default: "true", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elb:policies:backendencryption", option_name: "InstancePorts", default: "443", new_settings: option_settings),
           public_key_policy_names_setting,
           public_key_setting,
           ssl_certificate_setting,
         ]
         if internal
-          internal_setting = template_option_setting(namespace: "aws:ec2:vpc", option_name: "ELBScheme", override: "internal")
-          option_settings << internal_setting
+          internal_setting = template_option_setting(namespace: "aws:ec2:vpc", option_name: "ELBScheme", override: "internal", new_settings: option_settings)
+          settings << internal_setting
         end
 
-        super + option_settings
+        super + settings
       end
 
       # Removes the "internal" ELB scheme if explicitly disabled with --no-internal.
@@ -64,6 +64,10 @@ module ElasticBeans
         network.elb_security_groups[0] if network
       end
 
+      def source_configuration
+        SOURCE_CONFIGURATION
+      end
+
       # :nodoc: all
       # @!visibility private
       class NoEncryptionSettingsError < ElasticBeans::Error

data/lib/elastic_beans/configuration_template/worker.rb

@@ -24,17 +24,21 @@ module ElasticBeans
       # Constructs the configuration for the worker environments.
       # No special arguments, the +queue+ name is stored from the initializer and is used to look up the appropriate
       # URL.
-      def build_option_settings(**_)
+      def build_option_settings(option_settings: [], **_)
         super + [
-          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "InactivityTimeout", default: "1800"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "MaxRetries", default: "10"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "VisibilityTimeout", default: "1800"),
-          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "WorkerQueueURL", override: application.worker_queue_url(queue)),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTP:80/", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "DISABLE_SQS_CONSUMER", override: "false", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "true", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "InactivityTimeout", default: "1800", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "MaxRetries", default: "10", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "VisibilityTimeout", default: "1800", new_settings: option_settings),
+          template_option_setting(namespace: "aws:elasticbeanstalk:sqsd", option_name: "WorkerQueueURL", override: application.worker_queue_url(queue), new_settings: option_settings),
         ]
       end
+
+      def source_configuration
+        SOURCE_CONFIGURATION
+      end
     end
   end
 end

data/lib/elastic_beans/configuration_template.rb

@@ -10,8 +10,11 @@ module ElasticBeans
   # This is an abstract class; use the provided factories in this class or use a subclass (contained within this
   # namespace) directly.
   class ConfigurationTemplate
-    # The solution stack used for a new application. Should not be hardcoded, but here we are.
-    SOLUTION_STACK_NAME = "64bit Amazon Linux 2016.09 v2.2.0 running Ruby 2.3 (Puma)"
+    # Matches the latest available Ruby Puma solution stack when one was not specified.
+    SOLUTION_STACK_PATTERN = /\A64bit Amazon Linux (?<date>\d+(\.\d+)*) v(?<version>\d+(\.\d+)*) running Ruby (?<ruby_version>\d+(\.\d+)*) \(Puma\)\z/
+    # The source configuration for new configuration templates.
+    # Set to ElasticBeans::ConfigurationTemplate::Base to include all custom configuration that has already been performed.
+    SOURCE_CONFIGURATION = {template_name: "base"}
     # :category: Internal
     WORKER_TEMPLATE_NAME_PATTERN = /\Aworker-(?<queue>\w+)\z/
 
@@ -102,6 +105,11 @@ module ElasticBeans
       @options_to_remove ||= []
     end
 
+    # Finds the latest available Ruby Puma solution stack (matching +SOLUTION_STACK_PATTERN+).
+    def solution_stack_name
+      @solution_stack_name ||= latest_solution_stack
+    end
+
     # Create or update the configuration template in Elastic Beanstalk.
     # Arguments are passed to #build_option_settings and #build_options_to_remove.
     # See the appropriate subclass for what the arguments should be.
@@ -119,7 +127,8 @@ module ElasticBeans
         elastic_beanstalk.create_configuration_template(
           application_name: application.name,
           template_name: name,
-          solution_stack_name: SOLUTION_STACK_NAME,
+          solution_stack_name: solution_stack_name,
+          source_configuration: source_configuration,
           option_settings: option_settings,
         )
       end
@@ -135,12 +144,17 @@ module ElasticBeans
     # :category: Internal
     attr_reader :elastic_beanstalk
 
-    def build_option_settings(**_)
-      []
+    # Returns option settings that should be set on the template.
+    def build_option_settings(option_settings: [], **_)
+      option_settings
     end
 
-    def build_options_to_remove(**_)
-      []
+    # Returns option settings that should be removed from the template.
+    # Will not remove settings that beans has defaults for, even if they aren't being changed right now.
+    def build_options_to_remove(options_to_remove: [], **_)
+      options_to_remove.reject { |setting|
+        option_settings.any? { |new_setting| new_setting[:namespace] == setting[:namespace] && new_setting[:option_name] == setting[:option_name] }
+      }
     end
 
     def configuration_settings_description(template_name = name)
@@ -181,6 +195,36 @@ module ElasticBeans
       retry
     end
 
+    # Finds the latest available Ruby Puma solution stack (matching +SOLUTION_STACK_PATTERN+).
+    def latest_solution_stack
+      latest_stack = nil
+      latest_date = Gem::Version.new("0.0")
+      latest_version = Gem::Version.new("0.0")
+      latest_ruby_version = Gem::Version.new("0.0")
+      elastic_beanstalk.list_available_solution_stacks.solution_stacks.each do |stack|
+        match = SOLUTION_STACK_PATTERN.match(stack)
+        if match
+          stack_date = Gem::Version.new(match[:date])
+          stack_version = Gem::Version.new(match[:version])
+          stack_ruby_version = Gem::Version.new(match[:ruby_version])
+          if stack_date >= latest_date && stack_version >= latest_version && stack_ruby_version >= latest_ruby_version
+            latest_date = stack_date
+            latest_version = stack_version
+            latest_ruby_version = stack_ruby_version
+            latest_stack = stack
+          end
+        end
+      end
+      latest_stack
+    rescue ::Aws::ElasticBeanstalk::Errors::Throttling
+      sleep 5
+      retry
+    end
+
+    def source_configuration
+      SOURCE_CONFIGURATION
+    end
+
     def template_option_setting(
       template: configuration_settings_description,
       environment: environment_configuration_settings_description,
@@ -188,13 +232,21 @@ module ElasticBeans
       option_name:,
       default: nil,
       override: nil,
-      allow_blank: true
+      allow_blank: true,
+      new_settings:
     )
       option_setting = {namespace: namespace, option_name: option_name, value: default}
       if override
         return option_setting.merge!(value: override)
       end
 
+      new_setting = new_settings.find { |setting|
+        setting[:namespace] == namespace && setting[:option_name] == option_name
+      }
+      if new_setting
+        return new_setting
+      end
+
       existing_settings = []
       if environment
         # Persist changes made directly to the environment from the AWS console UI

data/lib/elastic_beans/environment.rb

@@ -116,6 +116,7 @@ module ElasticBeans
       elastic_beanstalk.create_environment(
         application_name: application.name,
         environment_name: name,
+        solution_stack_name: configuration_template.solution_stack_name,
         tier: {name: tier_name, type: tier_type},
         template_name: template_name,
         version_label: version,
@@ -196,6 +197,7 @@ module ElasticBeans
         environment_name: name,
         option_settings: configuration_template.option_settings,
         options_to_remove: configuration_template.options_to_remove,
+        solution_stack_name: configuration_template.solution_stack_name,
       )
       wait_environment(wait_status: "Updating", wait_health_status: "Info") if blocking
     rescue ::Aws::ElasticBeanstalk::Errors::InvalidParameterValue
@@ -245,6 +247,10 @@ module ElasticBeans
     # :category: Internal
     attr_reader :elastic_beanstalk
 
+    def configuration_template
+      ElasticBeans::ConfigurationTemplate.new_from_existing(template_name, application: application, elastic_beanstalk: elastic_beanstalk)
+    end
+
     def environment_description
       elastic_beanstalk.describe_environments(
         environment_names: [name],

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.13.0.alpha3"
+  VERSION = "0.13.0.alpha4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.13.0.alpha3
+  version: 0.13.0.alpha4
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk