convection 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 074ce594bd457dfa3a9174a47b5a9813f7a1d740
-  data.tar.gz: 589968f7d3487cb35d9d0166ab09b3bff11ffdc6
+  metadata.gz: fef6875e285987d265328f4eb0fc5aebcaa8508c
+  data.tar.gz: 2cdd25d2e78400356af0770840830eb8026ce7cd
 SHA512:
-  metadata.gz: 094c835c822791ea64c117a8c61e11d42a27d2aa32eecf70525ab26d33384612af68ee20a8c5422a78f3948fd94fa21091a4e9fe894038fb08a8207c23954d36
-  data.tar.gz: eab4ff96aa467afb8113a65cc20cbcbdfe537718041efaa56609d9e0c4b3ad01cb450b0aeaeeb16aceb26717b2ac79d2eff9b96eefc8b264b4cb5a85e7939496
+  metadata.gz: 8636d3d6a2581bda118b8e59827cf5da3f6c0a7e17389e4d55b82fb09f8214f11b6b128b59715de158a59e828d898833d63cb909ea2063f3f8c6726f89267a55
+  data.tar.gz: e6053ae4416c69d5e50a059fc5a0833b706a2e084a21ef93a4838954516a8e083e295e58ec2be08b7ca273ccfe67a09a38939c10ba124f7540afa30849fa6386

data/lib/convection/model/template.rb

@@ -352,4 +352,5 @@ require_relative 'template/mapping'
 require_relative 'template/condition'
 require_relative 'template/resource'
 require_relative 'template/resource_property'
+require_relative 'template/resource_attribute'
 require_relative 'template/output'

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

@@ -287,6 +287,7 @@ module Convection
         attr_reader :name
         attr_reader :template
         attr_reader :properties
+        attr_reader :resource_attributes
         attr_reader :exist
         alias_method :exist?, :exist
 
@@ -298,6 +299,8 @@ module Convection
           @deletion_policy = nil
           @exist = false
 
+          @resource_attributes = []
+
           ## Instantiate properties
           @properties = Model::Collection.new
           resource = self
@@ -353,6 +356,7 @@ module Convection
             'Type' => type,
             'Properties' => properties.map(true, &:render)
           }.tap do |resource|
+            resource_attributes.map { |a| a.render resource }
             resource['DependsOn'] = @depends_on unless @depends_on.empty?
             resource['DeletionPolicy'] = @deletion_policy unless @deletion_policy.nil?
             render_condition(resource)

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

@@ -32,6 +32,11 @@ module Convection
               render_tags(resource)
             end
           end
+
+          def update_policy(&block)
+            policy = ResourceAttribute::UpdatePolicy.new(self)
+            policy.instance_exec(&block) if block
+          end
         end
       end
     end

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

@@ -0,0 +1,23 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::DirectoryService::SimpleAD
+        ##
+        class DirectoryServiceSimpleAD < Resource
+          type 'AWS::DirectoryService::SimpleAD', :directoryservice_simple_ad
+          property :description, 'Description'
+          property :enable_sso, 'EnableSso'
+          property :name, 'Name'
+          property :password, 'Password'
+          property :short_name, 'ShortName'
+          property :size, 'Size'
+          property :vpc_settings, 'VpcSettings', :type => :hash
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_attribute.rb

@@ -0,0 +1,15 @@
+module Convection
+  module Model
+    class Template
+      # Base class for {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-product-attribute-reference.html}
+      class ResourceAttribute
+        def initialize(parent)
+          parent.resource_attributes << self
+        end
+      end
+    end
+  end
+end
+
+## Require all resource attributes
+Dir.glob(File.expand_path('../resource_attribute/*.rb', __FILE__)).map { |r| require r }

data/lib/convection/model/template/resource_attribute/update_policy.rb

