elastic_beans 0.10.0.alpha8 → 0.10.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843741dfe28731c105f2cff03af109344d6a9f73
-  data.tar.gz: 71f309179d84ab04bc50b1bf8eee1dd04d0dd349
+  metadata.gz: 6bf87e14e7101b7ffb8f974a6ba2fd64b36304ae
+  data.tar.gz: db065ea1e6727b6fa2203947afa3f8a29d32ec2e
 SHA512:
-  metadata.gz: 850f886ad6834f9af32a6145e9806ee3d8abb422b500b017d59d31cb799265934851cf0d59ee29764ae410a835a30665d338047633155ca738db04240f441d14
-  data.tar.gz: 120afffc8bcab1a865cb5cb50eec609aed620c6acd21b144839d2b93ecb6fe52a58f6fc0e67dc60bdb00ca5d9115f3f482ad3a9a04b6cbac2a2a5e41c31a74ac
+  metadata.gz: 414cbf0c9e97668e9b3dc15b444e14610fe1e95c26f916d2a856dfb74afb1318e62be9d849cd76ffc9b213fbee3dd340fd0c940feeb5bde6aa1f895a4135b44f
+  data.tar.gz: 83b295ffc45704d6c8e1af5ed0c8318156f076a01b2d990c179b5106978ae5ad44c59725143a7c6e7b7b83612912faa177bc76fc5ce0ec4deeea024a8a71829f

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,12 @@ 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
 
       def elb_security_groups(network)

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.10.0.alpha8"
+  VERSION = "0.10.0.alpha9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.10.0.alpha8
+  version: 0.10.0.alpha9
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk