convection 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67115b7f8c9dafb09f93733a248cfa00ffdd2564
-  data.tar.gz: e2d9813955f988796f198c68b3047ea812a1b172
+  metadata.gz: 67bf51eb16483fd69d3076cddb1dd2e78dace915
+  data.tar.gz: 7bb593969be4f0f776d4129c9435408180a79a9e
 SHA512:
-  metadata.gz: 7c2ee15ff3d16828ab27635ba94fb5dc286092414d10340330daae7f01ddb0d1735cb6f797a615e0e25086b1d3cbf3ab1591be3ebf8f098226a428f2b60b613b
-  data.tar.gz: b3e3c5b978aabfc409e1e619c20e539dce2dbb369c0b9e734c094717ca67f299856d1191045c65012e2bd35f681cbeec7e1bbfa74bb2ada7986274ee4be2cf9b
+  metadata.gz: 0120c0fc5b9a7bd2bac857823cf77fa0910d30b464cb18d6e5bade366ff55935e24d0d771acdd00aa0c7d1402a8d8da3e8ae1ceea01254f9b42b4db36ed1a514
+  data.tar.gz: 9333ef1c307dc39f36542e878aae36911728d0d8cfda403dc4d93f5cfc499444bfcaf5fee0e8438366b8fce21af3ae01a2fe61e4292d304dc1b875f9ecb84a2f

data/.travis.yml

@@ -7,4 +7,5 @@ rvm:
   - 2.2.0
   - 2.2.1
   - 2.2.2
+  - 2.3.0
 sudo: false

data/lib/convection/control/stack.rb

@@ -34,6 +34,7 @@ module Convection
 
       ## AWS-SDK
       attr_accessor :region
+      attr_accessor :exclude_availability_zones
       attr_accessor :cloud
       attr_reader :capabilities
       attr_accessor :credentials
@@ -108,6 +109,7 @@ module Convection
         @cloud = options.delete(:cloud)
         @cloud_name = options.delete(:cloud_name)
         @region = options.delete(:region) { |_| 'us-east-1' }
+        @exclude_availability_zones = options.delete(:exclude_availability_zones) { |_| [] } # Default empty Array
         @credentials = options.delete(:credentials)
         @parameters = options.delete(:parameters) { |_| {} } # Default empty hash
         @tags = options.delete(:tags) { |_| {} } # Default empty hash
@@ -434,7 +436,15 @@ module Convection
       #   the call to ec2 client's describe availability zones
       def availability_zones(&block)
         @availability_zones ||=
-          @ec2_client.describe_availability_zones.availability_zones.map(&:zone_name).sort
+          @ec2_client.describe_availability_zones.availability_zones.map(&:zone_name)
+
+        unless @exclude_availability_zones.empty?
+          @availability_zones.reject! { |az| @exclude_availability_zones.include?(az) }
+        end
+        if @availability_zones.empty? && block
+          fail 'There are no AvailabilityZones, check exclude_availability_zones in the Cloudfile.'
+        end
+        @availability_zones.sort!
 
         @availability_zones.each_with_index(&block) if block
         @availability_zones

data/lib/convection/model/cloudfile.rb

@@ -14,6 +14,7 @@ module Convection
 
       attribute :name
       attribute :region
+      attribute :exclude_availability_zones
       attribute :splay
       attribute :retry_limit
       attribute :thread_count
@@ -32,6 +33,7 @@ module Convection
       # @see Convection::Control::Stack#initialize
       def stack(stack_name, template, options = {}, &block)
         options[:region] ||= region
+        options[:exclude_availability_zones] = exclude_availability_zones
         options[:cloud] = name
         options[:attributes] = attributes
         options[:retry_limit] = retry_limit

data/spec/convection/control/stack_spec.rb

@@ -36,6 +36,27 @@ module Convection::Control
         azs.uniq!
         expect(azs.size).to be(1)
       end
+
+      it 'availability_zones can be ignored' do
+        subject.exclude_availability_zones = %w(eu-central-1a)
+        expect(subject.availability_zones).to contain_exactly('eu-central-1b')
+      end
+
+      it 'multiple availability_zones can be ignored' do
+        subject.exclude_availability_zones = %w(eu-central-1a eu-central-1b)
+        expect(subject.availability_zones).to contain_exactly
+      end
+
+      it 'remove all availability_zones fails' do
+        subject.exclude_availability_zones = %w(eu-central-1a eu-central-1b)
+        b = proc do
+        end
+        expect { subject.availability_zones(&b) }.to raise_exception(RuntimeError, /AvailabilityZones/)
+      end
+
+      it 'can get default availability_zones' do
+        expect(subject.availability_zones).to contain_exactly('eu-central-1a', 'eu-central-1b')
+      end
     end
   end
 end

data/spec/convection/model/cloudfile_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'stringio'
+
+module Convection::Model
+  describe Cloudfile do
+    describe 'stack' do
+      subject do
+        klass = Class.new
+        klass.extend(Convection::DSL::Cloudfile)
+        klass
+      end
+
+      it 'can get cloud name' do
+        subject.name 'test-1'
+        expect(subject.name).to eq('test-1')
+      end
+
+      it 'can get region name' do
+        subject.region 'eu-central-1'
+        expect(subject.region).to eq('eu-central-1')
+      end
+
+      it 'can exclude_availability_zones an availability_zone' do
+        subject.exclude_availability_zones %w(eu-central-1a)
+        expect(subject.exclude_availability_zones).to contain_exactly('eu-central-1a')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ SimpleCov.start do
 end
 
 require_relative '../lib/convection'
+require_relative '../lib/convection/model/cloudfile'
 require_relative './cf_client_context'
 require_relative './collect_availability_zones_task_context'
 require_relative './ec2_client_context'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - John Manero
@@ -276,6 +276,7 @@ files:
 - spec/convection/control/stack_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/attributes_spec.rb
+- spec/convection/model/cloudfile_spec.rb
 - spec/convection/model/template/condition_spec.rb
 - spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
@@ -344,6 +345,7 @@ test_files:
 - spec/convection/control/stack_spec.rb
 - spec/convection/dsl/intrinsic_functions_spec.rb
 - spec/convection/model/attributes_spec.rb
+- spec/convection/model/cloudfile_spec.rb
 - spec/convection/model/template/condition_spec.rb
 - spec/convection/model/template/resource/aws_auto_scaling_auto_scaling_group_spec.rb
 - spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb