convection 0.2.32 → 0.2.33

data/spec/convection/model/template/validate_resources_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+class Convection::Model::Template
+  describe '#validate_resources' do
+    context 'with regular Resource name' do
+      subject do
+        Convection.template do
+          description 'Validations Test Template - Regular Resource Name'
+
+          resource 'Resource0'
+        end
+      end
+
+      it 'raises an excessive resource name error' do
+        rendered = subject.render
+        expect { subject.validate(rendered) }.to_not raise_error
+      end
+    end
+
+    context 'with excessive Resource name' do
+      subject do
+        Convection.template do
+          description 'Validations Test Template - Excessive Resource Name'
+
+          resource '0' * (CF_MAX_RESOURCE_NAME + 1)
+        end
+      end
+
+      it 'raises an excessive resource name error' do
+        rendered = subject.render
+        expect { subject.validate(rendered) }.to raise_error(ExcessiveResourceNameError)
+      end
+    end
+
+    context 'with excessive Resources' do
+      subject do
+        Convection.template do
+          description 'Validations Test Template - Too Many Resources'
+
+          (CF_MAX_RESOURCES + 1).times { |i| resource "TestResource#{i}" }
+        end
+      end
+
+      it 'raises an excessive resources error' do
+        rendered = subject.render
+        expect { subject.validate(rendered) }.to raise_error(ExcessiveResourcesError)
+      end
+    end
+  end
+end

data/spec/ec2_client_context.rb

@@ -0,0 +1,18 @@
+RSpec.shared_context 'with a mock EC2 client' do
+  let(:ec2_availability_zone_description) do
+    zones = %w(eu-central-1 eu-west-1).map do |name|
+      double("availability zone (#{name})", zone_name: name)
+    end
+
+    double(:availability_zone_description, availability_zones: zones)
+  end
+
+  let(:ec2_client) do
+    client = double(:ec2_client, describe_availability_zones: ec2_availability_zone_description)
+    allow(client).to receive(:describe_stacks) {
+      fail Aws::CloudFormation::Errors::ValidationError.new(context, 'Stack does not exist.')
+    }
+
+    client
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group 'Control', 'lib/convection/control'
+  add_group 'Model', 'lib/convection/model'
+  add_group 'DSL', 'lib/convection/dsl'
+end
+
+require_relative '../lib/convection'
+require_relative './cf_client_context'
+require_relative './collect_availability_zones_task_context'
+require_relative './ec2_client_context'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.33
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -126,6 +126,7 @@ files:
 - lib/convection/model/template.rb
 - lib/convection/model/template/condition.rb
 - lib/convection/model/template/mapping.rb
+- lib/convection/model/template/metadata.rb
 - lib/convection/model/template/output.rb
 - lib/convection/model/template/parameter.rb
 - lib/convection/model/template/resource.rb
@@ -220,25 +221,40 @@ files:
 - lib/convection/model/template/resource_property/aws_s3_cors_configuration.rb
 - lib/convection/model/template/resource_property/aws_s3_cors_configuration_rule.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
