cfn-model 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c85f3a966c7c0c6cf9dd798efbed371040c3dc48e1166e644514e00c46a4df0
-  data.tar.gz: 24dd16f62e2c5bfecd5cb376971b07b6e0812fc6a3ad91e209afbd97b06a6b35
+  metadata.gz: 819df60d0212456c46c1fe5ae95b97bf33c8cb223a0d4f836e4d2f7e35a9d28e
+  data.tar.gz: 9e29152b3a2988ad4dc31ef0bb40307ae5fcb23dc5752ee13998280ee1b6e660
 SHA512:
-  metadata.gz: ec86e02fb6eb3cd5aadcec87268c27211b62c99deb05db7c894ba7b3a0e76e8e43a87e2312b324bdb81214f1668beb6ed99871882d14ddac036ddc4ba4e811a7
-  data.tar.gz: 23b0bba29253cc7fa5565dd891b471c0dd06ce53f591ebf09d3e7b5bc58de3614e24ea39dce89e3ee6dba99ad38d99a706a6690e4fabe32e27279cbec1076549
+  metadata.gz: 60dff3853250130a0d39e7a4844e1e84f11be354c88600e3b127387e71afbfd6f5aac4f90b8192c7b19559dfd263ef127d7eb0070e016c79347579d3d8efae42
+  data.tar.gz: ec6b71a0376167b1a52857c4570a8e1c199ccf40901d1cff5d31cf26da32d6c01dccd035f0504e712eb344ca62e90b70408277223eff5de8dc85c7c4ef9a2f71

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

@@ -3,7 +3,7 @@
 class CfnModel
   class Transforms
     # Handle transformation of model elements performed by the
-    # Serverless trasnform, see
+    # Serverless transform, see
     # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html
     class Serverless
       def perform_transform(cfn_hash)
@@ -108,6 +108,8 @@ class CfnModel
       def replace_serverless_function(cfn_hash, resource_name, with_line_numbers)
         serverless_function = cfn_hash['Resources'][resource_name]
 
+        original_line_number = serverless_function['Type']['line']
+
         lambda_fn_params = serverless_function_properties(cfn_hash,
                                                           serverless_function,
                                                           resource_name,
@@ -120,15 +122,17 @@ class CfnModel
           role: lambda_fn_params[:role],
           runtime: lambda_fn_params[:runtime],
           reserved_concurrent_executions: lambda_fn_params[:reserved_concurrent_executions],
+          line_number: original_line_number,
           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,
+                                                                        original_line_number,
                                                                         with_line_numbers)
         end
 
-        transform_function_events(cfn_hash, serverless_function, resource_name, with_line_numbers) if \
+        transform_function_events(cfn_hash, serverless_function, resource_name, original_line_number, with_line_numbers) if \
           serverless_function['Properties']['Events']
 
         # Handle passing along cfn-nag specific metadata. SAM itself does not support metadata during transformation.
@@ -156,9 +160,9 @@ class CfnModel
 
       # Return the hash structure of the '<function_name>Role'
       # AWS::IAM::Role resource as created by Serverless transform
