cfn-model 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4980780e48883af420ef019bce841105f1c4c33f96e090c491296a2b9f74199
-  data.tar.gz: 21a4292366a0363bec0a92113033f4f759399ca6e0c29063c0d6b5e17525ab90
+  metadata.gz: 7671033cb2d190bc7782352c1331f8529b1ec1ad3debe22802e3e4ef49d7faf9
+  data.tar.gz: 68949533edc714d14032fd4719ccd70dc71d5349f2b8e414a48f75fa31fa5dd5
 SHA512:
-  metadata.gz: bc7e5193fd227a66df09aa86e8810fb019313e32e48834cee1a22931493887b4f8351370017a410058ffb2c149c91adafdc167757eff59904bd957846da2ebf9
-  data.tar.gz: 312c9e00357b034832815b4d0b8148a00a33293de6b4055548b877305e0b9319e41a15a3f928470d02a48eb3c9c7af499f7984d834bf7ba4058779a7aedcab41
+  metadata.gz: '09be423398f6a8b9faba6765d12073c71309359902055a6cc3cf45048e3cd435221e0405ee86564022e7d0d9d0185a4218ceb622ff7f183ff2c39c2bdf0d4d28'
+  data.tar.gz: 4e7757f0c6f7c4a610e071bdd5e544ec345f9e7fc46513339daf217ee018c47d259866661216be662eb751655e82d2eb093bd8c8f628311fab936f285797f0df

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

@@ -112,8 +112,14 @@ class CfnModel
                                                           resource_name,
                                                           with_line_numbers)
 
-        cfn_hash['Resources'][resource_name] = lambda_function lambda_fn_params
-
+        cfn_hash['Resources'][resource_name] = lambda_function(
+          handler: lambda_fn_params[:handler],
+          code_bucket: lambda_fn_params[:code_bucket],
+          code_key: lambda_fn_params[:code_key],
+          role: lambda_fn_params[:role],
+          runtime: lambda_fn_params[:runtime],
+          with_line_numbers: lambda_fn_params[:with_line_numbers]
+        )
         unless serverless_function['Properties']['Role']
           cfn_hash['Resources'][resource_name + 'Role'] = function_role(serverless_function,
                                                                         resource_name,
@@ -122,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.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -156,16 +156,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.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: cfn-model