convection 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d27d6e4bf8123a1f14054c838e722cc1828734
-  data.tar.gz: c8bad8c61c133dcc317babdceedab288eb9488fa
+  metadata.gz: 973023aa6d5f219238792f3a0c82cab3404b2801
+  data.tar.gz: 4ff627e74f2ec7e9d6c3c076c0992a88a339f874
 SHA512:
-  metadata.gz: 9b8ea1cf4cb5ff942423e48241126be05a874a30beb6d70fc2dfb632247df22da9937daeb239b3b17e6138fec06509459f170930f58f062b651645dd9fc8deed
-  data.tar.gz: af1aa6d83c2ee44fe211e6770fb23ab4b601f6b6dad1728e4211e125d90093129df9d63d5a500e025a48628b9e5fbe6e0f683940bb8806bafad1eeaf619cee85
+  metadata.gz: 9e9514b28524fdcf080894016117ca4aeb12494c9caf0e68fd0735dbeda32d20ddb4c75c8c600e74de55df20a933da5c6d59936df639541227a705377cf23b3d
+  data.tar.gz: 0cc0ad13e48f372d1e63df73e5ef3dbec8e83e8db8ca321a1666edd3eadac36f4698de531daefdb3b698db92e5129474c76149931de1c3917529edf24a4b9f58

data/.rubocop_todo.yml

@@ -23,7 +23,7 @@ Metrics/AbcSize:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 267
+  Max: 304
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
@@ -38,7 +38,7 @@ Metrics/LineLength:
 # Offense count: 32
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 35
+  Max: 37
 
 # Offense count: 5
 Metrics/PerceivedComplexity:

data/Gemfile

@@ -7,7 +7,7 @@ group :development do
   gem 'bundler', '~> 1.7'
   gem 'minitest'
   gem 'rake', '~> 10.0'
-  gem 'rubocop', '~> 0.34'
+  gem 'rubocop', '~> 0.40.0'
   gem 'simplecov'
   gem 'thor-scmversion', '= 1.7.0'
 end

data/bin/convection

@@ -26,15 +26,15 @@ module Convection
       end
     end
 
-    desc 'diff', 'Show changes that will be applied by converge'
+    desc 'diff STACK', 'Show changes that will be applied by converge'
     option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress'
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
-    def diff
+    def diff(stack = nil)
       @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
 
       last_event = nil
 
-      @cloud.diff do |d|
+      @cloud.diff(stack) do |d|
         if d.is_a? Model::Event
           if options[:'very-verbose']
             say_status(*d.to_thor)

data/lib/convection/control/cloud.rb

@@ -43,15 +43,19 @@ module Convection
         end
       end
 
-      def diff(&block)
+      def diff(to_stack, &block)
         @cloudfile.deck.each do |stack|
           block.call(Model::Event.new(:compare, "Compare local state of stack #{ stack.name } (#{ stack.cloud_name }) with remote template", :info))
-          sleep rand @cloudfile.splay || 2
 
           difference = stack.diff
-          next block.call(Model::Event.new(:unchanged, "Stack #{ stack.cloud_name } Has no changes", :info)) if difference.empty?
+          if difference.empty?
+            difference << Model::Event.new(:unchanged, "Stack #{ stack.cloud_name } Has no changes", :info)
+          end
 
           difference.each { |diff| block.call(diff) }
+
+          break if !to_stack.nil? && stack.name == to_stack
+          sleep rand @cloudfile.splay || 2
         end
       end
     end

data/lib/convection/control/stack.rb

@@ -20,6 +20,7 @@ module Convection
       attr_reader :resources
       attr_reader :attribute_mapping_values
       attr_reader :outputs
+      attr_reader :tasks
 
       ## AWS-SDK
       attr_accessor :region
@@ -52,7 +53,7 @@ module Convection
       ## Internal status
       NOT_CREATED = 'NOT_CREATED'.freeze
 