-      def function_role(serverless_function, function_name, with_line_numbers)
+      def function_role(serverless_function, function_name, line_number, with_line_numbers)
         fn_role = {
-          'Type' => format_resource_type('AWS::IAM::Role', -1, with_line_numbers),
+          'Type' => format_resource_type('AWS::IAM::Role', line_number, with_line_numbers),
           'Properties' => {
             'ManagedPolicyArns' => function_role_managed_policies(serverless_function['Properties']),
             'AssumeRolePolicyDocument' => lambda_service_can_assume_role
@@ -226,9 +230,10 @@ class CfnModel
                           role:,
                           runtime:,
                           reserved_concurrent_executions:,
+                          line_number:,
                           with_line_numbers: false)
         fn_resource = {
-          'Type' => format_resource_type('AWS::Lambda::Function', -1, with_line_numbers),
+          'Type' => format_resource_type('AWS::Lambda::Function', line_number, with_line_numbers),
           'Properties' => {
             'Handler' => handler,
             'Role' => role,
@@ -242,16 +247,16 @@ class CfnModel
 
       # Return the Event structure of a AWS::Lambda::Function as created
       # by Serverless transform
-      def transform_function_events(cfn_hash, serverless_function, function_name, with_line_numbers)
+      def transform_function_events(cfn_hash, serverless_function, function_name, line_number, with_line_numbers)
         serverless_function['Properties']['Events'].each do |_, event|
-          serverlessrestapi_resources(cfn_hash, event, function_name, with_line_numbers) if \
+          serverlessrestapi_resources(cfn_hash, event, function_name, line_number, with_line_numbers) if \
             matching_resource_type?(event['Type'], 'Api')
         end
       end
 
-      def serverlessrestapi_resources(cfn_hash, event, func_name, with_line_numbers)
+      def serverlessrestapi_resources(cfn_hash, event, func_name, line_number, with_line_numbers)
         # ServerlessRestApi
-        cfn_hash['Resources']['ServerlessRestApi'] ||= serverlessrestapi_base with_line_numbers
+        cfn_hash['Resources']['ServerlessRestApi'] ||= serverlessrestapi_base line_number, with_line_numbers
         add_serverlessrestapi_event(
           cfn_hash['Resources']['ServerlessRestApi']['Properties']['Body']['paths'],
           event,
@@ -259,15 +264,15 @@ class CfnModel
         )
 
         # ServerlessRestApiDeployment
-        cfn_hash['Resources']['ServerlessRestApiDeployment'] = serverlessrestapi_deployment with_line_numbers
+        cfn_hash['Resources']['ServerlessRestApiDeployment'] ||= serverlessrestapi_deployment line_number, with_line_numbers
 
         # ServerlessRestApiProdStage
-        cfn_hash['Resources']['ServerlessRestApiProdStage'] = serverlessrestapi_stage with_line_numbers
+        cfn_hash['Resources']['ServerlessRestApiProdStage'] ||= serverlessrestapi_stage line_number, with_line_numbers
       end
 
-      def serverlessrestapi_base(with_line_nos)
+      def serverlessrestapi_base(line_number, with_line_numbers)
         {
-          'Type' => format_resource_type('AWS::ApiGateway::RestApi', -1, with_line_nos),
+          'Type' => format_resource_type('AWS::ApiGateway::RestApi', line_number, with_line_numbers),
           'Properties' => {
             'Body' => {
               'info' => {
@@ -294,9 +299,9 @@ class CfnModel
         }
       end
 
-      def serverlessrestapi_deployment(with_line_nos)
+      def serverlessrestapi_deployment(line_number, with_line_numbers)
         {
-          'Type' => format_resource_type('AWS::ApiGateway::Deployment', -1, with_line_nos),
+          'Type' => format_resource_type('AWS::ApiGateway::Deployment', line_number, with_line_numbers),
           'Properties' => {
             'Description' => 'Generated by cfn-model',
             'RestApiId' => { 'Ref' => 'ServerlessRestApi' },
@@ -311,9 +316,9 @@ class CfnModel
         }
       end
 
-      def serverlessrestapi_stage(with_line_nos)
+      def serverlessrestapi_stage(line_number, with_line_numbers)
         {
-          'Type' => format_resource_type('AWS::ApiGateway::Stage', -1, with_line_nos),
+          'Type' => format_resource_type('AWS::ApiGateway::Stage', line_number, with_line_numbers),
           'Properties' => {
             'DeploymentId' => { 'Ref' => 'ServerlessRestApiDeployment' },
             'RestApiId' => { 'Ref' => 'ServerlessRestApi' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,9 +193,9 @@ licenses:
 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.3
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.4
   homepage_uri: https://github.com/stelligent/cfn-model
-  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.3
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.4
 post_install_message: 
 rdoc_options: []
 require_paths: