cfndsl 1.3.9 → 1.5.0

data/lib/cfndsl/module.rb

@@ -79,7 +79,7 @@ class Module
               raise ArgumentError, "wrong number of arguments (given #{values.size + 1}, expected 1) as #{method}(#{name}) already exists"
             end
             instance.instance_eval(&block) if block
-            return instance
+            instance
           end
         end
       end

data/lib/cfndsl/types.rb

@@ -14,7 +14,10 @@ module CfnDsl
       # and not all resources use the general form
       if property_info['ItemType'] == 'Tag'
         ['Tag']
-      elsif (property_info['ItemType'] == 'Json') && (property_info['Type'] == 'List')
+      elsif (property_info['Type'] == 'List') && %w[Json List].include?(property_info['ItemType'])
+        # List of arbitrary json
+        # or List of list eg - AWS::Rekognition::StreamProcessor.PolygonRegionsOfInterest
+        #   which is actually List of List of embedded type 'Point', but this is not properly represented in the schema
         ['Json']
       else
         Array(root_name + property_info['ItemType'])
@@ -43,8 +46,6 @@ module CfnDsl
               Array(property_info['PrimitiveItemType'])
             elsif property_info['PrimitiveTypes']
               property_info['PrimitiveTypes'][0]
-            elsif property_info['ItemType'] == 'List'
-              'List'
             elsif property_info['ItemType']
               extract_list_type(resource_name.split('::').join, property_info)
             elsif property_info['Type']
@@ -75,8 +76,7 @@ module CfnDsl
         'Double' => 'Double',
         'Timestamp' => 'Timestamp',
         'Map' => 'Map',
-        'Long' => 'Long',
-        'List' => 'List'
+        'Long' => 'Long'
       }
       spec.each_with_object(primitive_types) do |(property_name, property_info), types|
         # In order to name things uniquely and allow for connections
@@ -112,8 +112,7 @@ module CfnDsl
                 elsif nested_prop_info['Type']
                   root_resource_name + nested_prop_info['Type']
                 else
-                  warn "could not extract property type for #{nested_prop_name} from #{property_name}, assuming Json"
-                  p nested_prop_info
+                  warn "could not extract property type for #{nested_prop_name} from #{property_name}, assuming Json\n#{nested_prop_info}"
                   'Json'
                 end
               extracted[nested_prop_name] = nested_prop_type
@@ -275,7 +274,7 @@ module CfnDsl
                 existing.push v
               end
             end
-            return existing
+            existing
           end
         end
       end

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.3.9'
+  VERSION = '1.5.0'
 end

data/spec/aws/nested_arrays_spec.rb

@@ -88,6 +88,25 @@ describe CfnDsl::CloudFormationTemplate do
   end
 
   describe 'Top level Lists' do
+    it 'can add a specific type' do
+      template.S3_Bucket('Bucket') do
+        InventoryConfiguration do
+          Enabled true
+        end
+      end
+      expect(template.to_json).to include('"InventoryConfigurations":[{"Enabled":true}]')
+    end
+
+    it 'handles List of List as arbitrary json' do
+      skip 'requires spec 0.69' unless template.respond_to?(:Rekognition_StreamProcessor)
+      regions = [[{ X: 0.2, Y: 0.4 }, { X: 0.1, Y: 0.5 }, { X: 0.1, Y: 0.9 }], [{ X: 0.6, Y: 0.3 }, { "X": 0.2, "Y": 0.7 }, { "X": 0.1, "Y": 0.1 }]]
+      template.Rekognition_StreamProcessor('StreamProcessor') do
+        # Ouch this has a nasty singular form too! strictly PolygonRegionOfInterest should add one list
+        PolygonRegionsOfInterest regions
+      end
+      expect(template.to_json).to include("\"PolygonRegionsOfInterest\":#{regions.to_json}")
+    end
+
     it 'appends item if singular form != plural form is passed a single item' do
       template.AutoScaling_AutoScalingGroup('ASG') do
         AvailabilityZone 'region-2a'

data/spec/generate_spec.rb

@@ -8,11 +8,13 @@ describe Cfnlego do
   context '#Export' do
     it 'formats correctly' do
       output = "require 'cfndsl'\nCloudFormation do\n  Description 'auto generated cloudformation cfndsl template'\n\n "
-      output << " EC2_EIP('EIP') do\n    Domain String "
-      output << '# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-domain'
-      output << "\n    InstanceId String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-instanceid"
-      output << "\n    PublicIpv4Pool String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-publicipv4pool"
-      output << "\n    Tags [List] # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-tags"
+      output << " EC2_EIP('EIP') do"
+      output << "\n    InstanceId String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-instanceid"
+      output << "\n    PublicIpv4Pool String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-publicipv4pool"
+      output << "\n    TransferAddress String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-transferaddress"
+      output << "\n    Domain String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-domain"
+      output << "\n    Tags [List] # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-tags"
+      output << "\n    NetworkBorderGroup String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-eip.html#cfn-ec2-eip-networkbordergroup"
       output << "\n  end\nend\n"
       expect(template).to eq output
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,14 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL