cloud-mu 3.5.0 → 3.6.3

data/modules/mu/config/schema_helpers.rb

@@ -439,17 +439,45 @@ module MU
             "description" => "For resources which span regions, restrict to regions inside the United States",
             "default" => false
         },
-        "conditions" => {
-            "type" => "array",
-            "items" => {
-              "type" => "object",
-              "required" => ["name", "cloudcode"],
-              "description" => "CloudFormation-specific. Define Conditions as in http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/conditions-section-structure.html. Arguments must use the cloudCode() macro.",
-              "properties" => {
-                "name" => { "required" => true, "type" => "string" },
-                "cloudcode" => { "required" => true, "type" => "string" },
+        "generate_passwords" => {
+          "type" => "array",
+          "items" => {
+            "type" => "object",
+            "required" => ["itemname"],
+            "description" => "Generate a password-like string upon initial deployment and store it in the named item in this deploy's vault.",
+            "properties" => {
+              "itemname" => {
+                "type" => "string",
+                "description" => "The vault item into which this password should be injected"
+              },
+              "username" => {
+                "type" => "string",
+                "description" => "Optional string to add to vault data under the +username+ field"
+              },
+              "minlength" => {
+                "type" => "integer",
+                "description" => "The minimum length of the generated password",
+                "default" => 14
+              },
+              "safe_chars" => {
+                "type" => "string",
+                "descriptions" => "Characters (in addition to digits and latin letters) which should be considered for inclusion",
+                "default" => '~!@#%^&*_-+=`|(){}[]:;<>,.?'
               }
             }
+          }
+        },
+        "conditions" => {
+          "type" => "array",
+          "items" => {
+            "type" => "object",
+            "required" => ["name", "cloudcode"],
+            "description" => "CloudFormation-specific. Define Conditions as in http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/conditions-section-structure.html. Arguments must use the cloudCode() macro.",
+            "properties" => {
+              "name" => { "required" => true, "type" => "string" },
+              "cloudcode" => { "required" => true, "type" => "string" },
+            }
+          }
         },
         "parameters" => {
             "type" => "array",
@@ -465,6 +493,11 @@ module MU
                     "type" => "string",
                     "description" => "Treat the value as a comma-separated list of values with this key name, equivalent to CloudFormation's various List<> types. For example, set to 'subnet_id' to pass values as an array of subnet identifiers as the 'subnets' argument of a VPC stanza."
                   },
+                  "list" => {
+                    "type" => "boolean",
+                    "default" => false,
+                    "description" => "Treat the value as a comma-separated list to be converted into an array of strings. This will be ignored if {list_of} is set."
+                  },
                   "prettyname" => {
                     "type" => "string",
                     "description" => "An alternative name to use when generating parameter fields in, for example, CloudFormation templates"

data/modules/mu/config/server.rb

@@ -30,12 +30,12 @@ module MU
           if !server['active_directory'].nil?
             ["domain_admin_vault", "domain_join_vault"].each { |vault_class|
               server['vault_access'] << {
-                  "vault" => server['active_directory'][vault_class]['vault'],
-                  "item" => server['active_directory'][vault_class]['item']
+                "vault" => server['active_directory'][vault_class]['vault'],
+                "item" => server['active_directory'][vault_class]['item']
               }
               item = groomclass.getSecret(
-                  vault: server['active_directory'][vault_class]['vault'],
-                  item: server['active_directory'][vault_class]['item'],
+                vault: server['active_directory'][vault_class]['vault'],
+                item: server['active_directory'][vault_class]['item'],
               )
               ["username_field", "password_field"].each { |field|
                 if !item.has_key?(server['active_directory'][vault_class][field])
@@ -50,8 +50,8 @@ module MU
             server['use_cloud_provider_windows_password'] = false
 
             server['vault_access'] << {
-                "vault" => server['windows_auth_vault']['vault'],
-                "item" => server['windows_auth_vault']['item']
+              "vault" => server['windows_auth_vault']['vault'],
+              "item" => server['windows_auth_vault']['item']
             }
             item = groomclass.getSecret(
               vault: server['windows_auth_vault']['vault'],
@@ -67,6 +67,7 @@ module MU
           # Check all of the non-special ones while we're at it
           server['vault_access'].each { |v|
             next if v['vault'] == "splunk" and v['item'] == "admin_user"
+            next if !v['vault'] # assumed to be the one the server or database will always have
             item = groomclass.getSecret(vault: v['vault'], item: v['item'])
           }
         rescue MuError
@@ -445,6 +446,21 @@ module MU
                 "value_is" => "centos7",
                 "set" => "centos"
               },
+              {
+                "key_is" => "platform",
+                "value_is" => "amazon",
+                "set" => "ec2-user"
+              },
+              {
+                "key_is" => "platform",
+                "value_is" => "amazon2",
+                "set" => "ec2-user"
+              },
+              {
+                "key_is" => "platform",
+                "value_is" => "amazon2023",
+                "set" => "ec2-user"
+              },
               {
                 "key_is" => "platform",
                 "value_is" => "centos8",
@@ -478,32 +494,32 @@ module MU
               "type" => "object",
               "description" => "Chef Node structure artifact for mu-tools cookbook.",
           },
-          # Objects here will be stored in this node's Chef Vault
+          # Objects here will be stored in this node's Chef/Ansible/etc Vault
           "secrets" => {
               "type" => "object",
-              "description" => "JSON artifact to be stored in Chef Vault for this node. Note that these values will still be stored in plain text local to the MU server, but only accessible to nodes via Vault."
+              "description" => "JSON artifact to be stored the appropriate groomer vault for this node. Note that these values will still be stored in plain text local to the MU server, but only accessible to nodes via Vault."
           },
           # This node will be granted access to the following Vault items.
           "vault_access" => {
-              "type" => "array",
-              "minItems" => 1,
-              "items" => {
-                  "description" => "Chef Vault items to which this node should be granted access.",
-                  "type" => "object",
-                  "title" => "vault_access",
-                  "required" => ["vault", "item"],
-                  "additionalProperties" => false,
-                  "properties" => {
-                      "vault" => {
-                          "type" => "string",
-                          "description" => "The Vault to which this node should be granted access."
-                      },
-                      "item" => {
-                          "type" => "string",
-                          "description" => "The item within the Vault to which this node should be granted access."
-                      }
-                  }
+            "type" => "array",
+            "minItems" => 1,
+            "items" => {
+              "description" => "Chef Vault items to which this node should be granted access.",
+              "type" => "object",
+              "title" => "vault_access",
+              "required" => ["item"],
+              "additionalProperties" => false,
+              "properties" => {
+                "vault" => {
+                  "type" => "string",
+                  "description" => "The Vault to which this node should be granted access. If not specified, will resolve to this resource's own vault (ex +MYAPP-DEV-2021091617-QT-FOODB+)"
+                },
+                "item" => {
+                  "type" => "string",
+                  "description" => "The item within the Vault to which this node should be granted access."
+                }
               }
+            }
           },
           "existing_deploys" => {
             "type" => "array",
@@ -590,7 +606,7 @@ module MU
               "monitoring" => {
                   "type" => "boolean",
                   "default" => true,
-                  "description" => "Enable detailed instance monitoring.",
+                  "description" => "Enable detailed cloud provider instance monitoring.",
               },
               "private_ip" => {
                 "type" => "string",

data/modules/mu/config/tail.rb

@@ -41,14 +41,16 @@ module MU
       attr_reader :runtimecode
       attr_reader :valid_values
       attr_reader :is_list_element
+      attr_reader :is_flat_list
 
-      def initialize(name, value, prettyname = nil, cloudtype = "String", valid_values = [], description = "", is_list_element = false, prefix: "", suffix: "", pseudo: false, runtimecode: nil, index: 0)
+      def initialize(name, value, prettyname = nil, cloudtype = "String", valid_values = [], description = "", is_list_element = false, prefix: "", suffix: "", pseudo: false, runtimecode: nil, index: 0, is_flat_list: false)
         @name = name
         @bindings = {}
         @value = value
         @valid_values = valid_values
         @pseudo = pseudo
         @index = index
+        @is_flat_list = is_flat_list
         @runtimecode = runtimecode
         @cloudtype = cloudtype
         @is_list_element = is_list_element
@@ -142,7 +144,7 @@ module MU
     # @param suffix [<String>]: A static String that should be appended to the stored value when queried
     # @param pseudo [<Boolean>]: This is a pseudo-parameter, automatically provided, and not available as user input.
     # @param runtimecode [<String>]: Actual code to allow the cloud layer to interpret literally in its own idiom, e.g. '"Ref" : "AWS::StackName"' for CloudFormation
-    def getTail(param, value: nil, prettyname: nil, cloudtype: "String", valid_values: [], description: nil, list_of: nil, prefix: "", suffix: "", pseudo: false, runtimecode: nil)
+    def getTail(param, value: nil, prettyname: nil, cloudtype: "String", valid_values: [], description: nil, list_of: nil, flat_list: false, prefix: "", suffix: "", pseudo: false, runtimecode: nil)
       param = param.gsub(/[^a-z0-9_]/i, "_")
       if value.nil?
         if @@parameters.nil? or !@@parameters.has_key?(param)
@@ -156,23 +158,30 @@ module MU
       if !prettyname.nil?
         prettyname.gsub!(/[^a-z0-9]/i, "") # comply with CloudFormation restrictions
       end
+
       if value.is_a?(MU::Config::Tail)
         MU.log "Parameter #{param} is using a nested parameter as a value. This rarely works, depending on the target cloud. YMMV.", MU::WARN
         tail = MU::Config::Tail.new(param, value, prettyname, cloudtype, valid_values, description, prefix: prefix, suffix: suffix, pseudo: pseudo, runtimecode: runtimecode)
-      elsif !list_of.nil? or (@@tails.has_key?(param) and @@tails[param].is_a?(Array))
+      elsif !list_of.nil? or flat_list or (@@tails.has_key?(param) and @@tails[param].is_a?(Array))
         tail = []
         count = 0
         value.split(/\s*,\s*/).each { |subval|
           if @@tails.has_key?(param) and !@@tails[param][count].nil?
-            subval = @@tails[param][count].values.first.to_s if subval.nil?
-            list_of = @@tails[param][count].values.first.getName if list_of.nil?
-            prettyname = @@tails[param][count].values.first.getPrettyName if prettyname.nil?
-            description = @@tails[param][count].values.first.description if description.nil?
-            valid_values = @@tails[param][count].values.first.valid_values if valid_values.nil? or valid_values.empty?
-            cloudtype = @@tails[param][count].values.first.getCloudType if @@tails[param][count].values.first.getCloudType != "String"
+            src = @@tails[param][count].is_a?(Hash) ? @@tails[param][count].values.first : @@tails[param][count]
+            subval ||= src.to_s
+            is_flat_list = !(@@tails[param][count].is_a?(Hash))
+            list_of ||= src.getName
+            prettyname ||= src.getPrettyName
+            description ||= src.description
+            valid_values = src.valid_values if valid_values.nil? or valid_values.empty?
+            cloudtype = src.getCloudType if src.getCloudType != "String"
           end
           prettyname = param.capitalize if prettyname.nil?
-          tail << { list_of => MU::Config::Tail.new(list_of, subval, prettyname, cloudtype, valid_values, description, true, pseudo: pseudo, index: count) }
+          if !is_flat_list and list_of
+            tail << { list_of => MU::Config::Tail.new(list_of, subval, prettyname, cloudtype, valid_values, description, true, pseudo: pseudo, index: count) }
+          else
+            tail << MU::Config::Tail.new(param, subval, prettyname, cloudtype, valid_values, description, true, pseudo: pseudo, index: count, is_flat_list: true)
+          end
           count = count + 1
         }
       else

data/modules/mu/config.rb

@@ -341,9 +341,9 @@ module MU
             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
@@ -435,8 +435,8 @@ module MU
     # @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']}"
@@ -828,7 +828,7 @@ module MU
         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 = []
@@ -1163,6 +1163,7 @@ module MU
       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

data/modules/mu/defaults/AWS.yaml

@@ -1,66 +1,53 @@
 ---
-rhel71: &5
-  us-east-1: ami-0c834836b3bd45e2f
-  ap-northeast-1: ami-036bb589253fe929e
-  ap-northeast-2: ami-0e39b4957dbc7e14d
-  ap-south-1: ami-0cd0554d9a05dddc9
-  ap-southeast-1: ami-0bae2684e9ed09b8b
-  ap-southeast-2: ami-0711ccf93abe3989b
-  ca-central-1: ami-0d75d90f73e417c25
-  eu-central-1: ami-0cae3cb53b9bbd783
-  eu-north-1: ami-0cd30fe8547a809f7
-  eu-west-1: ami-01441cca97c35eb0e
-  eu-west-2: ami-051aaf1b532b3e6bc
-  eu-west-3: ami-09a7af6793a3e8d09
-  sa-east-1: ami-0c4064cfe711311d5
-  us-east-2: ami-0124fd8917f59f8ce
-  us-west-1: ami-00457c55541605cb4
-  us-west-2: ami-02211d4e254a9e10f
-centos6: &4
-  us-east-1: ami-0ac9258984ed4bb4a
-  us-east-2: ami-09888b2b4484f774a
-  us-west-1: ami-04e7e499cdb873bfa
-  us-west-2: ami-0fcd16e6cf3c4b100
-  ap-northeast-1: ami-098052d1926fd4297
-  ap-northeast-2: ami-0319e58869a7b5bf2
-  ap-south-1: ami-0d19f7ad27c77cbf6
-  ap-southeast-1: ami-04b6b2013a296075c
-  ap-southeast-2: ami-07f02efb410df7e1d
-  ca-central-1: ami-0e7cc87df5666a78c
-  eu-central-1: ami-0cc33b333c7b7acd6
-  eu-north-1: ami-0bc09b1d6b4f351ea
-  eu-west-1: ami-08a7f444dba463099
-  eu-west-2: ami-0e84e5ba9694be11b
-  eu-west-3: ami-08e28291804571999
-  sa-east-1: ami-0b447e11308862517
-centos7:
-  us-east-1: ami-08d24209f345a21ab
-  ap-northeast-1: ami-001cfcb3548768288
-  ap-northeast-2: ami-0a2f6ec79ed710bf7
-  ap-south-1: ami-05e0c30fc8b2a21a2
-  ap-southeast-1: ami-0b28f5573dd4aa62a
-  ap-southeast-2: ami-026419375863852b7
-  ca-central-1: ami-01e799689fa5c1f31
-  eu-central-1: ami-0ded33da6c28082d8
-  eu-north-1: ami-02c7692e69b06afc5
-  eu-west-1: ami-086619450a959a101
-  eu-west-2: ami-05db24096d56207f6
-  eu-west-3: ami-03ea610526da7c2f3
-  sa-east-1: ami-0029cb6ee83a799ca
-  us-east-2: ami-065847253b2d4acab
-  us-west-1: ami-0ea3494c08412920e
-  us-west-2: ami-055ce4c70b0ceabcb
-ubuntu16: &3
-  us-east-1: ami-bcdc16c6
-  us-west-1: ami-1b17257b
-  us-west-2: ami-19e92861
-  eu-west-1: ami-eed00d97
-  eu-central-1: ami-e613ac89
-  sa-east-1: ami-1ca7d970
-  ap-northeast-1: ami-6959870f
-  ap-northeast-2: ami-08d77266
-  ap-southeast-1: ami-d9dca7ba
-  ap-southeast-2: ami-02ad4060
+ubuntu20: &3
+  af-south-1: ami-0670428c515903d37
+  ap-east-1: ami-0350928fdb53ae439
+  ap-northeast-1: ami-0a3eb6ca097b78895
+  ap-south-1: ami-05ba3a39a75be1ec4
+  ap-southeast-1: ami-0750a20e9959e44ff
+  ca-central-1: ami-073c944d45ffb4f27
+  eu-central-1: ami-02584c1c9d05efa69
+  eu-north-1: ami-09f0506c9ef0fb473
+  eu-south-1: ami-06ea0ad3f5adc2565
+  eu-west-1: ami-00e7df8df28dfa791
+  me-south-1: ami-05b680b37c7917206
+  sa-east-1: ami-077518a464c82703b
+  us-east-1: ami-0c4f7023847b90238
+  us-west-1: ami-0487b1fe60c1fd1a2
+  af-south-1: ami-000ab2cb7ff83c5eb
+  ap-east-1: ami-0827918a2d84bd005
+  ap-northeast-1: ami-079a259b40675acc6
+  ap-south-1: ami-075ebde7b27c12bc0
+  ap-southeast-1: ami-04be67a4d5cb63d4e
+  ca-central-1: ami-071c767dd20b7339f
+  eu-central-1: ami-064768e636ea1ae04
+  eu-north-1: ami-053d8a8a6f91d4aec
+  eu-south-1: ami-0b273191310849e2d
+  eu-west-1: ami-009c3f9c3bfcf00f0
+  me-south-1: ami-0151ae040b710b0cf
+  sa-east-1: ami-0c6915838c72f6d16
+  us-east-1: ami-0d70a59d7191a8079
+  us-west-1: ami-06c272cb6ba6b812d
+  us-gov-east-1: ami-0eb7ef4cc0594fa04
+  us-gov-west-1: ami-029a634618d6c0300
+  us-gov-east-1: ami-00675642586ed8b16
+  us-gov-west-1: ami-0947a235367a203c9
+  ap-northeast-2: ami-0225bc2990c54ce9a
+  ap-southeast-2: ami-0d539270873f66397
+  eu-west-2: ami-00826bd51e68b1487
+  us-east-2: ami-0eea504f45ef7a8f7
+  us-west-2: ami-0cb4e786f15603b0d
+  ap-northeast-2: ami-032ce4dc565d286ec
+  ap-southeast-2: ami-06d39abb1664bf70e
+  eu-west-2: ami-07c7023e96cb88196
+  us-east-2: ami-008e02c1f94100fd9
+  us-west-2: ami-025fc2c61f9333edc
+  ap-northeast-3: ami-0c2223049202ca738
+  ap-southeast-3: ami-0f06496957d1fe04a
+  eu-west-3: ami-0a21d1c76ac56fee7
+  ap-northeast-3: ami-0a4d5c02a15b5ea05
+  ap-southeast-3: ami-05469598f0bccf936
+  eu-west-3: ami-0190e6d0d8c1fe02d
 ubuntu14:
   us-east-1: ami-663a6e0c
   us-west-1: ami-13988772
@@ -73,57 +60,33 @@ ubuntu14:
   ap-southeast-1: ami-2855964b
   ap-southeast-2: ami-d19fc4b2
 win2k12r2: &1
-  us-east-1: ami-0d28b9a40ed446e35
-  us-east-2: ami-010d247b7ee850d55
-  ca-central-1: ami-0c223858875f62d11
-  us-west-2: ami-01d188c5c06078fee
-  us-west-1: ami-0dbcc051c49ec24ec
-  eu-west-1: ami-080c7b4d6e32bf9f3
-  eu-west-2: ami-01b1edb5894a54bcc
-  eu-west-3: ami-09445cdc7a2acb1c0
-  eu-north-1: ami-0093cc63496e435df
-  sa-east-1: ami-04d015c8b371ba7b3
-  eu-central-1: ami-04d6144bcbb029141
-  ap-northeast-1: ami-07fad72f121aa157c
-  ap-south-1: ami-0b3241fd09b1ce87f
-  ap-northeast-2: ami-0ba7cd822e36dc0df
-  ap-southeast-1: ami-0648522a4cb50953c
-  ap-southeast-2: ami-0fc0bd73cd61a970f
-win2k16: &2
-  us-east-1: ami-018151f8c8339a093
-  us-east-2: ami-09e045936c7d9ecd5
-  ca-central-1: ami-0a16abf0f1c35667a
-  us-west-2: ami-00d4216f80a82894d
-  eu-west-1: ami-07afc1525928ccad7
-  us-west-1: ami-0d2f7d4198b79a625
-  eu-west-2: ami-04eb62f17efc84a37
-  eu-west-3: ami-0b4affcd5848cf50c
-  eu-central-1: ami-0a92ae047ebc7a3da
-  sa-east-1: ami-0cc9a87c95fb37832
-  ap-northeast-1: ami-014c730050acef11d
-  ap-south-1: ami-0c3c8739263aa4844
-  ap-northeast-2: ami-0018a05eb15503b5e
-  ap-southeast-2: ami-0b50bfbb507285a89
-  ap-southeast-1: ami-073c677bcf225774a
-  eu-north-1: ami-09bb6d618593f2e7f
-win2k19:
-  us-east-1: ami-09c18c34c341f2b6a
-  us-east-2: ami-030371d5ee8881350
-  ca-central-1: ami-018e5bf45c30fa58f
-  us-west-2: ami-07d1e5c4f906877e1
-  eu-west-2: ami-0b9d95fef44aa7c11
-  us-west-1: ami-0e7e082d6fa1769f3
-  eu-west-1: ami-05573fafa080144b6
-  eu-central-1: ami-0122b027c265988ea
-  eu-west-3: ami-0ba7c0a3dc4148b6a
-  eu-north-1: ami-03d8c3307f72f9847
-  sa-east-1: ami-0d0f66c3e0dfc09ee
-  ap-northeast-2: ami-07eff56de9293ab16
-  ap-northeast-1: ami-020fb790a3bed4cda
-  ap-southeast-1: ami-0b5d036d6d711a4c8
-  ap-southeast-2: ami-0fff96935fef7bf60
-  ap-south-1: ami-030ec249497f66a33
-amazon:
+  us-east-1: ami-0fc211ea56b172cdb
+  us-east-2: ami-0c559960e17c7bbff
+  us-west-2: ami-0c2a974f145ad7b53
+  us-west-1: ami-0b4e0252dffc41c98
+win2k16:
+  us-east-1: ami-02ae3989c58aefad5
+  us-east-2: ami-0269af40607a3ba35
+  us-west-1: ami-0051dca2f308635c0
+  us-west-2: ami-0d6eeeae0729c800c
+win2k19: &2
+  us-east-1: ami-075ac92102843eaa9
+  us-east-2: ami-0655085ead3f9a05d
+  us-west-1: ami-08e8fdee01486e656
+  us-west-2: ami-0e5f0bd903025b4b6
+centos7: &4
+  us-east-1: ami-021a033508ff35a45
+  us-east-2: ami-0eac2356dec5e031a
+  us-west-2: ami-05568b0fd4ad69d41
+  us-west-1: ami-0318b20ca171e16f0
+rhel79: &5
+  us-east-1: ami-099b4dbc8b9cdee98
+  us-east-2: ami-03be73fea244ae122
+  us-west-1: ami-0c2b107078c52b02e
+  us-west-2: ami-0557fe078d2fcf2bf
+amazon2023: &6
+  us-east-1: ami-066784287e358dad1
+amazon2:
   us-east-1: ami-b73b63a0
   us-east-2: ami-58277d3d
   us-west-1: ami-23e8a343
@@ -142,4 +105,5 @@ ubuntu: *3
 centos: *4
 rhel7: *5
 rhel: *5
-linux: *4
+linux: *6
+amazon: *6

data/modules/mu/deploy.rb

@@ -684,7 +684,6 @@ MESSAGE_END
               if !@updating or mode != "create"
                 myservice = run_this_method.call
               else
-
                 # XXX experimental create behavior for --liveupdate flag, only works on a couple of resource types. Inserting new resources into an old deploy is tricky.
                 opts = {}
                 if myservice["#MU_CLOUDCLASS"].cfg_name == "loadbalancer"
@@ -705,7 +704,15 @@ MESSAGE_END
                                   )
 
                 found = found.delete_if { |x|
-                  x.cloud_id.nil? and x.cloudobj.cloud_id.nil?
+                  failed = (x.cloud_id.nil? and x.cloudobj.cloud_id.nil?)
+                  if !failed
+                    begin
+                      failed = true if !x.cloud_desc
+                    rescue StandardError
+                      failed = true
+                    end
+                  end
+                  failed
                 }
 
                 if found.size == 0

data/modules/mu/groomer.rb

@@ -129,10 +129,18 @@ module MU
           MU.log "Calling groomer method #{method}", MU::DEBUG, details: ["sensitive output suppress"]
         end
         begin
-          if !args.nil? and args.size == 1
-            retval = @groomer_obj.method(method).call(args.first)
-          elsif !args.nil? and args.size > 0
-            retval = @groomer_obj.method(method).call(*args)
+          if !args.nil?
+            if args.is_a?(Hash)
+              retval = @groomer_obj.method(method).call(**args)
+            elsif args.is_a?(Array) 
+              if args.size == 1 and args.first.is_a?(Hash)
+                retval = @groomer_obj.method(method).call(**args.first)
+              else
+                retval = @groomer_obj.method(method).call(*args)
+              end
+            else
+              retval = @groomer_obj.method(method).call(args)
+            end
           else
             retval = @groomer_obj.method(method).call
           end