-- test/convection/model/test_permission.rb
-- 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/convection/tasks/test_after_create_tasks.rb
-- test/convection/tasks/test_after_delete_tasks.rb
-- test/convection/tasks/test_after_update_tasks.rb
-- test/convection/tasks/test_before_create_tasks.rb
-- test/convection/tasks/test_before_delete_tasks.rb
-- test/convection/tasks/test_before_update_tasks.rb
-- test/test_helper.rb
+- spec/cf_client_context.rb
+- spec/collect_availability_zones_task_context.rb
+- spec/convection/control/stack/after_create_tasks_spec.rb
+- spec/convection/control/stack/after_delete_tasks_spec.rb
+- spec/convection/control/stack/after_update_tasks_spec.rb
+- spec/convection/control/stack/before_create_tasks_spec.rb
+- spec/convection/control/stack/before_delete_tasks_spec.rb
+- spec/convection/control/stack/before_update_tasks_spec.rb
+- spec/convection/dsl/intrinsic_functions_spec.rb
+- spec/convection/model/template/condition_spec.rb
+- spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
+- spec/convection/model/template/resource/ec2_security_group_spec.rb
+- spec/convection/model/template/resource/ec2_subnet_spec.rb
+- spec/convection/model/template/resource/elasticache_cache_cluster_spec.rb
+- spec/convection/model/template/resource/elasticache_parameter_group_spec.rb
+- spec/convection/model/template/resource/elasticache_security_group_ingress_spec.rb
+- spec/convection/model/template/resource/elasticache_security_group_spec.rb
+- spec/convection/model/template/resource/events_rule_spec.rb
+- spec/convection/model/template/resource/iam_role_spec.rb
+- spec/convection/model/template/resource/lambdas_spec.rb
+- spec/convection/model/template/resource/loggroups_spec.rb
+- spec/convection/model/template/resource/permission_spec.rb
+- spec/convection/model/template/resource/rds_security_groups_spec.rb
+- spec/convection/model/template/resource/vpc_endpoints_spec.rb
+- spec/convection/model/template/resource_attribute/update_policies_spec.rb
+- spec/convection/model/template/template_spec.rb
+- spec/convection/model/template/validate_bytesize_spec.rb
+- spec/convection/model/template/validate_description_spec.rb
+- spec/convection/model/template/validate_mappings_spec.rb
+- spec/convection/model/template/validate_outputs_spec.rb
+- spec/convection/model/template/validate_parameters_spec.rb
+- spec/convection/model/template/validate_resources_spec.rb
+- spec/ec2_client_context.rb
+- spec/spec_helper.rb
 homepage: https://github.com/rapid7/convection
 licenses:
 - MIT
@@ -264,22 +280,38 @@ signing_key:
 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
-- test/convection/model/test_permission.rb
-- 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/convection/tasks/test_after_create_tasks.rb
-- test/convection/tasks/test_after_delete_tasks.rb
-- test/convection/tasks/test_after_update_tasks.rb
-- test/convection/tasks/test_before_create_tasks.rb
-- test/convection/tasks/test_before_delete_tasks.rb
-- test/convection/tasks/test_before_update_tasks.rb
-- test/test_helper.rb
+- spec/cf_client_context.rb
+- spec/collect_availability_zones_task_context.rb
+- spec/convection/control/stack/after_create_tasks_spec.rb
+- spec/convection/control/stack/after_delete_tasks_spec.rb
+- spec/convection/control/stack/after_update_tasks_spec.rb
+- spec/convection/control/stack/before_create_tasks_spec.rb
+- spec/convection/control/stack/before_delete_tasks_spec.rb
+- spec/convection/control/stack/before_update_tasks_spec.rb
+- spec/convection/dsl/intrinsic_functions_spec.rb
+- spec/convection/model/template/condition_spec.rb
+- spec/convection/model/template/resource/directoryservice_simple_ad_spec.rb
+- spec/convection/model/template/resource/ec2_security_group_spec.rb
+- spec/convection/model/template/resource/ec2_subnet_spec.rb
+- spec/convection/model/template/resource/elasticache_cache_cluster_spec.rb
+- spec/convection/model/template/resource/elasticache_parameter_group_spec.rb
+- spec/convection/model/template/resource/elasticache_security_group_ingress_spec.rb
+- spec/convection/model/template/resource/elasticache_security_group_spec.rb
+- spec/convection/model/template/resource/events_rule_spec.rb
+- spec/convection/model/template/resource/iam_role_spec.rb
+- spec/convection/model/template/resource/lambdas_spec.rb
+- spec/convection/model/template/resource/loggroups_spec.rb
+- spec/convection/model/template/resource/permission_spec.rb
+- spec/convection/model/template/resource/rds_security_groups_spec.rb
+- spec/convection/model/template/resource/vpc_endpoints_spec.rb
+- spec/convection/model/template/resource_attribute/update_policies_spec.rb
+- spec/convection/model/template/template_spec.rb
+- spec/convection/model/template/validate_bytesize_spec.rb
+- spec/convection/model/template/validate_description_spec.rb
+- spec/convection/model/template/validate_mappings_spec.rb
+- spec/convection/model/template/validate_outputs_spec.rb
+- spec/convection/model/template/validate_parameters_spec.rb
+- spec/convection/model/template/validate_resources_spec.rb
+- spec/ec2_client_context.rb
+- spec/spec_helper.rb
+has_rdoc: 

