cfn-model 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488aee5673dda0c608a8e06188e3523533e2b538986f2f87554ee52deae1328b
-  data.tar.gz: d855010ad2a9ae2df2e2034309e8cf042870ea85c73d87385ac919e64e7eb8ec
+  metadata.gz: 8b793b08c7374b3d4b6278501a083db2e33e2a43c7d57127d5c536c3a0502743
+  data.tar.gz: 74b42b3c781f10adb4d177d0498cb0e79ad8ce8c45db20561e9e10db21bb130c
 SHA512:
-  metadata.gz: 8f303ead37c4819bd0b510948e611bc7aded4aedd0194df4dd68df2cae1b03010fbaf68f1ccc5af0f033ed8d70b70e829d39e42b4cfd7b6597ee4495cf2d2311
-  data.tar.gz: fde8609245bab2d49c1c87f0f8229f4d1bd2b488599ed7a06ec63e530a89ddcd918b91ac52b41c60c8c716c69ddaea7a8d5ab089b5f42ffee2db55fd1a97b273
+  metadata.gz: 39cebcc2c3d32eff01af5c361f32ef4f4f877aa2d4533131099e3cb0707e22582e8612b3ac85a4e8a96f28b3a469f325bf5df02530ee5f7bb9a3ae8d7ce9ab27
+  data.tar.gz: 67c0fbbf7cb12f52d00556daeedf6982ec5cf5397fab89b4903dc501b47981b865b9941337ed9d2f2fef39d09ec49f9af9545f99311019216639f29c47dbd981

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

@@ -4,6 +4,7 @@ require 'cfn-model/parser/transform_registry'
 require 'cfn-model/validator/cloudformation_validator'
 require 'cfn-model/validator/reference_validator'
 require_relative 'parser_registry'
+require_relative 'parameter_substitution'
 require_relative 'parser_error'
 Dir["#{__dir__}/../model/*.rb"].each { |model| require "cfn-model/model/#{File.basename(model, '.rb')}" }
 
@@ -32,6 +33,14 @@ class CfnParser
   # Given raw json/yml CloudFormation template, returns a CfnModel object
   # or raise ParserErrors if something is amiss with the format
   def parse(cloudformation_yml, parameter_values_json=nil)
+    cfn_model = parse_without_parameters(cloudformation_yml)
+
+    apply_parameter_values(cfn_model, parameter_values_json)
+
+    cfn_model
+  end
+
+  def parse_without_parameters(cloudformation_yml)
     pre_validate_model cloudformation_yml
 
     cfn_hash = YAML.load cloudformation_yml
@@ -52,36 +61,16 @@ class CfnParser
     # pass 2: tie together separate resources only where necessary to make life easier for rule logic
     post_process_resource_model_elements cfn_model
 
-    apply_parameter_values(cfn_model, parameter_values_json)
-
     cfn_model
   end
 
   private
 
   def apply_parameter_values(cfn_model, parameter_values_json)
-    unless parameter_values_json.nil?
-      parameter_values = JSON.load parameter_values_json
-      unless parameter_values.is_a?(Hash) && parameter_values.has_key?('Parameters')
-        raise JSON::ParserError.new('JSON parameters must be a dictionary with key "Parameters"')
-      end
-      parameter_values['Parameters'].each do |parameter_name, parameter_value|
-        if cfn_model.parameters.has_key?(parameter_name)
-          cfn_model.parameters[parameter_name].synthesized_value = parameter_value.to_s
-        end
-        # not going to complain if there are extra parameters in JSON.... if doing a scan
-        # you only have one file for all the templates
-      end
-
-      # any leftovers get default value
-      # if external values were specified, we take that as a cue to consider defaults
-      # if no external values, we will ignore default values
-      cfn_model.parameters.each do |_, parameter|
-        if parameter.synthesized_value.nil? && !parameter.default.nil?
-          parameter.synthesized_value = parameter.default.to_s
-        end
-      end
-    end
+    ParameterSubstitution.new.apply_parameter_values(
+      cfn_model,
+      parameter_values_json
+    )
   end
 
   def post_process_resource_model_elements(cfn_model)

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

@@ -0,0 +1,63 @@
+require 'json'
+
+class ParameterSubstitution
+  PARAMETER_KEY = 'ParameterKey'
+  PARAMETER_VALUE = 'ParameterValue'
+  PARAMETERS = 'Parameters'
+
+  def apply_parameter_values(cfn_model, parameter_values_json)
+    unless parameter_values_json.nil?
+      parameter_values = JSON.load parameter_values_json
+      if is_aws_format?(parameter_values)
+        parameter_values = convert_aws_to_legacy_format(parameter_values)
+      elsif !is_legacy_format?(parameter_values)
+        format_error = "JSON parameters must be a dictionary with key \"#{PARAMETERS}\" "\
+                       "or an array of ParameterKey/ParameterValue dictionaries"
+        raise JSON::ParserError.new(format_error)
+      end
+      apply_parameter_values_impl cfn_model, parameter_values
+    end
+  end
+
+  private
+
+  def convert_aws_to_legacy_format(parameter_values)
+    legacy_format = {
+      PARAMETERS => {}
+    }
+    parameter_values.reduce(legacy_format) do |result, parameter_value|
+      result[PARAMETERS][parameter_value[PARAMETER_KEY]] = parameter_value[PARAMETER_VALUE]
+      result
+    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)
+        cfn_model.parameters[parameter_name].synthesized_value = parameter_value.to_s
+      end
+      # not going to complain if there are extra parameters in JSON.... if doing a scan
+      # you only have one file for all the templates
+    end
+
+    # any leftovers get default value
+    # if external values were specified, we take that as a cue to consider defaults
+    # if no external values, we will ignore default values
+    cfn_model.parameters.each do |_, parameter|
+      if parameter.synthesized_value.nil? && !parameter.default.nil?
+        parameter.synthesized_value = parameter.default.to_s
+      end
+    end
+  end
+
+  def is_aws_format?(parameter_values)
+    return false unless parameter_values.is_a?(Array)
+    !parameter_values.find do |parameter_value|
+      !parameter_value['ParameterKey'] || !parameter_value['ParameterValue']
+    end
+  end
+
+  def is_legacy_format?(parameter_values)
+    parameter_values.is_a?(Hash) && parameter_values.has_key?(PARAMETERS)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -78,6 +78,7 @@ files:
 - lib/cfn-model/parser/iam_user_parser.rb
 - lib/cfn-model/parser/load_balancer_parser.rb
 - lib/cfn-model/parser/load_balancer_v2_parser.rb
+- lib/cfn-model/parser/parameter_substitution.rb
 - lib/cfn-model/parser/parser_error.rb
 - lib/cfn-model/parser/parser_registry.rb
 - lib/cfn-model/parser/policy_document_parser.rb