cfndsl 1.0.5 → 1.3.0

data/spec/cli_spec.rb

@@ -36,7 +36,9 @@ describe 'cfndsl', type: :aruba do
   before(:each) { write_file('template.rb', template_content) }
 
   # The known working version is the embedded version
+  # rubocop:disable Lint/ConstantDefinitionInBlock
   WORKING_SPEC_VERSION = JSON.parse(File.read(CfnDsl::LOCAL_SPEC_FILE))['ResourceSpecificationVersion']
+  # rubocop:enable Lint/ConstantDefinitionInBlock
 
   context "cfndsl -u #{WORKING_SPEC_VERSION}" do
     it 'updates the specification file' do

data/spec/cloud_formation_template_spec.rb

@@ -40,10 +40,31 @@ describe CfnDsl::CloudFormationTemplate do
         expect(subject.validate).to equal(subject)
       end
 
+      it 'returns self if there are valid Fn::Sub references to other resources' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('prefix ${TestResource2}suffix'))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Fn::Sub references to other resource attributes' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('prefix ${TestResource2.AnAttribute}suffix'))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
       it 'returns self if there are valid DependsOn to other resources' do
         tr = subject.Resource(:TestResource)
         tr.Type('Custom-TestType')
         tr.DependsOn(:TestResource2)
+        tr.DependsOn(:TestResource2)
 
         t2 = subject.Resource('TestResource2')
         t2.Type('Custom-TestType')
@@ -119,6 +140,13 @@ describe CfnDsl::CloudFormationTemplate do
         expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
       end
 
+      it 'raises CfnDsl::Error if a resourcs references itself in Fn::Sub attribute expression' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('${TestResource.attr}'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
+      end
+
       it 'raises CfnDsl::Error if there are cyclic DependsOn references' do
         tr = subject.Resource(:ResourceOne)
         tr.Type('Custom-TestType')
@@ -211,6 +239,12 @@ describe CfnDsl::CloudFormationTemplate do
         expect(subject.validate).to equal(subject)
       end
 
+      it 'returns self if there are valid Fn::Sub references to resource attributes' do
+        subject.Resource(:TestResource)
+        subject.Output('TestResourceOutput').Value(subject.FnSub('prefix ${TestResource.attr}suffix'))
+        expect(subject.validate).to equal(subject)
+      end
+
       it 'raises CfnDsl::Error if references a non existent condition' do
         subject.Output(:TestOutput).Condition('NoCondition')
         expect { subject.validate }.to raise_error(CfnDsl::Error, /TestOutput.*NoCondition/)

data/spec/support/shared_examples/orchestration_template.rb

@@ -102,6 +102,13 @@ shared_examples 'an orchestration template' do
       expect(plural_value).to eq([{ foo: 'bar' }])
     end
 
+    it 'allows array returning function for otherwise array value when singular name == plural name' do
+      security_group = described_class.type_module.const_get('AWS_EC2_SecurityGroup').new
+      security_group.Property('SecurityGroupIngress', security_group.FnFindInMap('x', 'y', 'z'))
+      plural_value = security_group.instance_variable_get('@Properties')['SecurityGroupIngress'].value
+      expect(plural_value.to_json).to eql('{"Fn::FindInMap":["x","y","z"]}')
+    end
+
     it 'sets the type of each resource correctly' do
       ec2_instance = subject.EC2_Instance(:foo)
       expect(ec2_instance.instance_variable_get('@Type')).to eq('AWS::EC2::Instance')

data/spec/types_definition_spec.rb

@@ -27,9 +27,10 @@ RSpec.describe 'Type Definitions' do
           it "#{name} has all property types defined" do
             type = type['Properties'] if type.is_a?(Hash) && type.key?('Properties')
             type = type.first if type.is_a?(Array)
-            if type.is_a?(String)
+            case type
+            when String
               expect(types).to have_key(type)
-            elsif type.is_a?(Hash)
+            when Hash
               type.values.flatten.each { |t| expect(types).to have_key(t) }
             else
               raise "A defined type should only be of the form String, Array or Hash, got #{type.class}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,8 @@ files:
 - lib/cfndsl/aws/patches/000_sam.spec.json
 - lib/cfndsl/aws/patches/100_sam.spec_DeploymentPreference_patch.json
 - lib/cfndsl/aws/patches/200_Scrutinies_patch.json
+- lib/cfndsl/aws/patches/500_BadTagsv13.0.0_patch.json
+- lib/cfndsl/aws/patches/500_BadTagsv16.2.0_patch.json
 - lib/cfndsl/aws/patches/500_Cognito_IdentityPoolRoleAttachment_patches.json
 - lib/cfndsl/aws/patches/500_IoT1Click_patch_PlacementTemplate_DeviceTemplates.json
 - lib/cfndsl/aws/patches/500_NetworkAclEntry_patch.json
@@ -82,6 +84,7 @@ files:
 - lib/cfndsl/aws/patches/600_RefKinds_patch.json
 - lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
 - lib/cfndsl/aws/patches/800_List_types_patch.json
+- lib/cfndsl/aws/patches/900_SageMakerTags_patch.json
 - lib/cfndsl/aws/resource_specification.json
 - lib/cfndsl/aws/types.rb
 - lib/cfndsl/aws/types.yaml
@@ -183,15 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL