elastic_beans 0.11.0.alpha2 → 0.11.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf29882390196563d6e401c86f27aa56099845d
-  data.tar.gz: 1ecd6fd9e0f45035e3e3f236946c55f4f50ec17b
+  metadata.gz: 447c3a015ec047c6869fb9cb7f0aed2f705f8478
+  data.tar.gz: 6bb14f4d01a75b033ce771359bb2749b9826f15c
 SHA512:
-  metadata.gz: 5470ba71fd7685d7d68f6e52770c10f5265189dc6777a53b6c2aaf9e2f01f2fef57f2704aae8693d6f9005ae567461a7ddda656bf144dbb225ec7f9c4860aa21
-  data.tar.gz: 14708dd76eeeedda6256cecb732610852e9c4ab15cf5994bcc44c41045bd0a05410bf688c9e27e4408e0243dcd77148fd4dccfea183667c1a159e5d96d9d43f3
+  metadata.gz: 90923ac6059ab4623182556cb7b07917edc075ff71e7fe213df7826d7c4e61362f4bdab240dc57c58939e53554daa4794b6e7d2216c47207e248e6cbed448d3c
+  data.tar.gz: 37d5e729599034467b376668822b5ee45494650da65d58b282225686116612332f29b045b586a27f72b6f8d72039269b0000b83ebab3d1e0b7bb874bb069fcf8

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]
+      -k KEYPAIR [-i IMAGE_ID] [-t INSTANCE_TYPE]
+    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]
+      [-k KEYPAIR] [-i IMAGE_ID] [-t INSTANCE_TYPE]
 
 ### API
 
@@ -230,58 +231,8 @@ Elastic Beans will set the `DISABLE_SQS_CONSUMER` environment variable appropria
 
 ### Known issues and limitations of the pre-release
 
-Elastic Beans still has some rough edges that need to be worked out.
-
-#### Authentication with AWS uses environment variables
-
-Use the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables to authenticate with the AWS SDK.
-
-#### Creating multiple environments simultaneously causes sample application to be deployed
-
-Due to a bug in the version-finding code, creating multiple environments simultaneously can cause a sample application to be deployed to one of them (an empty version label).
-
-#### End-to-end encryption requires some custom setup
-
-Currently (pre-1.0), you must set up HTTPS yourself in nginx using an ebextension.
-Use whatever certificate you like to do so, even a self-signed certificate is fine.
-Use the public key from this certificate as the `--public-key` option to `beans configure`.
-
-#### Environment variables are not access-controlled
-
-Environment variables are stored in plain-text in S3.
-Anyone with access to the Elastic Beanstalk bucket (for instance, the Elastic Beanstalk instance profile) can read the environment variables.
-
-#### Rate limiting
-
-Running several beans tasks concurrently can cause Elastic Beanstalk rate-limiting on the AWS account.
-
-#### SIGINT causes a stack trace
-
-Sorry `¯\_(ツ)_/¯`
-
-#### Solution stack is hard-coded
-
-If you do not use a custom image, the solution stack will start as a hard-coded value.
-It will also be up to you to update it.
-
-#### Uses default Elastic Beanstalk IAM settings and S3 bucket
-
-Elastic Beans looks for [the default Elastic Beanstalk IAM instance profile and service role][iam].
-As the linked document explains, the easiest way to create them is to create a sample application in the AWS console.
-
-Creating the sample application should also create the default Elastic Beanstalk S3 bucket, which has a name of the form `elasticbeanstalk-REGION-ACCOUNT_ID`.
-Elastic Beans will use this bucket to store application versions and environment variables.
-
-[iam]: http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts-roles.html
-
-#### Worker environment health check requires some custom setup
-
-Elastic Beanstalk worker environments (aws-sqsd) must use a non-SSL health check.
-Your Rails application must implement this as a middleware (or lower in the stack) before Rails enforces SSL.
-
-#### Worker environment visibility timeout is hard-coded
-
-1800 seconds is the longest it can be.
+Elastic Beans is in pre-release and still has some rough edges that need to be worked out.
+See [the wiki page](https://github.com/onemedical/elastic_beans/wiki/Known-Issues).
 
 ## Installation
 

data/lib/elastic_beans/aws/cloudformation_stack.rb

@@ -42,6 +42,9 @@ module ElasticBeans
         raise MissingStackError.new(stack_name: stack_name)
       rescue ::Aws::CloudFormation::Errors::AccessDenied
         raise AccessDeniedCloudFormationError.new(stack_name: stack_name)
+      rescue ::Aws::CloudFormation::Errors::Throttling
+        sleep 5
+        retry
       end
 
       class MissingStackError < ElasticBeans::Error

data/lib/elastic_beans/cli.rb

@@ -16,24 +16,20 @@ 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,13 +16,11 @@ 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:,
@@ -30,13 +28,11 @@ 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
@@ -64,8 +60,6 @@ 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,
@@ -80,8 +74,6 @@ 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,
@@ -106,8 +98,6 @@ 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,
@@ -129,8 +119,6 @@ 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,
@@ -154,8 +142,6 @@ 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,
@@ -178,14 +164,12 @@ 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,6 +109,7 @@ 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("\nCleaning up, please do not interrupt!")
             application.kill_command(freeze_command)
             application.deregister_command(command)
           end

data/lib/elastic_beans/configuration_template/base.rb

@@ -13,11 +13,9 @@ 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,
@@ -34,12 +32,8 @@ module ElasticBeans
         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?
+        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
@@ -66,8 +60,6 @@ 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)
@@ -127,9 +119,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 +127,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/version.rb

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

metadata

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