@@ -0,0 +1,44 @@
+require_relative '../resource_attribute'
+
+module Convection
+  module Model
+    class Template
+      class ResourceAttribute
+        # Represents {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatepolicy.html}
+        class UpdatePolicy < ResourceAttribute
+          @pause = 'PT5M'
+          @min_in_service = 0
+          @max_batch = 1
+
+          def pause_time(val)
+            @pause = val
+          end
+
+          def min_instances_in_service(val)
+            @min_in_service = val
+          end
+
+          def max_batch_size(val)
+            @max_batch = val
+          end
+
+          def render(resource)
+            resource.tap do |r|
+              r['UpdatePolicy'] = {
+                'AutoScalingScheduledAction' => {
+                  'IgnoreUnmodifiedGroupSizeProperties' => true
+                },
+                'AutoScalingRollingUpdate' => {
+                  'MinInstancesInService' => @min_in_service,
+                  'MaxBatchSize' => @max_batch,
+                  'WaitOnResourceSignals' => false,
+                  'PauseTime' => @pause
+                }
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/convection/model/test_directory_service.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+require 'json'
+
+describe 'AWS::DirectoryService' do
+  let(:simple_ad_template) do
+    ::Convection.template do
+      directoryservice_simple_ad 'SimpleActiveDirectory' do
+        description 'Example simple AD'
+        enable_sso false
+        name 'ExampleSimpleAD'
+        password 'directory.password'
+        short_name 'directory.name'
+        size 'Small'
+
+        vpc_settings 'SubnetIds', ['subnet-deadb33f']
+        vpc_settings 'VpcId', 'vpc-deadb33f'
+      end
+    end
+  end
+
+  describe 'SimpleAD' do
+    it 'sets VpcSettings.SubnetIds' do
+      vpc_settings = simple_ad_json.fetch('Properties').fetch('VpcSettings')
+      assert_equal vpc_settings.fetch('SubnetIds'), ['subnet-deadb33f']
+    end
+
+    it 'sets VpcSettings.VpcId' do
+      vpc_settings = simple_ad_json.fetch('Properties').fetch('VpcSettings')
+      assert_equal vpc_settings.fetch('VpcId'), 'vpc-deadb33f'
+    end
+  end
+
+  private
+
+  def simple_ad_json
+    JSON.parse(simple_ad_template.to_json)
+        .fetch('Resources')
+        .fetch('SimpleActiveDirectory')
+  end
+end

data/test/convection/model/test_update_policies.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+require 'json'
+require 'pp'
+
+class TestUpdatePolicies < Minitest::Test
+  def setup
+    @template = ::Convection.template do
+      description 'UpdatePolicies Test Template'
+
+      ec2_security_group 'MyEC2SecGroup' do
+        ingress_rule(:tcp, 80, 'my.ip.address')
+      end
+
+      auto_scaling_launch_configuration 'TestLaunchConfig' do
+        image_id 'ami-123'
+        instance_type 't2.nano'
+
+        security_group fn_ref('MyEC2SecGroup')
+      end
+
+      auto_scaling_auto_scaling_group 'TestAutoScalingGroup' do
+        launch_configuration_name fn_ref('TestLaunchConfig')
+
+        update_policy do
+          pause_time 'test_time'
+          min_instances_in_service 10
+          max_batch_size 2
+        end
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_update_policy
+    json = from_json['Resources']['TestAutoScalingGroup']
+    type = json['Type']
+    assert_equal 'AWS::AutoScaling::AutoScalingGroup', type
+
+    update_policy = json['UpdatePolicy']
+    refute update_policy.nil?, 'UpdatePolicy does not exist in the generated template'
+
+    pause_time = json['UpdatePolicy']['AutoScalingRollingUpdate']['PauseTime']
+    assert_equal 'test_time', pause_time
+
+    min_in_service = json['UpdatePolicy']['AutoScalingRollingUpdate']['MinInstancesInService']
+    assert_equal 10, min_in_service
+
+    max_batch_size = json['UpdatePolicy']['AutoScalingRollingUpdate']['MaxBatchSize']
+    assert_equal 2, max_batch_size
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -132,6 +132,7 @@ files:
 - lib/convection/model/template/resource/aws_auto_scaling_scaling_policy.rb
 - lib/convection/model/template/resource/aws_cloud_watch_alarm.rb
 - lib/convection/model/template/resource/aws_cloudfront_distribution.rb
+- lib/convection/model/template/resource/aws_directory_service_simple_ad.rb
 - lib/convection/model/template/resource/aws_ec2_eip.rb
 - lib/convection/model/template/resource/aws_ec2_eip_association.rb
 - lib/convection/model/template/resource/aws_ec2_instance.rb
@@ -185,6 +186,8 @@ files:
 - lib/convection/model/template/resource/aws_sns_topic_policy.rb
 - lib/convection/model/template/resource/aws_sqs_queue.rb
 - lib/convection/model/template/resource/aws_sqs_queue_policy.rb
+- lib/convection/model/template/resource_attribute.rb
+- lib/convection/model/template/resource_attribute/update_policy.rb
 - lib/convection/model/template/resource_property.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_cachebehavior.rb
 - lib/convection/model/template/resource_property/aws_cloudfront_customerrorresponse.rb
@@ -207,6 +210,7 @@ files:
 - lib/convection/model/template/resource_property/aws_lambda_vpc_config.rb
 - lib/convection/version.rb
 - test/convection/model/test_conditions.rb
+- test/convection/model/test_directory_service.rb
 - test/convection/model/test_elasticache.rb
 - test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
@@ -214,6 +218,7 @@ files:
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb
 - test/convection/model/test_trust.rb
+- test/convection/model/test_update_policies.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
 - test/test_helper.rb
@@ -243,6 +248,7 @@ specification_version: 4
 summary: A fully generic, modular DSL for AWS CloudFormation
 test_files:
 - test/convection/model/test_conditions.rb
+- test/convection/model/test_directory_service.rb
 - test/convection/model/test_elasticache.rb
 - test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
@@ -250,6 +256,7 @@ test_files:
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb
 - test/convection/model/test_trust.rb
+- test/convection/model/test_update_policies.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
 - test/test_helper.rb