cfn-model 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aef1495499472493a59d8d4a674eb275bad575fccf3b7eaa6d91db4308d3914
-  data.tar.gz: cd9340c44f684f0e6eeedbbd7f7e2a84826b79bede5f09c5930f3b7bdca2f3f3
+  metadata.gz: 8dc3a4591c1b5668be2ba0c45b49e84097b2537ed7fac5afc354d8b71621b942
+  data.tar.gz: d1b22db490a9c5702d2dcfeaff014955eaed2bf2b988c9eea18651afa148aa34
 SHA512:
-  metadata.gz: 33b02918cbb23f06c2c74b05bf7897f17d78896b74bfcdf80fd8be619cb69d7385a161809ddbb7a8ad632e4f5af618e2508712b7615ae6ec72980180823a2338
-  data.tar.gz: 3cfb410027085088f737643e4197ad7e1238ebff994bfac19b62738ff53d0a609583cfe1919c4ec89ff1c9e968276fc5727c0bf07f90ab3a17ce4d898da79001
+  metadata.gz: 5036a2c1135ba9a59f2a637d74ecd2898127640d03fc802e03e7a034f01df83d40050c54ba5f2e094c3bbce161544e76c346d96f73fcef6d9f4427ab728a7ccb
+  data.tar.gz: c51fd070edfda12f59a8a75af1226ea3ec577b770b1dbaaaf3268887802d0c5853a8fadc2fc23a23d302d5bb0943d0b95fcc25459f66c7993b6e59ced6f07bf1

data/lib/cfn-model/parser/cfn_parser.rb

@@ -281,7 +281,7 @@ class CfnParser
 
   def map_non_aws_resource_name_to_class_name(module_names)
     # this is a little hacky.  we've been ignoring Custom so more for
-    # backward compat.  for Alexa and other transformed resources just jam the whole
+    # backward compat. for Alexa and other transformed resources just jam the whole
     # thing together
     if module_names.first == 'Custom'
       first_module_index = 1
@@ -308,7 +308,8 @@ class CfnParser
     else
       custom_resource_class_name = map_non_aws_resource_name_to_class_name(module_names)
       begin
-        resource_class = Object.const_get custom_resource_class_name
+        custom_class = Object.const_get custom_resource_class_name
+        resource_class = custom_class if custom_class.is_a?(ModelElement)
       rescue NameError
         Object.const_set(custom_resource_class_name, resource_class)
       end

data/lib/cfn-model/transforms/serverless.rb

@@ -128,6 +128,15 @@ class CfnModel
 
         transform_function_events(cfn_hash, serverless_function, resource_name, with_line_numbers) if \
           serverless_function['Properties']['Events']
+
+        # Handle passing along cfn-nag specific metadata. SAM itself does not support metadata during transformation.
+        # https://github.com/aws/serverless-application-model/issues/264
+        if serverless_function.key?('Metadata') && serverless_function['Metadata'].key?('cfn_nag')
+          cfn_hash['Resources'][resource_name]['Metadata'] = serverless_function['Metadata']
+          unless serverless_function['Properties']['Role']
+            cfn_hash['Resources'][resource_name + 'Role']['Metadata'] = serverless_function['Metadata']
+          end
+        end
       end
 
       def lambda_service_can_assume_role

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -148,7 +148,12 @@ files:
 homepage: https://github.com/stelligent/cfn-model
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/stelligent/cfn-model/issues
+  changelog_uri: https://github.com/stelligent/cfn-model/releases
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.1
+  homepage_uri: https://github.com/stelligent/cfn-model
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -156,16 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: cfn-model