-      def initialize(name, template, options = {})
+      def initialize(name, template, options = {}, &block)
         @name = name
         @template = template.clone(self)
         @errors = []
@@ -83,6 +84,8 @@ module Convection
         @id = nil
         @outputs = {}
         @resources = {}
+        @tasks = { after_create: [], after_delete: [], before_create: [], before_delete: [] }
+        instance_exec(&block) if block
         @current_template = {}
         @last_event_seen = nil
 
@@ -131,8 +134,7 @@ module Convection
         [CREATE_IN_PROGRESS, ROLLBACK_IN_PROGRESS, DELETE_IN_PROGRESS,
          UPDATE_IN_PROGRESS, UPDATE_COMPLETE_CLEANUP_IN_PROGRESS,
          UPDATE_ROLLBACK_IN_PROGRESS,
-         UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS
-        ].include?(status)
+         UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS].include?(status)
       end
 
       def complete?
@@ -188,6 +190,12 @@ module Convection
             o[:stack_name] = id
           end)
         else
+          ## Execute before create tasks
+          @tasks[:before_create].delete_if do |task|
+            task.call(self)
+            task.success?
+          end
+
           ## Create
           @cf_client.create_stack(request_options.tap do |o|
             o[:stack_name] = cloud_name
@@ -200,11 +208,23 @@ module Convection
         end
 
         watch(&block) if block # Block execution on stack status
+
+        ## Execute after create tasks
+        @tasks[:after_create].delete_if do |task|
+          task.call(self)
+          task.success?
+        end
       rescue Aws::Errors::ServiceError => e
         @errors << e
       end
 
       def delete(&block)
+        ## Execute before delete tasks
+        @tasks[:before_delete].delete_if do |task|
+          task.call(self)
+          task.success?
+        end
+
         @cf_client.delete_stack(
           :stack_name => id
         )
@@ -213,6 +233,12 @@ module Convection
         watch(&block) if block
 
         get_status
+
+        ## Execute after delete tasks
+        @tasks[:after_delete].delete_if do |task|
+          task.call(self)
+          task.success?
+        end
       rescue Aws::Errors::ServiceError => e
         @errors << e
       end
@@ -248,6 +274,22 @@ module Convection
         puts "\nTemplate validated successfully"
       end
 
+      def after_create_task(task)
+        @tasks[:after_create] << task
+      end
+
+      def after_delete_task(task)
+        @tasks[:after_delete] << task
+      end
+
+      def before_create_task(task)
+        @tasks[:before_create] << task
+      end
+
+      def before_delete_task(task)
+        @tasks[:before_delete] << task
+      end
+
       private
 
       def get_status(stack_name = id)

data/lib/convection/model/cloudfile.rb

@@ -24,12 +24,12 @@ module Convection
         @attributes.set(stack, key, value)
       end
 
-      def stack(stack_name, template, options = {})
+      def stack(stack_name, template, options = {}, &block)
         options[:region] ||= region
         options[:cloud] = name
         options[:attributes] = attributes
 
-        @stacks[stack_name] = Control::Stack.new(stack_name, template, options)
+        @stacks[stack_name] = Control::Stack.new(stack_name, template, options, &block)
         @deck << @stacks[stack_name]
       end
     end

data/lib/convection/model/template.rb

@@ -248,36 +248,33 @@ module Convection
       end
 
       def validate_resources(rendered_stack)
-        validate_compare(
-          rendered_stack['Resources'].count,
-          CF_MAX_RESOURCES,
-          ExcessiveResourcesError)
+        validate_compare(rendered_stack['Resources'].count,
+                         CF_MAX_RESOURCES,
+                         ExcessiveResourcesError)
 
         largest_resource_name = resources.keys.max || ''
-        validate_compare(
-          largest_resource_name.length,
-          CF_MAX_RESOURCE_NAME,
-          ExcessiveResourceNameError)
+        validate_compare(largest_resource_name.length,
+                         CF_MAX_RESOURCE_NAME,
+                         ExcessiveResourceNameError)
       end
 
       def validate_mappings(rendered_stack)
         mappings = rendered_stack ['Mappings']
-        validate_compare(
-          mappings.count,
-          CF_MAX_MAPPINGS,
-          ExcessiveMappingsError)
+        validate_compare(mappings.count,
+                         CF_MAX_MAPPINGS,
+                         ExcessiveMappingsError)
         mappings.each do |_, value|
           validate_compare(
             value.count,
             CF_MAX_MAPPING_ATTRIBUTES,
-            ExcessiveMappingAttributesError)
+            ExcessiveMappingAttributesError
+          )
         end
 
         mappings.keys.each do |key|
-          validate_compare(
-            key.length,
-            CF_MAX_MAPPING_NAME,
-            ExcessiveMappingNameError)
+          validate_compare(key.length,
+                           CF_MAX_MAPPING_NAME,
+                           ExcessiveMappingNameError)
         end
 
         ## XXX What are we trying to do here @aburke
@@ -288,60 +285,52 @@ module Convection
         end
 
         mapping_attributes.each do |attribute|
-          validate_compare(
-            attribute.length,
-            CF_MAX_MAPPING_ATTRIBUTE_NAME,
-            ExcessiveMappingAttributeNameError)
+          validate_compare(attribute.length,
+                           CF_MAX_MAPPING_ATTRIBUTE_NAME,
+                           ExcessiveMappingAttributeNameError)
         end
       end
 
       def validate_parameters(rendered_stack)
         parameters = rendered_stack['Parameters']
-        validate_compare(
-          parameters.count,
-          CF_MAX_PARAMETERS,
-          ExcessiveParametersError)
+        validate_compare(parameters.count,
+                         CF_MAX_PARAMETERS,
+                         ExcessiveParametersError)
         largest_parameter_name = parameters.keys.max
         largest_parameter_name ||= ''
-        validate_compare(
-          largest_parameter_name.length,
-          CF_MAX_PARAMETER_NAME_CHARACTERS,
-          ExcessiveParameterNameError)
+        validate_compare(largest_parameter_name.length,
+                         CF_MAX_PARAMETER_NAME_CHARACTERS,
+                         ExcessiveParameterNameError)
         parameters.values.each do |value|
-          validate_compare(
-            JSON.generate(value).bytesize,
-            CF_MAX_PARAMETER_VALUE_BYTESIZE,
-            ExcessiveParameterBytesizeError)
+          validate_compare(JSON.generate(value).bytesize,
+                           CF_MAX_PARAMETER_VALUE_BYTESIZE,
+                           ExcessiveParameterBytesizeError)
         end
       end
 
       def validate_outputs(rendered_stack)
         outputs = rendered_stack['Outputs']
-        validate_compare(
-          outputs.count,
-          CF_MAX_OUTPUTS,
-          ExcessiveOutputsError)
+        validate_compare(outputs.count,
+                         CF_MAX_OUTPUTS,
+                         ExcessiveOutputsError)
         largest_output_name = outputs.keys.max
         largest_output_name ||= ''
-        validate_compare(
-          largest_output_name.length,
-          CF_MAX_OUTPUT_NAME_CHARACTERS,
-          ExcessiveOutputNameError)
+        validate_compare(largest_output_name.length,
+                         CF_MAX_OUTPUT_NAME_CHARACTERS,
+                         ExcessiveOutputNameError)
       end
 
       def validate_description(rendered_stack)
-        validate_compare(
-          rendered_stack['Description'].bytesize,
-          CF_MAX_DESCRIPTION_BYTESIZE,
-          ExcessiveDescriptionError)
+        validate_compare(rendered_stack['Description'].bytesize,
+                         CF_MAX_DESCRIPTION_BYTESIZE,
+                         ExcessiveDescriptionError)
       end
 
       def validate_bytesize(rendered_stack)
         json = JSON.generate(rendered_stack)
-        validate_compare(
-          json.bytesize,
-          CF_MAX_BYTESIZE,
-          ExcessiveTemplateSizeError)
+        validate_compare(json.bytesize,
+                         CF_MAX_BYTESIZE,
+                         ExcessiveTemplateSizeError)
       end
     end
   end

data/lib/convection/model/template/resource/aws_ec2_vpc.rb

@@ -60,9 +60,9 @@ module Convection
 
             ## Allocate the next available subnet
             @subnet_allocated += 1
-            s.network(network.subnet(
-              :Bits => @subnet_length,
-              :NumSubnets => @subnet_allocated)[@subnet_allocated - 1])
+            subnets = network.subnet(:Bits => @subnet_length,
+                                     :NumSubnets => @subnet_allocated)
+            s.network(subnets[@subnet_allocated - 1])
 
             s.instance_exec(&block) if block
             @template.resources[s.name] = s

data/lib/convection/model/template/resource/aws_iam_role.rb

@@ -25,8 +25,9 @@ module Convection
           end
 
           ## Add a canned trust policy for any AWS service
-          def trust_service(name, &block)
-            @trust_relationship = Model::Mixin::Policy.new(:name => "trust-#{name}-service", :template => @template)
+          def trust_service(name, policy_name = nil, &block)
+            policy_name ||= "trust-#{name}-service"
+            @trust_relationship = Model::Mixin::Policy.new(:name => policy_name, :template => @template)
             trust_relationship.allow do
               action 'sts:AssumeRole'
               principal :Service => "#{name}.amazonaws.com"
@@ -36,49 +37,22 @@ module Convection
 
           ## Add a canned trust policy for EC2 instances
           def trust_ec2_instances(&block)
-            @trust_relationship = Model::Mixin::Policy.new(:name => 'trust-ec2-instances', :template => @template)
-            trust_relationship.allow do
-              action 'sts:AssumeRole'
-              principal :Service => 'ec2.amazonaws.com'
-            end
-            trust_relationship.instance_exec(&block) if block
-            trust_relationship
+            trust_service('ec2', 'trust-ec2-instances', &block)
           end
 
           ## Add a canned trust policy for Flow Logs
           def trust_flow_logs(&block)
-            @trust_relationship = Model::Mixin::Policy.new(:name => 'trust-flow-logs', :template => @template)
-            trust_relationship.allow do
-              action 'sts:AssumeRole'
-              principal :Service => 'vpc-flow-logs.amazonaws.com'
-            end
-            trust_relationship.instance_exec(&block) if block
-            trust_relationship
+            trust_service('vpc-flow-logs', 'trust-flow-logs', &block)
           end
 
           ## Add a canned trust policy for EMR
           def trust_emr(&block)
-            @trust_relationship = Model::Mixin::Policy.new(:name => 'trust-emr', :template => @template)
-            trust_relationship.allow do
-              action 'sts:AssumeRole'
-              principal :Service => 'elasticmapreduce.amazonaws.com'
-            end
-            trust_relationship.instance_exec(&block) if block
-            trust_relationship
+            trust_service('elasticmapreduce', 'trust-emr', &block)
           end
 
           ## Add a canned trust policy for Cloudtrail
           def trust_cloudtrail(&block)
-            @trust_relationship =
-              Model::Mixin::Policy.new(:name => 'trust-cloudtrail-instances', :template => @template)
-
-            trust_relationship.allow do
-              action 'sts:AssumeRole'
-              principal :Service => 'cloudtrail.amazonaws.com'
-            end
-
-            trust_relationship.instance_exec(&block) if block
-            trust_relationship
+            trust_service('cloudtrail', 'trust-cloudtrail-instances', &block)
           end
 
           ## Add a policy to allow instance to self-terminate

