modules/mu/config.rb in cloud-mu-3.5.1 vs modules/mu/config.rb in cloud-mu-3.6.3

@@ -339,13 +339,13 @@
             else # not required, no default
               next
             end
           end
           if param.has_key?("cloudtype")
-            getTail(param['name'], value: @@parameters[param['name']], cloudtype: param["cloudtype"], valid_values: param['valid_values'], description: param['description'], prettyname: param['prettyname'], list_of: param['list_of'])
+            getTail(param['name'], value: @@parameters[param['name']], cloudtype: param["cloudtype"], valid_values: param['valid_values'], description: param['description'], prettyname: param['prettyname'], list_of: param['list_of'], flat_list: param['list'])
           else
-            getTail(param['name'], value: @@parameters[param['name']], valid_values: param['valid_values'], description: param['description'], prettyname: param['prettyname'], list_of: param['list_of'])
+            getTail(param['name'], value: @@parameters[param['name']], valid_values: param['valid_values'], description: param['description'], prettyname: param['prettyname'], list_of: param['list_of'], flat_list: param['list'])
           end
         }
       end
 
       raise ValidationError if !ok
@@ -433,12 +433,12 @@
     # Insert a dependency into the config hash of a resource, with sensible
     # error checking and de-duplication.
     # @param resource [Hash]
     # @param name [String]
     # @param type [String]
-    # @param phase [String]
-    # @param no_create_wait [Boolean]
+    # @param their_phase [String]
+    # @param my_phase [String]
     def self.addDependency(resource, name, type, their_phase: "create", my_phase: nil)
       if ![nil, "create", "groom"].include?(their_phase)
         raise MuError, "Invalid their_phase '#{their_phase}' while adding dependency #{type} #{name} to #{resource['name']}"
       end
       resource['dependencies'] ||= []
@@ -826,11 +826,11 @@
         plain_cfg.delete("#TARGETNAME")
         plain_cfg.delete("parent_block") if cfg_plural == "vpcs"
         begin
           JSON::Validator.validate!(myschema, plain_cfg)
         rescue JSON::Schema::ValidationError
-          pp plain_cfg
+          puts PP.pp(plain_cfg, '').bold
           # Use fully_validate to get the complete error list, save some time
           errors = JSON::Validator.fully_validate(myschema, plain_cfg)
           realerrors = []
           errors.each { |err|
             if !err.match(/The property '.+?' of type MU::Config::Tail did not match the following type:/)
@@ -1161,9 +1161,10 @@
       myPublicIp = $myPublicIp
       myRoot = $myRoot
       myAZ = $myAZ
       myRegion = $myRegion
       myAppName = $myAppName
+      credentials = @default_credentials ? @default_credentials : "default"
 
 #      return MU::Config.global_bindings[keyset] if MU::Config.global_bindings[keyset]
       MU::Config.global_bindings[keyset] = binding
       MU::Config.global_bindings[keyset]
     end