cfn-model 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ad8068b8a22556bbcfa227568544fe045f809e5d3fc32be33bd87682de8e44
-  data.tar.gz: 067332f14d8ff714fcff7161871f1b4d7198efdfda05f5462c0e6558e8c2d587
+  metadata.gz: 696ba992da760c8627ace103dccdce05b2eeec0404cc568ed7086fc74b734a5f
+  data.tar.gz: 335d86d84e4f2be5249c954392f1bb889fe19fbbe20b48f81261abdc03f5c74f
 SHA512:
-  metadata.gz: e28bedd978945aa74ad25947c792b4e851b4902165b7cee05bd8b0109ad73470b48cb374eca11106c56063ff0b5e1b50432e7d6a80d4a07cf03e4ed0d7076f38
-  data.tar.gz: 46951dafa2d6927b240d23309dc25a7f26914ed9b15b5d59908517738fc3c1b5fbafd3a6cbc42d150e84895e1fb483556d9c0ebf8991d7c8a63c97a21602e4d0
+  metadata.gz: 0fdc30f8d26a35eb6a91e2146cf37f5dc2ddd7ef3d7d0abba24010efcde2206d82cdede85fe3e0b3c53eccdfb8562126dc84d17b542b9304eb56919e0e6301e1
+  data.tar.gz: 4046b076c06c39f0a61b207921b8ce96ecfa519ff5955895bf0f29b5789b07347adebf2c2eb4c12b069672fd2a71ceef98ce87f3e0afb4214836038768bd388a

data/lib/cfn-model/model/cfn_model.rb

@@ -3,7 +3,7 @@
 require_relative 'references'
 
 class CfnModel
-  attr_reader :resources, :parameters, :line_numbers, :conditions, :globals, :mappings
+  attr_reader :resources, :parameters, :line_numbers, :conditions, :globals, :mappings, :element_types
 
   ##
   # if you really want it, here it is - the raw Hash from YAML.load.  you'll have to mess with structural nits of
@@ -19,6 +19,7 @@ class CfnModel
     @mappings = {}
     @raw_model = nil
     @line_numbers = {}
+    @element_types = {}
   end
 
   ##

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

@@ -156,6 +156,7 @@ class CfnParser
       assign_fields_based_upon_properties resource_object, resource, cfn_model
 
       cfn_model.resources[resource_name] = resource_object
+      cfn_model.element_types[resource_name] = "resource"
     end
     cfn_model
   end
@@ -173,6 +174,7 @@ class CfnParser
 
       cfn_model.resources[resource_name] = resource_object
       cfn_model.line_numbers[resource_name] = resource['Type']['line']
+      cfn_model.element_types[resource_name] = "resource"
     end
     cfn_model
   end
@@ -184,6 +186,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 +194,8 @@ class CfnParser
       end
 
       cfn_model.parameters[parameter_name] = parameter
+      cfn_model.line_numbers[parameter_name] = parameter_hash['Type']['line']
+      cfn_model.element_types[parameter_name] = "parameter"
     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)
@@ -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.2
+  version: 0.6.6
 platform: ruby
 authors:
 - Eric Kascic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 description: An object model for CloudFormation templates
-email:
+email: 
 executables:
 - cfn_parse
 extensions: []
@@ -193,10 +193,10 @@ 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.2
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.6
   homepage_uri: https://github.com/stelligent/cfn-model
-  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.2
-post_install_message:
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.6
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: cfn-model
 test_files: []