data/test/convection/tasks/test_after_create_tasks.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class TestAfterCreateTasks < Minitest::Test
+  include TestHelper
+
+  def setup
+    @template = ::Convection.template do
+      description 'EC2 VPC Test Template'
+
+      ec2_vpc 'TargetVPC' do
+        network '10.0.0.0'
+        subnet_length 24
+        enable_dns
+      end
+    end
+  end
+
+  def test_after_create_task_is_registered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # when - a stack is initialized with a after_create_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_create_task CollectAvailabilityZonesTask.new
+        end
+
+        # then - at least one task should be present
+        refute_empty stack.tasks[:after_create]
+      end
+    end
+  end
+
+  def test_after_create_task_is_executed
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a after_create_task
+        task = CollectAvailabilityZonesTask.new
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_create_task task
+        end
+
+        # when - any changes to the stack are applied
+        stack.apply
+
+        # then - the task should have been executed
+        assert_includes task.availability_zones, 'eu-central-1'
+      end
+    end
+  end
+
+  def test_after_create_task_is_deregistered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a after_create_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_create_task CollectAvailabilityZonesTask.new
+        end
+
+        # when - any changes to the stack are applied
+        stack.apply
+
+        # then - the task should have been deregistered
+        assert_empty stack.tasks[:after_create]
+      end
+    end
+  end
+end

data/test/convection/tasks/test_after_delete_tasks.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class TestBeforeDeleteTasks < Minitest::Test
+  include TestHelper
+
+  def setup
+    @template = ::Convection.template do
+      description 'EC2 VPC Test Template'
+
+      ec2_vpc 'TargetVPC' do
+        network '10.0.0.0'
+        subnet_length 24
+        enable_dns
+      end
+    end
+  end
+
+  def test_after_delete_task_is_registered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # when - a stack is initialized with a after_delete_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_delete_task CollectAvailabilityZonesTask.new
+        end
+
+        # then - at least one task should be present
+        refute_empty stack.tasks[:after_delete]
+      end
+    end
+  end
+
+  def test_after_delete_task_is_executed
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a after_delete_task
+        task = CollectAvailabilityZonesTask.new
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_delete_task task
+        end
+
+        # when - any changes to the stack are applied
+        stack.delete
+
+        # then - the task should have been executed
+        assert_includes task.availability_zones, 'eu-central-1'
+      end
+    end
+  end
+
+  def test_after_delete_task_is_deregistered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a after_delete_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          after_delete_task CollectAvailabilityZonesTask.new
+        end
+
+        # when - any changes to the stack are applied
+        stack.delete
+
+        # then - the task should have been deregistered
+        assert_empty stack.tasks[:after_delete]
+      end
+    end
+  end
+end

data/test/convection/tasks/test_before_create_tasks.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class TestBeforeCreateTasks < Minitest::Test
+  include TestHelper
+
+  def setup
+    @template = ::Convection.template do
+      description 'EC2 VPC Test Template'
+
+      ec2_vpc 'TargetVPC' do
+        network '10.0.0.0'
+        subnet_length 24
+        enable_dns
+      end
+    end
+  end
+
+  def test_before_create_task_is_registered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # when - a stack is initialized with a before_create_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_create_task CollectAvailabilityZonesTask.new
+        end
+
+        # then - at least one task should be present
+        refute_empty stack.tasks[:before_create]
+      end
+    end
+  end
+
+  def test_before_create_task_is_executed
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a before_create_task
+        task = CollectAvailabilityZonesTask.new
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_create_task task
+        end
+
+        # when - any changes to the stack are applied
+        stack.apply
+
+        # then - the task should have been executed
+        assert_includes task.availability_zones, 'eu-central-1'
+      end
+    end
+  end
+
+  def test_before_create_task_is_deregistered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a before_create_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_create_task CollectAvailabilityZonesTask.new
+        end
+
+        # when - any changes to the stack are applied
+        stack.apply
+
+        # then - the task should have been deregistered
+        assert_empty stack.tasks[:before_create]
+      end
+    end
+  end
+end

