cfndsl 1.4.0 → 1.6.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

@@ -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.4.0'
+  VERSION = '1.6.0'
 end

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.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,6 @@ files:
 - lib/cfndsl/aws/patches/500_NetworkAclEntry_patch.json
 - lib/cfndsl/aws/patches/500_SAM_Serverless_Function_S3Event_Events_patch.json
 - lib/cfndsl/aws/patches/500_SAM_Serverless_Function_S3Location_Version_patch.json
-- lib/cfndsl/aws/patches/500_SSM_AssociationName_patch.json
 - lib/cfndsl/aws/patches/500_VPCEndpoint_patch.json
 - lib/cfndsl/aws/patches/510_ElasticSearch_Domain_patches.json
 - lib/cfndsl/aws/patches/520_ServiceDiscovery_InstanceAttributes_patch.json
@@ -187,14 +186,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

data/lib/cfndsl/aws/patches/500_SSM_AssociationName_patch.json

@@ -1,16 +0,0 @@
-{
-    "ResourceTypes": {
-        "AWS::SSM::Association": {
-            "patch": {
-                "description": "rename +Name+ to +DocumentName+ to clearly indicate what the attribute is for",
-                "operations": [
-                    {
-                        "from": "/Properties/Name",
-                        "op": "move",
-                        "path": "/Properties/DocumentName"
-                    }
-                ]
-            }
-        }
-    }
-}