cfn-model 0.4.28 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1ac14db4c825a752953a999fca09e56eaaa3e7141146bea1892cfe0c1f350c
-  data.tar.gz: 010c17ccd4d19b1999768d8b41b71dd98f6cca02713cf3065ac6cf208ee4d4f2
+  metadata.gz: 5c60ef54532b89cab5abaf2c3bf9381a7e9e0529f1ee9d1a516941e4ec9e9393
+  data.tar.gz: e77b5257bf99294ddc85ec54763e475be9a5b9ad4e4895e88cb552a7ea302a99
 SHA512:
-  metadata.gz: 2530d80cc408f921c69ec5757c6b4c73a064a1d6e7c980cce9dd3a0441bdd501e82685ceff915c756ea7a4cd4fd52f712ddb7cd63a190686abc9b8613b63de05
-  data.tar.gz: 8f053b02001d51fb7f4130e6b77d0e9cc7d3c36f35d8e3b9c3d55b6d9cc610a9ab02cdb8604c4385556819aa4e7581f2bf23cd912b910220b0f7c7bfd13d8dd6
+  metadata.gz: 1713962ad868efd3d92c97e5eff4a9e6300113afa35cf94f7ac5cd00cc7824c98ba8a9206616cd130a0e939d00e9ec44cbb422af2a0449674712c606b17383be
+  data.tar.gz: e9ba5783d5b37bec3edf86ec7f194c6bbf60bbcb310a87d14ce6e0b03b2b135f8abd565666b8a5ca8403659ca46b17cfb154643d71910ce7e8b04be8bc510e58

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
+  attr_reader :resources, :parameters, :line_numbers, :conditions, :globals, :mappings
 
   ##
   # if you really want it, here it is - the raw Hash from YAML.load.  you'll have to mess with structural nits of
@@ -16,6 +16,7 @@ class CfnModel
     @resources = {}
     @conditions = {}
     @globals = {}
+    @mappings = {}
     @raw_model = nil
     @line_numbers = {}
   end
@@ -38,6 +39,9 @@ class CfnModel
     @resources.each do |k, v|
       new_cfn_model.resources[k] = v
     end
+    @mappings.each do |k, v|
+      new_cfn_model.mappings[k] = v
+    end
     new_cfn_model.raw_model = @raw_model.dup unless @raw_model.nil?
     new_cfn_model
   end

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

@@ -10,24 +10,34 @@ require 'cfn-model/parser/parser_error'
 # clear
 module References
   def self.resolve_value(cfn_model, value)
+
     if value.is_a? Hash
       if value.has_key?('Ref')
-        ref_id = value['Ref']
-        if ref_id.is_a? String
-          if cfn_model.parameters.has_key?(ref_id)
-            return value if cfn_model.parameters[ref_id].synthesized_value.nil?
-            return cfn_model.parameters[ref_id].synthesized_value
-          else
-            return value
-          end
-        else
-          return value
-        end
+        resolve_reference(cfn_model, value)
+      elsif value.has_key?('Fn::FindInMap')
+        resolve_map(cfn_model, value)
+      else
+        value
+      end
+    else
+      value
+    end
+  end
+
+  ##
+  # For a !Ref to another resource.... just returns the !REf
+  # For a !Ref to a Parameter, then try to synthesize the value
+  def self.resolve_reference(cfn_model, value)
+    ref_id = value['Ref']
+    if ref_id.is_a? String
+      if cfn_model.parameters.has_key?(ref_id)
+        return value if cfn_model.parameters[ref_id].synthesized_value.nil?
+        return cfn_model.parameters[ref_id].synthesized_value
       else
         return value
       end
     else
-      return value
+      value
     end
   end
 
@@ -57,6 +67,33 @@ module References
     resolve_resource_id group_id, 'GroupId'
   end
 
+  ##
+  # Try to compute the FindInMap against a real Mapping
+  #
+  # If anything doesn't match up - either a syntax error,
+  # a missing Mapping, or some other kind Cfn evaluation
+  # we don't understand, just return the call to FindInMap
+  def self.resolve_map(cfn_model, find_in_map)
+    map_name = find_in_map['Fn::FindInMap'][0]
+    top_level_key = find_in_map['Fn::FindInMap'][1]
+    second_level_key = find_in_map['Fn::FindInMap'][2]
+
+    map = cfn_model.mappings[map_name]
+
+    return find_in_map if map.nil?
+
+    top_level_resolved = resolve_value(cfn_model, top_level_key)
+
+    return find_in_map if !map.has_key?(top_level_resolved)
+
+    top_level = map[top_level_resolved]
+    second_level = top_level[resolve_value(cfn_model, second_level_key)]
+
+    return find_in_map if second_level.nil?
+
+    second_level
+  end
+
   private
 
   def self.logical_resource_id_from_get_att(attribute_spec, attr_to_retrieve=nil)

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

@@ -76,6 +76,8 @@ class CfnParser
 
     process_conditions cfn_hash, cfn_model, condition_values_json
 
+    process_mappings cfn_hash, cfn_model
+
     # pass 1: wire properties into ModelElement objects
     if with_line_numbers
       transform_hash_into_model_elements_with_numbers cfn_hash, cfn_model
@@ -93,6 +95,14 @@ class CfnParser
 
   private
 
+  def process_mappings(cfn_hash, cfn_model)
+    if cfn_hash.key?('Mappings')
+      cfn_hash['Mappings'].each do |mapping_key, mapping_value|
+        cfn_model.mappings[mapping_key] = mapping_value
+      end
+    end
+  end
+
   def process_conditions(cfn_hash, cfn_model, condition_values_json)
     if cfn_hash.key?('Conditions')
       if condition_values_json.nil?

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

@@ -33,6 +33,32 @@ class ParameterSubstitution
     end
   end
 
+  def apply_pseudo_parameter_values(cfn_model, parameter_values)
+    # leave out 'AWS::NoValue'? not sure - we explicitly check it in some places...
+    # might make sense to substitute here?
+    pseudo_function_defaults = {
+      'AWS::URLSuffix' => 'amazonaws.com',
+      'AWS::Partition' => 'aws',
+      'AWS::NotificationARNs' => '',
+      'AWS::AccountId' => '111111111111',
+      'AWS::Region' => 'us-east-1',
+      'AWS::StackId' => 'arn:aws:cloudformation:us-east-1:111111111111:stack/stackname/51af3dc0-da77-11e4-872e-1234567db123',
+      'AWS::StackName' => 'stackname'
+    }
+    pseudo_function_defaults.each do |function_name, default_value|
+      parameter = Parameter.new
+      parameter.id = function_name
+      parameter.type = 'String'
+      cfn_model.parameters[function_name] = parameter
+
+      if parameter_values[PARAMETERS].has_key?(function_name)
+        parameter.synthesized_value = parameter_values[PARAMETERS][function_name]
+      else
+        parameter.synthesized_value = default_value
+      end
+    end
+  end
+
   def apply_parameter_values_impl(cfn_model, parameter_values)
     parameter_values[PARAMETERS].each do |parameter_name, parameter_value|
       if cfn_model.parameters.has_key?(parameter_name)
@@ -50,6 +76,7 @@ class ParameterSubstitution
         parameter.synthesized_value = parameter.default.to_s
       end
     end
+    apply_pseudo_parameter_values(cfn_model, parameter_values)
   end
 
   def is_aws_format?(parameter_values)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.29
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop