cfn-model 0.6.1 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc3a4591c1b5668be2ba0c45b49e84097b2537ed7fac5afc354d8b71621b942
-  data.tar.gz: d1b22db490a9c5702d2dcfeaff014955eaed2bf2b988c9eea18651afa148aa34
+  metadata.gz: '0192739b7367787ee3b788d075ce2753c618bbf5962542f9612b0799c458c4ae'
+  data.tar.gz: 0cdec84887e934a1794ba04a97bf7dee42946d668e845573908d801306fc6dc6
 SHA512:
-  metadata.gz: 5036a2c1135ba9a59f2a637d74ecd2898127640d03fc802e03e7a034f01df83d40050c54ba5f2e094c3bbce161544e76c346d96f73fcef6d9f4427ab728a7ccb
-  data.tar.gz: c51fd070edfda12f59a8a75af1226ea3ec577b770b1dbaaaf3268887802d0c5853a8fadc2fc23a23d302d5bb0943d0b95fcc25459f66c7993b6e59ced6f07bf1
+  metadata.gz: 3bab8d35d13d44789d734cceba9289182a9673821d11d8b6e5db34c06d7a7af6ba25db9f5522ac5bfae7ae03d1b39ce79488dc56ba0a38c5d8afec978ab39ae2
+  data.tar.gz: 143f2f5c176f14c1c4c568e5de4be4baf6f289e256daf6197f30fa1310ce770144deeb889cc7b4292355051e802c05a0d30206b0e73ceb059d891e252e407c5c

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

@@ -184,6 +184,7 @@ class CfnParser
       parameter = Parameter.new
       parameter.id = parameter_name
       parameter.type = parameter_hash['Type']
+      parameter.logical_resource_id = parameter_name
 
       parameter_hash.each do |property_name, property_value|
         next if %w(Type).include? property_name
@@ -191,6 +192,7 @@ class CfnParser
       end
 
       cfn_model.parameters[parameter_name] = parameter
+      cfn_model.line_numbers[parameter_name] = parameter_hash['Type']['line']
     end
     cfn_model
   end

data/lib/cfn-model/schema/AWS_Lambda_Function.yml

@@ -14,13 +14,13 @@ mapping:
         required: yes
       Handler:
         type: any
-        required: yes
+        required: no
       Role:
         type: any
         required: yes
       Runtime:
         type: any
-        required: yes
+        required: no
       =:
         type: any
   =:

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)
@@ -93,6 +93,7 @@ class CfnModel
           handler: serverless_function_property(serverless_function, cfn_hash, 'Handler'),
           role: format_function_role(serverless_function, fn_name),
           runtime: serverless_function_property(serverless_function, cfn_hash, 'Runtime'),
+          reserved_concurrent_executions: serverless_function_property(serverless_function, cfn_hash, 'ReservedConcurrentExecutions'),
           with_line_numbers: with_line_numbers
         }
 
@@ -107,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,
@@ -118,15 +121,18 @@ class CfnModel
           code_key: lambda_fn_params[:code_key],
           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.
@@ -154,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
@@ -223,30 +229,34 @@ class CfnModel
                           code_key: nil,
                           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,
             'Runtime' => runtime
           }
         }
+        fn_resource['Properties']['ReservedConcurrentExecutions'] = reserved_concurrent_executions unless reserved_concurrent_executions.nil?
+
         lambda_function_code(fn_resource, code_bucket, code_key)
       end
 
       # 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,
@@ -254,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' => {
@@ -289,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' },
@@ -306,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,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.5
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
@@ -151,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.1
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.5
   homepage_uri: https://github.com/stelligent/cfn-model
-  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.1
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.5
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -170,8 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: cfn-model