data/test/convection/tasks/test_before_delete_tasks.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class TestBeforeDeleteTasks < Minitest::Test
+  include TestHelper
+
+  def setup
+    @template = ::Convection.template do
+      description 'EC2 VPC Test Template'
+
+      ec2_vpc 'TargetVPC' do
+        network '10.0.0.0'
+        subnet_length 24
+        enable_dns
+      end
+    end
+  end
+
+  def test_before_delete_task_is_registered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # when - a stack is initialized with a before_delete_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_delete_task CollectAvailabilityZonesTask.new
+        end
+
+        # then - at least one task should be present
+        refute_empty stack.tasks[:before_delete]
+      end
+    end
+  end
+
+  def test_before_delete_task_is_executed
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a before_delete_task
+        task = CollectAvailabilityZonesTask.new
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_delete_task task
+        end
+
+        # when - any changes to the stack are applied
+        stack.delete
+
+        # then - the task should have been executed
+        assert_includes task.availability_zones, 'eu-central-1'
+      end
+    end
+  end
+
+  def test_before_delete_task_is_deregistered
+    Aws::CloudFormation::Client.stub :new, mock_cloudformation_client do
+      Aws::EC2::Client.stub :new, mock_ec2_client do
+        # given - a stack initialized with a before_delete_task
+        stack = ::Convection::Control::Stack.new('EC2 VPC Test Stack', @template) do
+          before_delete_task CollectAvailabilityZonesTask.new
+        end
+
+        # when - any changes to the stack are applied
+        stack.delete
+
+        # then - the task should have been deregistered
+        assert_empty stack.tasks[:before_delete]
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -15,3 +15,50 @@ module Minitest::Assertions
     yield
   end
 end
+
+module TestHelper
+  class CollectAvailabilityZonesTask
+    attr_writer :availability_zones
+
+    def availability_zones
+      @availability_zones ||= []
+    end
+
+    def call(stack)
+      self.availability_zones += stack.availability_zones
+    end
+
+    def success?
+      availability_zones.any?
+    end
+  end
+
+  private
+
+  def mock_cloudformation_client
+    cf_client = Minitest::Mock.new
+    any_args = [->(*) { true }]
+    cf_client.expect(:create_stack, nil, any_args)
+    cf_client.expect(:delete_stack, nil, any_args)
+    cf_client.expect(:describe_stacks, nil)
+    def cf_client.describe_stacks(*)
+      context = nil # we don't need any request context here.
+      raise Aws::CloudFormation::Errors::ValidationError.new(context, 'Stack does not exist.')
+    end
+
+    cf_client
+  end
+
+  def mock_ec2_client
+    zones = %w(eu-central-1 eu-west-1).map do |zone|
+      mock = Minitest::Mock.new
+      mock.expect(:zone_name, zone)
+    end
+    availability_zone_description = Minitest::Mock.new
+    availability_zone_description.expect(:availability_zones, zones)
+
+    ec2_client = Minitest::Mock.new
+    ec2_client.expect(:describe_availability_zones, availability_zone_description)
+    ec2_client
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -222,6 +222,10 @@ files:
 - test/convection/model/test_update_policies.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
+- test/convection/tasks/test_after_create_tasks.rb
+- test/convection/tasks/test_after_delete_tasks.rb
+- test/convection/tasks/test_before_create_tasks.rb
+- test/convection/tasks/test_before_delete_tasks.rb
 - test/test_helper.rb
 homepage: https://github.com/rapid7/convection
 licenses:
@@ -260,4 +264,8 @@ test_files:
 - test/convection/model/test_update_policies.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
+- test/convection/tasks/test_after_create_tasks.rb
+- test/convection/tasks/test_after_delete_tasks.rb
+- test/convection/tasks/test_before_create_tasks.rb
+- test/convection/tasks/test_before_delete_tasks.rb
 - test/test_helper.rb