cfn-model 0.5.2 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0912463527f6c2239a20d71bd81ce4d7bd8915d44ffb4dd975d684bc57f36555'
-  data.tar.gz: e0943893a06458b5b49b3cc92a73c5570ebae24a1e5b5458b52e456043f401d4
+  metadata.gz: 36ad8068b8a22556bbcfa227568544fe045f809e5d3fc32be33bd87682de8e44
+  data.tar.gz: 067332f14d8ff714fcff7161871f1b4d7198efdfda05f5462c0e6558e8c2d587
 SHA512:
-  metadata.gz: e56dff8cbc449c62012d268e470500ae4bd946cfb45b8292e86a6ff50375659f76caafe5c9043ccb3727a5d59ca51c90efb80407c3bc065aeb922ed5909b8900
-  data.tar.gz: 3547645ee5d45b27a7679c805f9f57492174245f15782a6d6abf59d7f67dec8f8ba22305ec31c3412bda6605cac728f6ea3bb75cc80affb0e52ac998acdcd259
+  metadata.gz: e28bedd978945aa74ad25947c792b4e851b4902165b7cee05bd8b0109ad73470b48cb374eca11106c56063ff0b5e1b50432e7d6a80d4a07cf03e4ed0d7076f38
+  data.tar.gz: 46951dafa2d6927b240d23309dc25a7f26914ed9b15b5d59908517738fc3c1b5fbafd3a6cbc42d150e84895e1fb483556d9c0ebf8991d7c8a63c97a21602e4d0

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

@@ -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
         }
 
@@ -118,6 +119,7 @@ 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],
           with_line_numbers: lambda_fn_params[:with_line_numbers]
         )
         unless serverless_function['Properties']['Role']
@@ -128,6 +130,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
@@ -214,6 +225,7 @@ class CfnModel
                           code_key: nil,
                           role:,
                           runtime:,
+                          reserved_concurrent_executions:,
                           with_line_numbers: false)
         fn_resource = {
           'Type' => format_resource_type('AWS::Lambda::Function', -1, with_line_numbers),
@@ -223,6 +235,8 @@ class CfnModel
             'Runtime' => runtime
           }
         }
+        fn_resource['Properties']['ReservedConcurrentExecutions'] = reserved_concurrent_executions unless reserved_concurrent_executions.nil?
+
         lambda_function_code(fn_resource, code_bucket, code_key)
       end
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - Eric Kascic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2021-04-21 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
@@ -53,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 description: An object model for CloudFormation templates
-email: 
+email:
 executables:
 - cfn_parse
 extensions: []
@@ -148,25 +190,30 @@ files:
 homepage: https://github.com/stelligent/cfn-model
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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.2
+  homepage_uri: https://github.com/stelligent/cfn-model
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.2
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - 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.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: cfn-model
 test_files: []