data/test/convection/model/test_conditions.rb

@@ -1,121 +0,0 @@
-require 'test_helper'
-require 'json'
-require 'pp'
-
-class TestConditions < Minitest::Test
-  def setup
-    # Inspired by http://www.unixdaemon.net/cloud/intro-to-cloudformations-conditionals.html
-    @template = ::Convection.template do
-      description 'Conditions Test Template'
-
-      parameter 'DeploymentEnvironment' do
-        type 'String'
-        description 'The environment this stack is being deployed to.'
-        default 'dev'
-
-        allow 'dev'
-        allow 'stage'
-        allow 'prod'
-      end
-
-      condition 'InProd' do
-        fn_equals(fn_ref('DeploymentEnvironment'), 'prod')
-      end
-
-      condition 'NotInProd' do
-        fn_or(
-          fn_equals(fn_ref('DeploymentEnvironment'), 'stage'),
-          fn_equals(fn_ref('DeploymentEnvironment'), 'dev')
-        )
-      end
-
-      resource 'SomeSG' do
-        type 'AWS::EC2::SecurityGroup'
-        condition 'NotInProd'
-      end
-
-      resource 'SQLDB' do
-        type 'AWS::RDS::DBInstance'
-        property 'Iops', fn_if('InProd', '1000', fn_ref('AWS::NoValue'))
-      end
-    end
-  end
-
-  def from_json
-    JSON.parse(@template.to_json)
-  end
-
-  def test_inprod_condition
-    # Expected JSON:
-    # "InProd": { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment" }, "prod" ] },
-    json = from_json['Conditions']['InProd']
-    func_args = json['Fn::Equals']
-
-    assert func_args.is_a? Array
-    assert_equal 2, func_args.size
-
-    perform_parameter_ref_comparison func_args, 'DeploymentEnvironment', 'prod'
-  end
-
-  def test_notinprod_condition
-    # Expected JSON:
-    # "NotInProd": {
-    #   "Fn::Or" : [
-    #     { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment"}, "stage" ] },
-    #     { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment"}, "dev" ] }
-    #   ]
-    #  }
-    json = from_json['Conditions']['NotInProd']
-    func_args = json['Fn::Or']
-
-    assert func_args.is_a? Array
-    assert_equal 2, func_args.size
-
-    subfunc1 = func_args[0]['Fn::Equals'] # check for 'stage'
-    subfunc2 = func_args[1]['Fn::Equals'] # check for 'dev'
-
-    perform_parameter_ref_comparison subfunc1, 'DeploymentEnvironment', 'stage'
-    perform_parameter_ref_comparison subfunc2, 'DeploymentEnvironment', 'dev'
-  end
-
-  def test_resource_uses_condition
-    json = from_json['Resources']['SomeSG']
-
-    assert json.is_a? Hash
-    assert json.key? 'Condition'
-    assert_equal 'NotInProd', json['Condition']
-  end
-
-  def test_property_uses_condition
-    iops_property = from_json['Resources']['SQLDB']['Properties']['Iops']
-    # Expected JSON:
-    # "Iops" : { "Fn::If" : [ "InProd", "1000", { "Ref" : "AWS::NoValue" }
-
-    # Check we have an IF function
-    assert iops_property.is_a? Hash
-    assert_equal 1, iops_property.size
-    assert iops_property.key? 'Fn::If'
-
-    # Check the 3 arguments to the IF function: (condition, true_value, false_value)
-    if_cond = iops_property['Fn::If']
-    assert if_cond.is_a? Array
-    assert_equal 3, if_cond.size
-
-    assert_equal 'InProd', if_cond[0]
-    assert_equal '1000', if_cond[1]
-    assert if_cond[2].is_a? Hash
-    assert_equal 'AWS::NoValue', if_cond[2]['Ref']
-  end
-
-  private
-
-  def perform_parameter_ref_comparison(comparison_array, parameter_name, expected_value)
-    parameter_ref = comparison_array[0]
-    assert parameter_ref.is_a? Hash
-    assert_equal 1, parameter_ref.size
-    assert parameter_ref.key? 'Ref'
-    assert parameter_ref.value? parameter_name
-
-    assert_equal expected_value, comparison_array[1]
-  end
-end

data/test/convection/model/test_directory_service.rb

@@ -1,40 +0,0 @@
-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_elasticache.rb

@@ -1,97 +0,0 @@
-require 'test_helper'
-require 'json'
-require 'pp'
-
-class TestElasticache < Minitest::Test
-  def setup
-    # Inspired by http://www.unixdaemon.net/cloud/intro-to-cloudformations-conditionals.html
-    @template = ::Convection.template do
-      description 'Elasticache Test Template'
-
-      ec2_security_group 'MyEC2SecGroup' do
-        ingress_rule(:tcp, 22, 'my.ip.address')
-      end
-
-      elasticache_security_group 'MyRedisSecGroup' do
-        description 'Redis cache security group'
-      end
-
-      elasticache_security_group_ingress 'MyRedisSecGroupIngress' do
-        cache_security_group_name fn_ref('MyRedisSecGroup')
-        ec2_security_group_name(fn_ref('MyEC2SecGroup'))
-        ec2_security_group_owner_id('123456789012')
-      end
-
-      elasticache_parameter_group 'MyRedisParmGroup' do
-        cache_parameter_group_family 'redis2.8'
-        description 'Redis cache parameter group'
-        parameter 'my_parm_key', 'my_parm_value'
-      end
-
-      elasticache_cache_cluster 'MyRedisCluster' do
-        cluster_name 'demo'
-
-        auto_minor_version_upgrade true
-        cache_node_type 'cache.m3.medium'
-        cache_parameter_group_name fn_ref('MyRedisParmGroup')
-        cache_security_group_names [fn_ref('MyRedisSecGroup')]
-        engine 'redis'
-        engine_version '2.8.6'
-        num_cache_nodes 1
-      end
-    end
-  end
-
-  def from_json
-    JSON.parse(@template.to_json)
-  end
-
-  def test_elasticache_instance
-    json = from_json['Resources']['MyRedisCluster']
-    secgroups = json['Properties']['CacheSecurityGroupNames']
-
-    assert secgroups.is_a? Array
-    assert_equal 1, secgroups.size
-
-    perform_parameter_ref_comparison secgroups, 'MyRedisSecGroup', nil
-  end
-
-  # XXX Which method is correct implementation? @aburke
-  # def test_elasticache_secgroup_ingress
-  #   json = from_json['Resources']['MyRedisSecGroupIngress']
-  #   cachesecgroup = json['Properties']['CacheSecurityGroupName']
-  #
-  #   assert cachesecgroup.is_a? Hash
-  #   assert_equal 1, cachesecgroup.size
-  #   assert cachesecgroup.key? 'Ref'
-  #   assert cachesecgroup.value? 'MyRedisSecGroup'
-  #
-  #   ec2_secgroup = json['Properties']['EC2SecurityGroupName']
-  #   assert ec2_secgroup.is_a? Hash
-  #   assert_equal 1, ec2_secgroup.size
-  #   assert ec2_secgroup.key? 'Ref'
-  #   assert ec2_secgroup.value? 'MyEC2SecGroup'
-  # end
-
-  def test_elasticache_secgroup_ingress
-    json = from_json['Resources']['MyRedisParmGroup']
-    parms = json['Properties']['Properties']
-
-    assert parms.is_a? Hash
-    assert_equal 1, parms.size
-    assert parms.key? 'my_parm_key'
-    assert parms.value? 'my_parm_value'
-  end
-
-  private
-
-  def perform_parameter_ref_comparison(comparison_array, parameter_name, expected_value)
-    parameter_ref = comparison_array[0]
-    assert parameter_ref.is_a? Hash
-    assert_equal 1, parameter_ref.size
-    assert parameter_ref.key? 'Ref'
-    assert parameter_ref.value? parameter_name
-
-    assert_equal expected_value, comparison_array[1]
-  end
-end