cfn-model 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4e39515d2ee0750c7ef71ec03c1f74d2345493621b99ad454ed0ef73013767
-  data.tar.gz: acff3ed655ee47fb57c2fcd1c107c6bd0a6e6d47695ee1d7bab69ae6716b83d0
+  metadata.gz: a30f11c718dd0eff8aca481d309eb43ec956fb7589f4bac4509568029c49d96a
+  data.tar.gz: b49b0f87f0314422b9596e83377ac80ab53f8587426549b8dca118c9bc1f56e3
 SHA512:
-  metadata.gz: 5ea5adf97d67de8fa64278cd5d83c7b3482f53d559eac400dd2be17c0024e42b7b8225248e1b007c32a51ec8b24f717c5559721405d5ce15f5a81e78e346c4ec
-  data.tar.gz: bdc94a195a2f246874bc6d8e98b0b222c45e7a14efa4bfe913b760f489336b2955ed57f66c5663682c86fa5ffaf53a5656e12a6f9544806a13a56327b2b3aeb4
+  metadata.gz: 5be4b84d0149684785f3696941d2a288f7f7080057bb2d31945e9561ca73625134aed3a9a405930651d3bdcdc29529f79bc2ab7b2a31b80eeb81b7cc9ae18306
+  data.tar.gz: f863433dfba321ace4cfd1b685d2176b8ff56ec09826f9b6863f44079b7ac96ecf80206f394ac2f0967082686c9ca7e95bfc0343e10294cc38b4780005bd12d1

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

@@ -7,10 +7,13 @@ class CfnModel
     # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html
     class Serverless
       def perform_transform(cfn_hash)
+        with_line_numbers = false
         resources = cfn_hash['Resources'].clone
         resources.each do |resource_name, resource|
-          next unless resource['Type'].eql? 'AWS::Serverless::Function'
-          replace_serverless_function cfn_hash, resource_name
+          next unless matching_resource_type?(resource['Type'], 'AWS::Serverless::Function')
+
+          with_line_numbers = true if resource['Type'].is_a? Hash
+          replace_serverless_function cfn_hash, resource_name, with_line_numbers
         end
       end
 
@@ -39,6 +42,23 @@ class CfnModel
         end
       end
 
+      def matching_resource_type?(resource_type, type_to_match)
+        matching_string_resource_type?(resource_type, type_to_match) ||
+          matching_line_number_enriched_resource_type?(resource_type, type_to_match)
+      end
+
+      def matching_string_resource_type?(resource_type, type_to_match)
+        resource_type.is_a?(String) && resource_type.eql?(type_to_match)
+      end
+
+      def matching_line_number_enriched_resource_type?(resource_type, type_to_match)
+        resource_type.is_a?(Hash) && resource_type['value'].eql?(type_to_match)
+      end
+
+      def format_resource_type(type, line_no, numbers)
+        numbers ? { 'value' => type, 'line' => line_no } : type
+      end
+
       def resolve_globals_function_property(cfn_hash, property_name)
         cfn_hash['Globals'] && cfn_hash['Globals']['Function'] && cfn_hash['Globals']['Function'][property_name]
       end
@@ -61,12 +81,13 @@ class CfnModel
         lambda_fn_params
       end
 
