elastic_beans 0.11.0 → 0.12.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 898ac7c02cc660301cfce8d699f23b0fd3c161b7
-  data.tar.gz: ee4f74a9d7d591faa9d3376451807e5dd619376c
+  metadata.gz: f7c0cd1ef593783f14539924dda68021f78c5fa0
+  data.tar.gz: 9d3f42eee3bff3cfa8e9af2c59fe0cf492661ed2
 SHA512:
-  metadata.gz: 144633191d7abad8a541fc518f9f6331c5b2e77019ae757aa5317f3854c2194804d4dec47c691afb2da357df19ef90057a979f586ee22e9151690570c879b6b5
-  data.tar.gz: 2c8dc693592e823cac5def085ed5a0405a78dfdb5b6050c19c6d2011d1065f8da868a2287dbc5d5e67284e221a768f4c87b881cd8b5426a5177f05fed4a8eea0
+  metadata.gz: 9764af5c4d6cf9637a21a6383bb52d04adbf37c0fdeeaa99ecb40155666b301368ff77e842a6b0e3fa615e6134f8c88289b444a305f5d29a43e92c71185a48ee
+  data.tar.gz: 7c144fa1983ea8de3dda5623892c94e625f05b2082fda65b758a1070462986d6f216b1e7a47fd274b58532943a9995fadf21c4c0662a615b09328596acd49c0d

data/README.md

@@ -24,9 +24,11 @@ As the SDK documentation suggests, using environment variables is recommended.
 
     # Pre-configure the application before creating environments
     beans configure -n myapp-networking -a myapp \
-      -b SECRET_KEY_BASE -d DATABASE_URL -k KEYPAIR \
-      -p INTERNAL_PUBLIC_KEY -s SSL_CERTIFICATE_ARN \
-      [-i IMAGE_ID] [-t INSTANCE_TYPE]
+      -p INTERNAL_PUBLIC_KEY -s SSL_CERTIFICATE_ARN -k KEYPAIR \
+      [-o 'OPTION_SETTING_NAMESPACE/OPTION_NAME=VALUE'...]
+    beans setenv -a myapp \
+      DATABASE_URL=mysql2://db.example.com:3306/myapp \
+      SECRET_KEY_BASE=abc123
 
     # Create a webserver environment with a pretty DNS name at myapp.TLD (managed by Route53)
     beans create -a myapp [-d myapp.TLD] [--tags=Environment:production Team:Unicorn] webserver
@@ -63,9 +65,8 @@ As the SDK documentation suggests, using environment variables is recommended.
 
     # Update all existing environments and configuration
     beans configure -n myapp-networking -a myapp \
-      [-b SECRET_KEY_BASE] [-d DATABASE_URL] [-k KEYPAIR] \
-      [-p INTERNAL_PUBLIC_KEY] [-s SSL_CERTIFICATE_ARN] \
-      [-i IMAGE_ID] [-t INSTANCE_TYPE]
+      [-p INTERNAL_PUBLIC_KEY] [-s SSL_CERTIFICATE_ARN] [-k KEYPAIR] \
+      [-o 'OPTION_SETTING_NAMESPACE/OPTION_NAME=VALUE'...]
 
 ### API
 

data/exe/beans

@@ -2,14 +2,18 @@
 
 Signal.trap("INT") do
   puts "\nInterrupting beans -- if an operation was in progress, it will still be running."
-  exit 130
+  raise Interrupt
 end
 
 Signal.trap("TERM") do
   puts "Terminating beans -- if an operation was in progress, it will still be running."
-  exit 143
+  raise SignalException.new("TERM")
 end
 
 require "elastic_beans/cli"
 
-ElasticBeans::CLI.start(ARGV)
+begin
+  ElasticBeans::CLI.start(ARGV)
+rescue SignalException => e
+  exit(128 + e.signo)
+end

data/lib/elastic_beans/cli.rb

@@ -16,25 +16,21 @@ 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 :database_url, aliases: %w(-d), desc: "The DATABASE_URL for the Rails application"
-  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 :secret_key_base, aliases: %w(-b), desc: "The SECRET_KEY_BASE for the Rails application"
   option :ssl_certificate_arn, aliases: %w(-s), desc: "The ARN of the SSL server certificate stored in IAM to attach to the ELB"
   def configure
     @verbose = options[:verbose]
     ElasticBeans::Command::Configure.new(
-      database_url: options[:database_url],
-      image_id: options[:image_id],
-      instance_type: options[:instance_type],
       internal: options[:internal],
       keypair: options[:keypair],
       public_key: options[:public_key],
-      secret_key_base: options[:secret_key_base],
       ssl_certificate_arn: options[:ssl_certificate_arn],
+      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,28 +16,24 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
       LONG_DESC
 
       def initialize(
-        database_url:,
-        image_id:,
-        instance_type:,
         internal:,
         keypair:,
         public_key:,
-        secret_key_base:,
         ssl_certificate_arn:,
+        option_settings:,
+        option_settings_to_remove:,
         application:,
         network:,
         elastic_beanstalk:,
         iam:,
         ui:
       )
-        @database_url = database_url
-        @image_id = image_id
-        @instance_type = instance_type
         @internal = internal
         @keypair = keypair
         @public_key = public_key
-        @secret_key_base = secret_key_base
         @ssl_certificate_arn = ssl_certificate_arn
+        @option_setting_strings = option_settings
+        @option_strings_to_remove = option_settings_to_remove
         @application = application
         @network = network
         @elastic_beanstalk = elastic_beanstalk
@@ -64,11 +60,9 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         base_config.upsert(
           network: network,
-          database_url: database_url,
-          secret_key_base: secret_key_base,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         progressbar.increment
@@ -80,12 +74,10 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         webserver_config.upsert(
           network: network,
-          database_url: database_url,
-          secret_key_base: secret_key_base,
-          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,
@@ -106,11 +98,9 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         exec_config.upsert(
           network: network,
-          database_url: database_url,
-          secret_key_base: secret_key_base,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         exec_environment = exec_config.environment
@@ -129,11 +119,9 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         )
         scheduler_config.upsert(
           network: network,
-          database_url: database_url,
-          secret_key_base: secret_key_base,
-          image_id: image_id,
-          instance_type: instance_type,
           keypair: keypair,
+          option_settings: option_settings,
+          options_to_remove: options_to_remove,
           iam: iam,
         )
         scheduler_environment = scheduler_config.environment
@@ -154,11 +142,9 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           )
           worker_config.upsert(
             network: network,
-            database_url: database_url,
-            secret_key_base: secret_key_base,
-            image_id: image_id,
-            instance_type: instance_type,
             keypair: keypair,
+            option_settings: option_settings,
+            options_to_remove: options_to_remove,
             iam: iam,
           )
           worker_environment = worker_config.environment
@@ -178,19 +164,75 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
       attr_reader(
         :application,
-        :database_url,
-        :image_id,
-        :instance_type,
         :internal,
         :keypair,
         :network,
         :public_key,
-        :secret_key_base,
         :ssl_certificate_arn,
         :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/exec.rb

@@ -109,9 +109,13 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           rescue ElasticBeans::SSH::BastionAuthenticationError => e
             raise BastionAuthenticationError.new(cause: e)
           ensure
-            ui.info("Cleaning up, please do not interrupt!")
-            application.kill_command(freeze_command)
-            application.deregister_command(command)
+            begin
+              ui.info("Cleaning up, please do not interrupt!")
+              application.kill_command(freeze_command)
+              application.deregister_command(command)
+            rescue Interrupt
+              retry
+            end
           end
         else
           application.enqueue_command(command)

data/lib/elastic_beans/configuration_template/base.rb

@@ -13,66 +13,56 @@ module ElasticBeans
       protected
 
       # Constructs the common configuration for all environments.
-      # +network+, +database_url+, +secret_key_base+, +keypair+, and +iam+ are all required on first run.
+      # +network+, +keypair+, and +iam+ are all required on first run.
       def build_option_settings(
         network: nil,
-        database_url: nil,
-        secret_key_base: nil,
         keypair: nil,
         iam: nil,
-        image_id: nil,
-        instance_type: nil,
         min_size: nil,
         max_size: nil,
+        option_settings: [],
         **_
       )
         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)
-        database_url_setting = template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "DATABASE_URL", override: database_url)
-        secret_key_base_setting = template_option_setting(template: template, namespace: "aws:elasticbeanstalk:application:environment", option_name: "SECRET_KEY_BASE", override: secret_key_base)
-        if database_url_setting[:value].nil? || secret_key_base_setting[:value].nil? || keypair_setting[:value].nil?
+        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(
-            database_url: database_url_setting[:value],
-            secret_key_base: secret_key_base_setting[:value],
             keypair: keypair_setting[:value],
           )
         end
 
         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)),
+        super + [
+          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,
-          database_url_setting,
-          secret_key_base_setting,
         ]
-        if image_id
-          settings << template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "ImageId", override: image_id)
-        end
-        settings
+      end
+
+      def source_configuration
+        nil
       end
 
       private
@@ -127,9 +117,7 @@ module ElasticBeans
       # :nodoc: all
       # @!visibility private
       class MissingOptionsError < ElasticBeans::Error
-        def initialize(database_url:, secret_key_base:, keypair:)
-          @database_url = database_url
-          @secret_key_base = secret_key_base
+        def initialize(keypair:)
           @keypair = keypair
         end
 
@@ -137,15 +125,9 @@ module ElasticBeans
           require "elastic_beans/cli"
           require "elastic_beans/cli/string_shell"
           msg = "Some required options are missing and must be set when configuring an application:\n\n"
-          if @database_url.nil?
-            msg << "--database-url DATABASE_URL must point to a valid database, and is required for running a Rails application\n"
-          end
           if @keypair.nil?
             msg << "--keypair KEYPAIR must be a valid EC2 key pair, and will be used on Elastic Beanstalk instances\n"
           end
-          if @secret_key_base.nil?
-            msg << "--secret-key-base SECRET_KEY_BASE can be any value, and is required for running a Rails application\n"
-          end
           msg << <<-MESSAGE
 
 Please re-run `#{command_as_string "configure"}` with these options.

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

@@ -11,7 +11,10 @@ module ElasticBeans
   # 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)"
+    SOLUTION_STACK_NAME = "64bit Amazon Linux 2016.09 v2.3.3 running Ruby 2.3 (Puma)"
+    # 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/
 
@@ -120,6 +123,7 @@ module ElasticBeans
           application_name: application.name,
           template_name: name,
           solution_stack_name: SOLUTION_STACK_NAME,
+          source_configuration: source_configuration,
           option_settings: option_settings,
         )
       end
@@ -135,12 +139,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 +190,10 @@ module ElasticBeans
       retry
     end
 
+    def source_configuration
+      SOURCE_CONFIGURATION
+    end
+
     def template_option_setting(
       template: configuration_settings_description,
       environment: environment_configuration_settings_description,
@@ -188,13 +201,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/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.11.0"
+  VERSION = "0.12.0.alpha1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0.alpha1
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -250,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11