elastic_beans 0.11.0.alpha7 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab4560c3622e7fe3d379e37a6691663abdafe52c
-  data.tar.gz: 9ec0036df9f9df63f1687be7c668244acc231727
+  metadata.gz: 898ac7c02cc660301cfce8d699f23b0fd3c161b7
+  data.tar.gz: ee4f74a9d7d591faa9d3376451807e5dd619376c
 SHA512:
-  metadata.gz: 71a71115042d5a7128f0803754ef5120b2a8aa96b85e6454b5e2c08f719877ba856574566281227a375dbbbd4788e33c2733b89f17dc416638c4e5f79fb3df2d
-  data.tar.gz: 800d01320e7cf59f0d4ba8e654b643086094cfa103514b542af5aba7cce63908cfb4740039c5aa2c5eae7238c1fcb249f78536b9d4364deb107bd529e8eb2b40
+  metadata.gz: 144633191d7abad8a541fc518f9f6331c5b2e77019ae757aa5317f3854c2194804d4dec47c691afb2da357df19ef90057a979f586ee22e9151690570c879b6b5
+  data.tar.gz: 2c8dc693592e823cac5def085ed5a0405a78dfdb5b6050c19c6d2011d1065f8da868a2287dbc5d5e67284e221a768f4c87b881cd8b5426a5177f05fed4a8eea0

data/README.md

@@ -24,11 +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 \
+      -b SECRET_KEY_BASE -d DATABASE_URL -k KEYPAIR \
       -p INTERNAL_PUBLIC_KEY -s SSL_CERTIFICATE_ARN \
-      -k KEYPAIR [-i IMAGE_ID] [-t INSTANCE_TYPE]
-    beans setenv -a myapp \
-      DATABASE_URL=mysql2://db.example.com:3306/myapp \
-      SECRET_KEY_BASE=abc123
+      [-i IMAGE_ID] [-t INSTANCE_TYPE]
 
     # 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
@@ -65,8 +63,9 @@ 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] \
-      [-k KEYPAIR] [-i IMAGE_ID] [-t INSTANCE_TYPE]
+      [-i IMAGE_ID] [-t INSTANCE_TYPE]
 
 ### API
 

data/exe/beans

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

data/lib/elastic_beans/cli.rb

@@ -16,20 +16,24 @@ 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 :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],
       application: application(name: options[:application]),
       network: network(stack_name: options[:network]),

data/lib/elastic_beans/command/configure.rb

@@ -16,11 +16,13 @@ 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:,
         application:,
         network:,
@@ -28,11 +30,13 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         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
         @application = application
         @network = network
@@ -60,6 +64,8 @@ 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,
@@ -74,6 +80,8 @@ 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,
@@ -98,6 +106,8 @@ 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,
@@ -119,6 +129,8 @@ 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,
@@ -142,6 +154,8 @@ 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,
@@ -164,12 +178,14 @@ 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,

data/lib/elastic_beans/command/exec.rb

@@ -109,13 +109,9 @@ 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
-            begin
-              ui.info("Cleaning up, please do not interrupt!")
-              application.kill_command(freeze_command)
-              application.deregister_command(command)
-            rescue Interrupt
-              retry
-            end
+            ui.info("Cleaning up, please do not interrupt!")
+            application.kill_command(freeze_command)
+            application.deregister_command(command)
           end
         else
           application.enqueue_command(command)

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.3.3 running Ruby 2.3 (Puma)"
+    SOLUTION_STACK_NAME = "64bit Amazon Linux 2016.09 v2.2.0 running Ruby 2.3 (Puma)"
     # :category: Internal
     WORKER_TEMPLATE_NAME_PATTERN = /\Aworker-(?<queue>\w+)\z/
 

data/lib/elastic_beans/configuration_template/base.rb

@@ -13,9 +13,11 @@ module ElasticBeans
       protected
 
       # Constructs the common configuration for all environments.
-      # +network+, +keypair+, and +iam+ are all required on first run.
+      # +network+, +database_url+, +secret_key_base+, +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,
@@ -32,8 +34,12 @@ module ElasticBeans
         end
 
         keypair_setting = template_option_setting(template: template, namespace: "aws:autoscaling:launchconfiguration", option_name: "EC2KeyName", override: keypair)
-        if keypair_setting[:value].nil?
+        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?
           raise MissingOptionsError.new(
+            database_url: database_url_setting[:value],
+            secret_key_base: secret_key_base_setting[:value],
             keypair: keypair_setting[:value],
           )
         end
@@ -60,6 +66,8 @@ module ElasticBeans
           template_option_setting(template: template, namespace: "aws:ec2:vpc", option_name: "VPCId", override: vpc_id(network)),
           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)
@@ -119,7 +127,9 @@ module ElasticBeans
       # :nodoc: all
       # @!visibility private
       class MissingOptionsError < ElasticBeans::Error
-        def initialize(keypair:)
+        def initialize(database_url:, secret_key_base:, keypair:)
+          @database_url = database_url
+          @secret_key_base = secret_key_base
           @keypair = keypair
         end
 
@@ -127,9 +137,15 @@ 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.11.0.alpha7
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam Stegman
@@ -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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11