-      def serverless_function_properties(cfn_hash, serverless_function)
+      def serverless_function_properties(cfn_hash, serverless_function, with_line_numbers)
         code_uri = serverless_function_property(serverless_function, cfn_hash, 'CodeUri')
 
         lambda_fn_params = {
           handler: serverless_function_property(serverless_function, cfn_hash, 'Handler'),
-          runtime: serverless_function_property(serverless_function, cfn_hash, 'Runtime')
+          runtime: serverless_function_property(serverless_function, cfn_hash, 'Runtime'),
+          with_line_numbers: with_line_numbers
         }
 
         lambda_fn_params = transform_code_uri(
@@ -77,15 +98,15 @@ class CfnModel
         lambda_fn_params
       end
 
-      def replace_serverless_function(cfn_hash, resource_name)
+      def replace_serverless_function(cfn_hash, resource_name, with_line_numbers)
         serverless_function = cfn_hash['Resources'][resource_name]
 
-        lambda_fn_params = serverless_function_properties(cfn_hash, serverless_function)
+        lambda_fn_params = serverless_function_properties(cfn_hash, serverless_function, with_line_numbers)
 
         cfn_hash['Resources'][resource_name] = lambda_function lambda_fn_params
-        cfn_hash['Resources']['FunctionNameRole'] = function_name_role
+        cfn_hash['Resources']['FunctionNameRole'] = function_name_role with_line_numbers
 
-        transform_function_events(cfn_hash, serverless_function, resource_name) if \
+        transform_function_events(cfn_hash, serverless_function, resource_name, with_line_numbers) if \
           serverless_function['Properties']['Events']
       end
 
@@ -104,9 +125,9 @@ class CfnModel
 
       # Return the hash structure of the 'FunctionNameRole'
       # AWS::IAM::Role resource as created by Serverless transform
-      def function_name_role
+      def function_name_role(with_line_numbers)
         {
-          'Type' => 'AWS::IAM::Role',
+          'Type' => format_resource_type('AWS::IAM::Role', -1, with_line_numbers),
           'Properties' => {
             'ManagedPolicyArns' => [
               'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
@@ -131,9 +152,10 @@ class CfnModel
       def lambda_function(handler:,
                           code_bucket: nil,
                           code_key: nil,
-                          runtime:)
+                          runtime:,
+                          with_line_numbers: false)
         fn_resource = {
-          'Type' => 'AWS::Lambda::Function',
+          'Type' => format_resource_type('AWS::Lambda::Function', -1, with_line_numbers),
           'Properties' => {
             'Handler' => handler,
             'Role' => { 'Fn::GetAtt' => %w[FunctionNameRole Arn] },
@@ -145,15 +167,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)
+      def transform_function_events(cfn_hash, serverless_function, function_name, with_line_numbers)
         serverless_function['Properties']['Events'].each do |_, event|
-          serverlessrestapi_resources(cfn_hash, event, function_name) if event['Type'] == 'Api'
+          serverlessrestapi_resources(cfn_hash, event, function_name, with_line_numbers) if \
+            matching_resource_type?(event['Type'], 'Api')
         end
       end
 
-      def serverlessrestapi_resources(cfn_hash, event, func_name)
+      def serverlessrestapi_resources(cfn_hash, event, func_name, with_line_numbers)
         # ServerlessRestApi
-        cfn_hash['Resources']['ServerlessRestApi'] ||= serverlessrestapi_base
+        cfn_hash['Resources']['ServerlessRestApi'] ||= serverlessrestapi_base with_line_numbers
         add_serverlessrestapi_event(
           cfn_hash['Resources']['ServerlessRestApi']['Properties']['Body']['paths'],
           event,
@@ -161,15 +184,15 @@ class CfnModel
         )
 
         # ServerlessRestApiDeployment
-        cfn_hash['Resources']['ServerlessRestApiDeployment'] = serverlessrestapi_deployment
+        cfn_hash['Resources']['ServerlessRestApiDeployment'] = serverlessrestapi_deployment with_line_numbers
 
         # ServerlessRestApiProdStage
-        cfn_hash['Resources']['ServerlessRestApiProdStage'] = serverlessrestapi_stage
+        cfn_hash['Resources']['ServerlessRestApiProdStage'] = serverlessrestapi_stage with_line_numbers
       end
 
-      def serverlessrestapi_base
+      def serverlessrestapi_base(with_line_nos)
         {
-          'Type' => 'AWS::ApiGateway::RestApi',
+          'Type' => format_resource_type('AWS::ApiGateway::RestApi', -1, with_line_nos),
           'Properties' => {
             'Body' => {
               'info' => {
@@ -196,20 +219,26 @@ class CfnModel
         }
       end
 
-      def serverlessrestapi_deployment
+      def serverlessrestapi_deployment(with_line_nos)
         {
-          'Type' => 'AWS::ApiGateway::Deployment',
+          'Type' => format_resource_type('AWS::ApiGateway::Deployment', -1, with_line_nos),
           'Properties' => {
             'Description' => 'Generated by cfn-model',
             'RestApiId' => { 'Ref' => 'ServerlessRestApi' },
+            'StageDescription' => {
+              'AccessLogSetting' => {
+                'DestinationArn' => 'arn:aws:logs:region:account:group/ApiLogs',
+                'Format' => '$context.requestId'
+              }
+            },
             'StageName' => 'Stage'
           }
         }
       end
 
-      def serverlessrestapi_stage
+      def serverlessrestapi_stage(with_line_nos)
         {
-          'Type' => 'AWS::ApiGateway::Stage',
+          'Type' => format_resource_type('AWS::ApiGateway::Stage', -1, with_line_nos),
           '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.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop