elastic_beans 0.10.1 → 0.11.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714445d0f639a4723d4be711674e6f52465c9bdf
-  data.tar.gz: 35672259e4af742334994844dec0662c5db64844
+  metadata.gz: 7cf29882390196563d6e401c86f27aa56099845d
+  data.tar.gz: 1ecd6fd9e0f45035e3e3f236946c55f4f50ec17b
 SHA512:
-  metadata.gz: 6295eedfb8c06ebbaa3ca129247b1d6fa0e8d5e697f2539e00d09d981712cdeb4a3fb885caee5e2de74451c68fcc64d106f1ecace0495aafbf2da7ded8fb53d3
-  data.tar.gz: 18bb613c79a435f596a18d336ccc077a1cd5e0bfe758f2a82c503710b3222fbbef84fc05dca0a3d93735a2e980636f1a74365bbd9baaf0fa4fcb5ba7caa6a203
+  metadata.gz: 5470ba71fd7685d7d68f6e52770c10f5265189dc6777a53b6c2aaf9e2f01f2fef57f2704aae8693d6f9005ae567461a7ddda656bf144dbb225ec7f9c4860aa21
+  data.tar.gz: 14708dd76eeeedda6256cecb732610852e9c4ab15cf5994bcc44c41045bd0a05410bf688c9e27e4408e0243dcd77148fd4dccfea183667c1a159e5d96d9d43f3

data/lib/elastic_beans/cli.rb

@@ -19,6 +19,7 @@ class ElasticBeans::CLI < Thor
   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 :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"
@@ -29,6 +30,7 @@ class ElasticBeans::CLI < Thor
       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],

data/lib/elastic_beans/command/configure.rb

@@ -19,6 +19,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         database_url:,
         image_id:,
         instance_type:,
+        internal:,
         keypair:,
         public_key:,
         secret_key_base:,
@@ -32,6 +33,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         @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
@@ -82,6 +84,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           secret_key_base: secret_key_base,
           image_id: image_id,
           instance_type: instance_type,
+          internal: internal,
           keypair: keypair,
           iam: iam,
           public_key: public_key,
@@ -178,6 +181,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         :database_url,
         :image_id,
         :instance_type,
+        :internal,
         :keypair,
         :network,
         :public_key,

data/lib/elastic_beans/configuration_template/webserver.rb

@@ -13,7 +13,7 @@ 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, **_)
+      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)
@@ -21,7 +21,7 @@ module ElasticBeans
           raise NoEncryptionSettingsError
         end
 
-        super + [
+        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"),
@@ -36,6 +36,24 @@ module ElasticBeans
           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
+        end
+
+        super + option_settings
+      end
+
+      # Removes the "internal" ELB scheme if explicitly disabled with --no-internal.
+      def build_options_to_remove(internal: nil, **_)
+        option_settings = []
+
+        # Only remove this setting if internal has explicitly been disabled
+        if internal == false
+          option_settings << {namespace: "aws:ec2:vpc", option_name: "ELBScheme"}
+        end
+
+        super + option_settings
       end
 
       def elb_security_groups(network)

data/lib/elastic_beans/configuration_template.rb

@@ -11,7 +11,7 @@ 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)"
     # :category: Internal
     WORKER_TEMPLATE_NAME_PATTERN = /\Aworker-(?<queue>\w+)\z/
 
@@ -94,16 +94,26 @@ module ElasticBeans
       @option_settings ||= build_option_settings
     end
 
+    # Returns options to remove built in #upsert, or returns an empty array.
+    # Will only be present if some options have been explicitly removed.
+    def options_to_remove
+      # If #upsert has not been called, return an empty array.
+      # Nothing to remove unless options were explicitly disabled via #upsert.
+      @options_to_remove ||= []
+    end
+
     # Create or update the configuration template in Elastic Beanstalk.
-    # Arguments are passed to #build_option_settings.
+    # Arguments are passed to #build_option_settings and #build_options_to_remove.
     # See the appropriate subclass for what the arguments should be.
     def upsert(**args)
       @option_settings = build_option_settings(**args)
+      @options_to_remove = build_options_to_remove(**args)
       if configuration_settings_description
         elastic_beanstalk.update_configuration_template(
           application_name: application.name,
           template_name: name,
           option_settings: option_settings,
+          options_to_remove: options_to_remove,
         )
       else
         elastic_beanstalk.create_configuration_template(
@@ -129,6 +139,10 @@ module ElasticBeans
       []
     end
 
+    def build_options_to_remove(**_)
+      []
+    end
+
     def configuration_settings_description(template_name = name)
       @configuration_templates ||= {}
       return @configuration_templates[template_name] if @configuration_templates[template_name]

data/lib/elastic_beans/environment.rb

@@ -195,6 +195,7 @@ module ElasticBeans
       elastic_beanstalk.update_environment(
         environment_name: name,
         option_settings: configuration_template.option_settings,
+        options_to_remove: configuration_template.options_to_remove,
       )
       wait_environment(wait_status: "Updating", wait_health_status: "Info")
     rescue ::Aws::ElasticBeanstalk::Errors::InvalidParameterValue

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.10.1"
+  VERSION = "0.11.0.alpha2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.alpha2
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-15 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