elastic_beans 0.11.0.alpha5 → 0.11.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced35135b31c46cdc993f0e19d7e73c6219ed72d
-  data.tar.gz: 3b028b2d8b6c0b9bfe7da052cca5fd4a66e90cb6
+  metadata.gz: ab4560c3622e7fe3d379e37a6691663abdafe52c
+  data.tar.gz: 9ec0036df9f9df63f1687be7c668244acc231727
 SHA512:
-  metadata.gz: 90d8f569a7ed92b940fd9e713278dd9afe6e42cc1873c2456f5fbd84a63e14f73c030683e03e0dc1f9c06c581e45e4c30c089bb60b1c3d9246a5d0cd7ba7a898
-  data.tar.gz: 1a8be85e3b7624ee55c9105f84d9e83530d874ee8bbe13648c0869f9ad0eb05dfa1c032da7d1e57f5d7e143f232c6047e472094755076237f3fb52de7e521d46
+  metadata.gz: 71a71115042d5a7128f0803754ef5120b2a8aa96b85e6454b5e2c08f719877ba856574566281227a375dbbbd4788e33c2733b89f17dc416638c4e5f79fb3df2d
+  data.tar.gz: 800d01320e7cf59f0d4ba8e654b643086094cfa103514b542af5aba7cce63908cfb4740039c5aa2c5eae7238c1fcb249f78536b9d4364deb107bd529e8eb2b40

data/README.md

@@ -194,9 +194,11 @@ It must have the following outputs, which will be used for the corresponding set
 * `ApplicationSecurityGroup` - [`aws:autoscaling:launchconfiguration/SecurityGroups`][launchconfiguration]
     * Allow TCP connections from the `ELBSecurityGroup` on ports 80 and 443
 * `ApplicationSubnet` - [`aws:ec2:vpc/Subnets`][vpc]
+    * Use multiple subnets by appending digits to this name, e.g. `ApplicationSubnet` and `ApplicationSubnet2`
 * `ELBSecurityGroup` - [`aws:elb:loadbalancer/SecurityGroups`][loadbalancer], [`aws:elb:loadbalancer/ManagedSecurityGroup`][loadbalancer]
     * Allow TCP connections on ports 80 and 443 from `0.0.0.0/0`
 * `ELBSubnet` - [`aws:ec2:vpc/ELBSubnets`][vpc]
+    * Use multiple subnets by appending digits to this name, e.g. `ELBSubnet` and `ELBSubnet2`
 * `SSHSecurityGroup` - [`aws:ec2:vpc/Subnets`][vpc]
     * Allow TCP connections from your VPC on ports 80 and 443
 * `VpcId` - [`aws:ec2:vpc/VPCId`][vpc]

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/aws/cloudformation_stack.rb

@@ -9,15 +9,17 @@ module ElasticBeans
     class CloudformationStack
       STACK_STATUSES = %w(CREATE_COMPLETE UPDATE_COMPLETE UPDATE_ROLLBACK_COMPLETE)
 
-      def initialize(stack_name, cloudformation:)
-        @stack_name = stack_name
+      attr_reader :name
+
+      def initialize(name, cloudformation:)
+        @name = name
         @cloudformation = cloudformation
       end
 
       def stack_output(output_key)
         output = stack.outputs.find { |o| o.output_key == output_key }
         unless output
-          raise MissingOutputError.new(stack_name: stack_name, output_key: output_key)
+          raise MissingOutputError.new(stack_name: name, output_key: output_key)
         end
         output.output_value
       end
@@ -28,20 +30,20 @@ module ElasticBeans
 
       private
 
-      attr_reader :stack_name, :cloudformation
+      attr_reader :cloudformation
 
       def stack
-        s = cloudformation.describe_stacks(stack_name: stack_name).stacks.find { |stack|
+        s = cloudformation.describe_stacks(stack_name: name).stacks.find { |stack|
           STACK_STATUSES.include?(stack.stack_status)
         }
         unless s
-          raise MissingStackError.new(stack_name: stack_name)
+          raise MissingStackError.new(stack_name: name)
         end
         s
       rescue ::Aws::CloudFormation::Errors::ValidationError
-        raise MissingStackError.new(stack_name: stack_name)
+        raise MissingStackError.new(stack_name: name)
       rescue ::Aws::CloudFormation::Errors::AccessDenied
-        raise AccessDeniedCloudFormationError.new(stack_name: stack_name)
+        raise AccessDeniedCloudFormationError.new(stack_name: name)
       rescue ::Aws::CloudFormation::Errors::Throttling
         sleep 5
         retry

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/network.rb

@@ -5,8 +5,10 @@ module ElasticBeans
   class Network
     APPLICATION_SECURITY_GROUP_KEY = "ApplicationSecurityGroup"
     APPLICATION_SUBNET_KEY = "ApplicationSubnet"
+    APPLICATION_SUBNET_KEY_PATTERN = /\AApplicationSubnet\d*\z/
     ELB_SECURITY_GROUP_KEY = "ELBSecurityGroup"
     ELB_SUBNET_KEY = "ELBSubnet"
+    ELB_SUBNET_KEY_PATTERN = /\AELBSubnet\d*\z/
     SSH_SECURITY_GROUP_KEY = "SSHSecurityGroup"
     VPC_KEY = "VpcId"
 
@@ -19,7 +21,11 @@ module ElasticBeans
     end
 
     def application_subnets
-      [stack.stack_output(APPLICATION_SUBNET_KEY)]
+      subnet_outputs = stack.stack_outputs.select { |key, value| key =~ APPLICATION_SUBNET_KEY_PATTERN }
+      if subnet_outputs.empty?
+        raise MissingNetworkingError.new(stack: stack, key: APPLICATION_SUBNET_KEY)
+      end
+      subnet_outputs.values
     end
 
     def elb_security_groups
@@ -27,7 +33,11 @@ module ElasticBeans
     end
 
     def elb_subnets
-      [stack.stack_output(ELB_SUBNET_KEY)]
+      subnet_outputs = stack.stack_outputs.select { |key, value| key =~ ELB_SUBNET_KEY_PATTERN }
+      if subnet_outputs.empty?
+        raise MissingNetworkingError.new(stack: stack, key: ELB_SUBNET_KEY)
+      end
+      subnet_outputs.values
     end
 
     def ssh_security_group
@@ -41,5 +51,17 @@ module ElasticBeans
     private
 
     attr_reader :stack
+
+    class MissingNetworkingError < ElasticBeans::Error
+      def initialize(stack:, key:)
+        @stack = stack
+        @key = key
+      end
+
+      def message
+        "Networking stack '#{@stack.name}' is missing output '#{@key}'." \
+          " Make sure the stack matches the outputs required."
+      end
+    end
   end
 end

data/lib/elastic_beans/version.rb

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

metadata

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