cloud-mu 3.4.0 → 3.5.0

data/modules/mu/groomers/chef.rb

@@ -70,8 +70,8 @@ module MU
             # XXX kludge to get at knife-windows when it's installed from 
             # a git repo and bundler sticks it somewhere in a corner
             $LOAD_PATH.each { |path|
-              if path.match(/\/gems\/aws\-sdk\-core\-\d+\.\d+\.\d+\/lib$/)
-                addpath = path.sub(/\/gems\/aws\-sdk\-core\-\d+\.\d+\.\d+\/lib$/, "")+"/bundler/gems"
+              if path.match(/\/gems\/chef\-\d+\.\d+\.\d+\/lib$/)
+                addpath = path.sub(/\/gems\/chef\-\d+\.\d+\.\d+\/lib$/, "")+"/bundler/gems"
                 Dir.glob(addpath+"/knife-windows-*").each { |version|
                   $LOAD_PATH << version+"/lib"
                 }

data/modules/mu/master.rb

@@ -195,9 +195,12 @@ module MU
       temp_dev = "/dev/#{ramdisk}"
 
       if !File.open("/etc/mtab").read.match(/ #{path} /)
-        realdevice = device.dup
-        if MU::Cloud::Google.hosted?
-          realdevice = "/dev/disk/by-id/google-"+device.gsub(/.*?\/([^\/]+)$/, '\1')
+        realdevice = if MU::Cloud::Google.hosted?
+          "/dev/disk/by-id/google-"+device.gsub(/.*?\/([^\/]+)$/, '\1')
+        elsif MU::Cloud::AWS.hosted?
+          MU::Cloud::AWS.realDevicePath(device.dup)
+        else
+          device.dup
         end
         alias_device = cryptfile ? "/dev/mapper/"+path.gsub(/[^0-9a-z_\-]/i, "_") : realdevice
 
@@ -216,6 +219,9 @@ module MU
               tag_name: "Name",
               tag_value: "#{$MU_CFG['hostname']} #{path}"
             )
+            # the device might be on some arbitrary NVMe slot
+            realdevice = MU::Cloud::AWS.realDevicePath(realdevice)
+            alias_device = cryptfile ? "/dev/mapper/"+path.gsub(/[^0-9a-z_\-]/i, "_") : realdevice
           elsif MU::Cloud::Google.hosted?
             dummy_svr = MU::Cloud::Google::Server.new(
               mu_name: "MU-MASTER",
@@ -901,5 +907,45 @@ module MU
       }
     end
 
+    # Just list our block devices
+    # @return [Array<String>]
+    def self.listBlockDevices
+      if File.executable?("/bin/lsblk")
+        %x{/bin/lsblk -i -p -r -n | egrep ' disk( |$)'}.each_line.map { |l|
+          l.chomp.sub(/ .*/, '')
+        }
+      else
+        # XXX something dumber
+        nil
+      end
+    end
+
+
+    # Retrieve the UUID of a block device, if available
+    # @param dev [String]
+    def self.diskUUID(dev)
+      realdev = if MU::Cloud::Google.hosted?
+        "/dev/disk/by-id/google-"+dev.gsub(/.*?\/([^\/]+)$/, '\1')
+      elsif MU::Cloud::AWS.hosted?
+        MU::Cloud::AWS.realDevicePath(dev)
+      else
+        dev
+      end
+      %x{/sbin/blkid #{realdev} -o export | grep ^UUID=}.chomp
+    end
+
+    # Determine whether we're running in an NVMe-enabled environment
+    def self.nvme?
+      if File.executable?("/bin/lsblk")
+        %x{/bin/lsblk -i -p -r -n}.each_line { |l|
+          return true if l =~ /^\/dev\/nvme\d/
+        }
+      else
+        return true if File.exists?("/dev/nvme0n1")
+      end
+      false
+    end
+
+
   end
 end

data/modules/mu/mommacat.rb

@@ -173,6 +173,7 @@ module MU
       @public_key = nil
       @secrets = Hash.new
       @secrets['instance_secret'] = Hash.new
+      @secrets['windows_admin_password'] = Hash.new
       @ssh_key_name = ssh_key_name
       @ssh_private_key = ssh_private_key
       @ssh_public_key = ssh_public_key
@@ -512,6 +513,8 @@ module MU
       @ssh_private_key = File.read("#{ssh_dir}/#{@ssh_key_name}")
       @ssh_private_key.chomp!
 
+# XXX the following mess belongs in cloud layers, probably in their initDeploy
+# methods
       if numKittens(clouds: ["AWS"], types: ["Server", "ServerPool", "ContainerCluster"]) > 0
         creds_used = []
         ["servers", "server_pools", "container_clusters"].each { |type|
@@ -551,7 +554,7 @@ module MU
 
       begin
         if !no_write
-          if !MU::MommaCat.lock("deployment-notification", deploy_id: @deploy_id, retries: 10)
+          if !MU::MommaCat.lock("deployment-notification", deploy_id: @deploy_id, retries: 300)
             raise MuError, "Failed to get deployment-notifcation lock for #{@deploy_id}"
           end
         end
@@ -884,13 +887,13 @@ MAIL_HEAD_END
         if resource and resource.config and resource.config['cloud']
           cloudclass = MU::Cloud.cloudClass(resource.config['cloud'])
 
-          cloudclass.writeDeploySecret(@deploy_id, cert.to_pem, cert_cn+".crt", credentials: resource.config['credentials'])
-          cloudclass.writeDeploySecret(@deploy_id, key.to_pem, cert_cn+".key", credentials: resource.config['credentials'])
+          cloudclass.writeDeploySecret(self, cert.to_pem, cert_cn+".crt", credentials: resource.config['credentials'])
+          cloudclass.writeDeploySecret(self, key.to_pem, cert_cn+".key", credentials: resource.config['credentials'])
           if pfx_cert
-            cloudclass.writeDeploySecret(@deploy_id, pfx_cert.to_der, cert_cn+".pfx", credentials: resource.config['credentials'])
+            cloudclass.writeDeploySecret(self, pfx_cert.to_der, cert_cn+".pfx", credentials: resource.config['credentials'])
           end
           if winrm_cert
-            cloudclass.writeDeploySecret(@deploy_id, winrm_cert.to_pem, cert_cn+"-winrm.crt", credentials: resource.config['credentials'])
+            cloudclass.writeDeploySecret(self, winrm_cert.to_pem, cert_cn+"-winrm.crt", credentials: resource.config['credentials'])
           end
         end
 

data/modules/mu/mommacat/naming.rb

@@ -164,7 +164,7 @@ module MU
     # @param scrub_mu_isms [Boolean]: Don't bother with generating names specific to this deployment. Used to generate generic CloudFormation templates, amongst other purposes.
     # @param disallowed_chars [Regexp]: A pattern of characters that are illegal for this resource name, such as +/[^a-zA-Z0-9-]/+
     # @return [String]: A full name string for this resource
-    def getResourceName(name, max_length: 255, need_unique_string: false, use_unique_string: nil, reuse_unique_string: false, scrub_mu_isms: @original_config['scrub_mu_isms'], disallowed_chars: nil)
+    def getResourceName(name, max_length: 255, need_unique_string: false, use_unique_string: nil, reuse_unique_string: false, scrub_mu_isms: @original_config['scrub_mu_isms'], disallowed_chars: nil, never_gen_unique: false)
       if name.nil?
         raise MuError, "Got no argument to MU::MommaCat.getResourceName"
       end
@@ -219,7 +219,7 @@ module MU
           else
             # If we have to strip anything, assume we've lost uniqueness and
             # will have to compensate with #genUniquenessString.
-            need_unique_string = true
+            need_unique_string = true if !never_gen_unique
             reserved = 4
             basename.sub!(/-[^-]+-#{@seed.upcase}-#{Regexp.escape(name.upcase)}$/, "")
             basename = basename + "-" + @seed.upcase + "-" + name.upcase

data/modules/mu/mommacat/storage.rb

@@ -208,25 +208,26 @@ module MU
               if lockid == id
                 thread = Thread.list.select { |t| t.object_id == thread_id }.first
                 if thread.object_id != Thread.current.object_id
-                  MU.log "#{thread_id} sitting on #{id}", MU::WARN, thread.backtrace
+                  MU.log "#{thread_id} sitting on #{id} (#{thread.thread_variables.map { |v| "#{v.to_s}: #{thread.thread_variable_get(v).to_s}" }.join(", ")})", MU::WARN, thread.backtrace
                 end
               end
             }
           }
         }
       }
+
       begin
         if nonblock
           if !@locks[Thread.current.object_id][id].flock(File::LOCK_EX|File::LOCK_NB)
             if retries > 0
               success = false
-              MU.retrier([], loop_if: Proc.new { !success }, loop_msg: "Waiting for lock on #{lockdir}/#{id}.lock...", max: retries) { |cur_retries, _wait|
+              MU.retrier([], loop_if: Proc.new { !success }, loop_msg: "Waiting for lock on #{lockdir}/#{id}.lock...", max: retries, wait: 1, logmsg_interval: 0) { |cur_retries, _wait|
                 success = @locks[Thread.current.object_id][id].flock(File::LOCK_EX|File::LOCK_NB)
-                if !success and cur_retries > 0 and (cur_retries % 3) == 0
-                  show_relevant.call(cur_retries)
+                if !success and cur_retries > 0 and (cur_retries % 45) == 0
+                  show_relevant.call
                 end
               }
-              show_relevant.call(cur_retries) if !success
+              show_relevant.call if !success
               return success
             else
               return false
@@ -542,6 +543,22 @@ module MU
       return Dir.exist?(deploy_path)
     end
 
+    # Write our shared deploy secret out to wherever the cloud provider layers
+    # like to stash it.
+    def writeDeploySecret
+      return if !@deploy_secret
+      credsets = credsUsed
+      return if !credsets
+      if !@original_config['scrub_mu_isms'] and !@no_artifacts
+        cloudsUsed.each { |cloud|
+          credsets.each { |credentials|
+            next if MU::Cloud.cloudClass(cloud).credConfig(credentials).nil? # XXX this is a dumb way to check this, should be able to get credsUsed by cloud
+            MU::Cloud.cloudClass(cloud).writeDeploySecret(self, @deploy_secret, credentials: credentials)
+          }
+        }
+      end
+    end
+
     private
         
     def writeFile(filename, contents)
@@ -552,30 +569,8 @@ module MU
 
     # Helper for +initialize+
     def setDeploySecret
-      credsets = {}
-      MU::Cloud.resource_types.values.each { |attrs|
-        if !@original_config[attrs[:cfg_plural]].nil? and @original_config[attrs[:cfg_plural]].size > 0
-          @original_config[attrs[:cfg_plural]].each { |resource|
-
-            credsets[resource['cloud']] ||= []
-            credsets[resource['cloud']] << resource['credentials']
-            @clouds[resource['cloud']] = 0 if !@clouds.has_key?(resource['cloud'])
-            @clouds[resource['cloud']] = @clouds[resource['cloud']] + 1
-
-          }
-        end
-      }
-
       MU.log "Creating deploy secret for #{MU.deploy_id}"
       @deploy_secret = Password.random(256)
-      if !@original_config['scrub_mu_isms'] and !@no_artifacts
-        credsets.each_pair { |cloud, creds|
-          creds.uniq!
-          creds.each { |credentials|
-            MU::Cloud.cloudClass(cloud).writeDeploySecret(@deploy_id, @deploy_secret, credentials: credentials)
-          }
-        }
-      end
     end
 
     def loadObjects(delay_descriptor_load)

data/modules/mu/providers/aws.rb

@@ -16,7 +16,6 @@ require "net/http"
 require 'open-uri'
 require 'timeout'
 require 'inifile'
-gem 'aws-sdk-core'
 autoload :Aws, "aws-sdk-core"
 
 
@@ -54,14 +53,19 @@ module MU
       def self.resourceInitHook(cloudobj, _deploy)
         class << self
           attr_reader :cloudformation_data
+          attr_reader :region
         end
+        return if !cloudobj
         cloudobj.instance_variable_set(:@cloudformation_data, {})
+
+        cloudobj.instance_variable_set(:@region, cloudobj.config['region'])
       end
 
       # Load some credentials for using the AWS API
       # @param name [String]: The name of the mu.yaml AWS credential set to use. If not specified, will use the default credentials, and set the global Aws.config credentials to those.
       # @return [Aws::Credentials]
       def self.loadCredentials(name = nil)
+        gem 'aws-sdk-core'
         @@creds_loaded ||= {}
 
         if name.nil?
@@ -124,10 +128,14 @@ module MU
           # pull access key and secret from a vault
           begin
             vault, item = cred_cfg["credentials"].split(/:/)
-            data = MU::Groomer::Chef.getSecret(vault: vault, item: item).to_h
-            if data["access_key"] and data["access_secret"]
+            data = if !vault or !item
+              raise MuError.new "AWS #{name} credentials field value '#{cred_cfg["credentials"]}' malformed, should be vaultname:itemname", details: cred_cfg
+            else
+              MU::Groomer::Chef.getSecret(vault: vault, item: item).to_h
+            end
+            if data and data["access_key"] and data["access_secret"]
               cred_obj = Aws::Credentials.new(
-                cred_cfg['access_key'], cred_cfg['access_secret']
+                data['access_key'], data['access_secret']
               )
               if name.nil?
 #                Aws.config = {
@@ -137,10 +145,10 @@ module MU
 #                }
               end
             else
-              MU.log "AWS credentials vault:item #{cred_cfg["credentials"]} specified, but is missing access_key or access_secret elements", MU::WARN
+              raise MuError.new "AWS #{name} credentials vault:item #{cred_cfg["credentials"]} specified, but is missing access_key or access_secret elements", details: cred_cfg
             end
           rescue MU::Groomer::MuNoSuchSecret
-            MU.log "AWS credentials vault:item #{cred_cfg["credentials"]} specified, but does not exist", MU::WARN
+            raise MuError.new "AWS #{name} credentials vault:item #{cred_cfg["credentials"]} specified, but does not exist", details: cred_cfg
           end
         end
 
@@ -186,6 +194,7 @@ end
       # @param r [String]
       # @return [String]
       def self.validate_region(r, credentials: nil)
+        require "aws-sdk-ec2"
         begin
           MU::Cloud::AWS.ec2(region: r, credentials: credentials).describe_availability_zones.availability_zones.first.region_name
         rescue ::Aws::EC2::Errors::UnauthorizedOperation => e
@@ -204,6 +213,7 @@ end
       # @param othertags [Array<Hash>]: Miscellaneous custom tags, in Basket of Kittens style
       # @return [void]
       def self.createStandardTags(resource = nil, region: MU.curRegion, credentials: nil, optional: true, nametag: nil, othertags: nil)
+        require "aws-sdk-ec2"
         tags = []
         MU::MommaCat.listStandardTags.each_pair { |name, value|
           tags << {key: name, value: value} if !value.nil?
@@ -261,20 +271,33 @@ end
         @@myVPCObj
       end
 
-      # If we've configured AWS as a provider, or are simply hosted in AWS, 
+      # If we've configured AWS as a provider, or are simply hosted in AWS,
       # decide what our default region is.
-      def self.myRegion(credentials = nil)
-        return @@myRegion_var if @@myRegion_var
+      def self.myRegion(credentials = nil, debug: false)
+        loglevel = debug ? MU::NOTICE : MU::DEBUG
+        if @@myRegion_var
+          MU.log "AWS.myRegion: returning #{@@myRegion_var} from cache", loglevel
+          return @@myRegion_var
+        end
 
+        MU.log "AWS.myRegion: credConfig", loglevel, details: credConfig
+        MU.log "AWS.myRegion: hosted?", loglevel, details: hosted?.to_s
+        MU.log "AWS.myRegion: ENV['EC2_REGION']", loglevel, details: ENV['EC2_REGION']
+        MU.log "AWS.myRegion: $MU_CFG['aws']", loglevel, details: $MU_CFG['aws']
         if credConfig.nil? and !hosted? and !ENV['EC2_REGION']
+          MU.log "AWS.myRegion: nothing of use set, returning", loglevel
           return nil
         end
 
         if $MU_CFG and $MU_CFG['aws']
           $MU_CFG['aws'].each_pair { |credset, cfg|
+            MU.log "AWS.myRegion: #{credset} != #{credentials} ?", loglevel, details: cfg
             next if credentials and credset != credentials
+            MU.log "AWS.myRegion: validating credset #{credset}", loglevel, details: cfg
             next if !cfg['region']
-            if (cfg['default'] or !@@myRegion_var) and validate_region(cfg['region'], credentials: credset)
+            MU.log "AWS.myRegion: validation response", loglevel, details: validate_region(cfg['region'], credentials: credset)
+            if (cfg['default'] or !@@myRegion_var or $MU_CFG['aws'].size == 1) and validate_region(cfg['region'], credentials: credset)
+              MU.log "AWS.myRegion: liking this set", loglevel, details: cfg
               @@myRegion_var = cfg['region']
               break if cfg['default'] or credentials
             end
@@ -286,15 +309,21 @@ end
                (Aws.config['access_key'] and Aws.config['access_secret'])
               )
           # Make sure this string is valid by way of the API
+          MU.log "AWS.myRegion: using ENV", loglevel, details: ENV
           @@myRegion_var = ENV['EC2_REGION']
         end
 
         if hosted? and !@@myRegion_var
           # hacky, but useful in a pinch (and if we're hosted in AWS)
           az_str = MU::Cloud::AWS.getAWSMetaData("placement/availability-zone")
+          MU.log "AWS.myRegion: using hosted", loglevel, details: az_str
           @@myRegion_var = az_str.sub(/[a-z]$/i, "") if az_str
         end
 
+        if credConfig and credConfig["region"]
+          @@myRegion_var ||= credConfig["region"]
+        end
+
         @@myRegion_var
       end
 
@@ -382,8 +411,9 @@ end
       # Plant a Mu deploy secret into a storage bucket somewhere for so our kittens can consume it
       # @param deploy_id [String]: The deploy for which we're writing the secret
       # @param value [String]: The contents of the secret
-      def self.writeDeploySecret(deploy_id, value, name = nil, credentials: nil)
-        name ||= deploy_id+"-secret"
+      def self.writeDeploySecret(deploy, value, name = nil, credentials: nil)
+        require "aws-sdk-s3"
+        name ||= deploy.deploy_id+"-secret"
         begin
           MU.log "Writing #{name} to S3 bucket #{adminBucketName(credentials)}"
           MU::Cloud::AWS.s3(region: myRegion, credentials: credentials).put_object(
@@ -401,35 +431,35 @@ end
       def self.cloudtrailBucketPolicy(credentials = nil)
         cfg = credConfig(credentials)
         policy_json = '{
-      		"Version": "2012-10-17",
-      		"Statement": [
-      			{
-      				"Sid": "AWSCloudTrailAclCheck20131101",
-      				"Effect": "Allow",
+                "Version": "2012-10-17",
+                "Statement": [
+                        {
+                                "Sid": "AWSCloudTrailAclCheck20131101",
+                                "Effect": "Allow",
               "Principal": {
                 "AWS": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':iam::<%= MU.account_number %>:root",
                 "Service": "cloudtrail.amazonaws.com"
               },
-      				"Action": "s3:GetBucketAcl",
-      				"Resource": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':s3:::'+MU::Cloud::AWS.adminBucketName(credentials)+'"
-      			},
-      			{
-      				"Sid": "AWSCloudTrailWrite20131101",
-      				"Effect": "Allow",
+                                "Action": "s3:GetBucketAcl",
+                                "Resource": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':s3:::'+MU::Cloud::AWS.adminBucketName(credentials)+'"
+                        },
+                        {
+                                "Sid": "AWSCloudTrailWrite20131101",
+                                "Effect": "Allow",
               "Principal": {
                 "AWS": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':iam::'+credToAcct(credentials)+':root",
                 "Service": "cloudtrail.amazonaws.com"
               },
-      				"Action": "s3:PutObject",
-      				"Resource": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':s3:::'+MU::Cloud::AWS.adminBucketName(credentials)+'/AWSLogs/'+credToAcct(credentials)+'/*",
-      				"Condition": {
-      					"StringEquals": {
-      						"s3:x-amz-acl": "bucket-owner-full-control"
-      					}
-      				}
-      			}
-      		]
-      	}'
+                                "Action": "s3:PutObject",
+                                "Resource": "arn:'+(MU::Cloud::AWS.isGovCloud?(cfg['region']) ? "aws-us-gov" : "aws")+':s3:::'+MU::Cloud::AWS.adminBucketName(credentials)+'/AWSLogs/'+credToAcct(credentials)+'/*",
+                                "Condition": {
+                                        "StringEquals": {
+                                                "s3:x-amz-acl": "bucket-owner-full-control"
+                                        }
+                                }
+                        }
+                ]
+        }'
         ERB.new(policy_json).result
       end
 
@@ -440,6 +470,53 @@ end
         MU::Cloud::AWS.hosted?
       end
 
+      # If we're in AWS and NVME-aware, return a mapping of AWS-side device
+      # names to actual NVME devices.
+      # @return [Hash]
+      def self.attachedNVMeDisks
+        if !hosted? or !File.executable?("/bin/lsblk") or !File.executable?("/sbin/nvme")
+          return {}
+        end
+        map = {}
+        devices = MU::Master.listBlockDevices
+        return {} if !devices
+        devices.each { |d|
+          if d =~ /^\/dev\/nvme/
+            %x{/sbin/nvme id-ctrl -v #{d}}.each_line { |desc|
+              if desc.match(/^0000: (?:[0-9a-f]{2} ){16}"(.+?)\./)
+                virt_dev = Regexp.last_match[1]
+                map[virt_dev] = d
+                break
+              end
+            }
+          end
+        }
+        map
+      end
+
+      # Map our own idea of what a block device is called back to whatever AWS
+      # and the operating system decided on amongst themselves. This currently
+      # exists to map generic "xvd[a-z]" style names back to real NVMe devices.
+      # @param dev [String]
+      def self.realDevicePath(dev)
+        return dev if !hosted?
+        value = nil
+        should_retry = Proc.new {
+          !value and MU::Master.nvme?
+        }
+        MU.retrier(loop_if: should_retry, wait: 5, max: 6) {
+          map = attachedNVMeDisks
+          value = if map[dev]
+            map[dev]
+          elsif map[dev.gsub(/.*?\//, '')]
+            map[dev.gsub(/.*?\//, '')]
+          else
+            dev # be nice to actually handle this too
+          end
+        }
+        value
+      end
+
       # Determine whether we (the Mu master, presumably) are hosted in this
       # cloud.
       # @return [Boolean]
@@ -457,7 +534,7 @@ end
 
         begin
           Timeout.timeout(4) do
-            instance_id = open("http://169.254.169.254/latest/meta-data/instance-id").read
+            instance_id = URI.open("http://169.254.169.254/latest/meta-data/instance-id").read
             if !instance_id.nil? and instance_id.size > 0
               @@is_in_aws = true
               region = getAWSMetaData("placement/availability-zone").sub(/[a-z]$/i, "")
@@ -566,17 +643,18 @@ end
         end
 
         $MU_CFG['aws'].keys
-      end 
+      end
 
       # Resolve the administrative S3 bucket for a given credential set, or
       # return a default.
       # @param credentials [String]
       # @return [String]
       def self.adminBucketName(credentials = nil)
+        require "aws-sdk-s3"
         cfg = credConfig(credentials)
         return nil if !cfg
         if !cfg['log_bucket_name']
-          cfg['log_bucket_name'] = $MU_CFG['hostname'] 
+          cfg['log_bucket_name'] = $MU_CFG['hostname']
           MU.log "No AWS log bucket defined for credentials #{credentials}, attempting to use default of #{cfg['log_bucket_name']}", MU::WARN
         end
         resp = MU::Cloud::AWS.s3(credentials: credentials).list_buckets
@@ -610,7 +688,7 @@ end
 
       # Return the $MU_CFG data associated with a particular profile/name/set of
       # credentials. If no account name is specified, will return one flagged as
-      # default. Returns nil if AWS is not configured. Throws an exception if 
+      # default. Returns nil if AWS is not configured. Throws an exception if
       # an account name is specified which does not exist.
       # @param name [String]: The name of the key under 'aws' in mu.yaml to return
       # @return [Hash,nil]
@@ -625,10 +703,13 @@ end
 
           if hosted?
             begin
-              iam_data = JSON.parse(getAWSMetaData("iam/info"))
-              if iam_data["InstanceProfileArn"] and !iam_data["InstanceProfileArn"].empty?
-                @@my_hosted_cfg = hosted_config
-                return name_only ? "#default" : @@my_hosted_cfg
+              iam_blob = getAWSMetaData("iam/info")
+              if iam_blob
+                iam_data = JSON.parse(iam_blob)
+                if iam_data["InstanceProfileArn"] and !iam_data["InstanceProfileArn"].empty?
+                  @@my_hosted_cfg = hosted_config
+                  return name_only ? "#default" : @@my_hosted_cfg
+                end
               end
             rescue JSON::ParserError => e
             end
@@ -692,6 +773,7 @@ end
       # XXX this needs to be "myAccountNumber" or somesuch
       # XXX and maybe do the IAM thing for arbitrary, non-resident accounts
       def self.account_number
+        require "aws-sdk-ec2"
         return nil if credConfig.nil?
         return @@my_acct_num if @@my_acct_num
         loadCredentials
@@ -749,7 +831,7 @@ end
           @@regions.keys.uniq
         end
 
-# XXX GovCloud doesn't show up if you query a commercial endpoint... that's 
+# XXX GovCloud doesn't show up if you query a commercial endpoint... that's
 # *probably* ok for most purposes? We can't call listAZs on it from out here
 # apparently, so getting around it is nontrivial
 #        if !@@regions.has_key?("us-gov-west-1")
@@ -774,6 +856,7 @@ end
       # @param public_key [String]: The public key
       # @return [Array<String>]: keypairname, ssh_private_key, ssh_public_key
       def self.createEc2SSHKey(keyname, public_key, credentials: nil)
+        require "aws-sdk-ec2"
         # We replicate this key in all regions
         if !MU::Cloud::CloudFormation.emitCloudFormation
           MU::Cloud::AWS.listRegions.each { |region|
@@ -802,8 +885,16 @@ end
       def self.listInstanceTypes(region = myRegion)
         return @@instance_types if @@instance_types and @@instance_types[region]
         return {} if credConfig.nil?
+        if region.nil?
+          region = myRegion(debug: true)
+        end
+        return {} if region.nil?
 
         human_region = @@regionLookup[region]
+        if human_region.nil?
+          MU.log "Failed to map a Pricing API region name from #{region}", MU::ERR
+          return {}
+        end
 
         @@instance_types ||= {}
         @@instance_types[region] ||= {}
@@ -857,6 +948,7 @@ end
       # @param id [String]: The ARN of a known certificate. We just validate that it exists. This is ignored if a name parameter is supplied.
       # @return [String]: The ARN of a matching certificate that is known to exist. If it is an ACM certificate, we also know that it is not expired.
       def self.findSSLCertificate(name: nil, id: nil, region: myRegion, credentials: nil, raise_on_missing: true)
+        require "aws-sdk-iam"
         if (name.nil? or name.empty?) and (id.nil? or id.empty?)
           raise MuError, "Can't call findSSLCertificate without specifying either a name or an id"
         end
@@ -891,7 +983,7 @@ end
               return nil
             end
           elsif matches.size > 1
-            raise MuError, "Multiple certificates named #{name} were found in #{region}. Remove extras or use ssl_certificate_id to supply the exact ARN of the one you want to use."            
+            raise MuError, "Multiple certificates named #{name} were found in #{region}. Remove extras or use ssl_certificate_id to supply the exact ARN of the one you want to use."
           end
         end
 
@@ -953,7 +1045,7 @@ end
       # Given a {MU::Config::Ref} block for an IAM or ACM SSL certificate,
       # look up and validate the specified certificate. This is intended to be
       # invoked from resource implementations' +validateConfig+ methods.
-      # @param certblock [Hash,MU::Config::Ref]: 
+      # @param certblock [Hash,MU::Config::Ref]:
       # @param region [String]: Default region to use when looking up the certificate, if its configuration block does not specify any
       # @param credentials [String]: Default credentials to use when looking up the certificate, if its configuration block does not specify any
       # @return [Boolean]
@@ -1121,7 +1213,7 @@ end
         @@elasticache_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ElastiCache", region: region, credentials: credentials)
         @@elasticache_api[credentials][region]
       end
-      
+
       # Amazon's SNS API
       def self.sns(region: MU.curRegion, credentials: nil)
         region ||= myRegion
@@ -1129,7 +1221,7 @@ end
         @@sns_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "SNS", region: region, credentials: credentials)
         @@sns_api[credentials][region]
       end
-      
+
       # Amazon's SQS API
       def self.sqs(region: MU.curRegion, credentials: nil)
         region ||= myRegion
@@ -1161,7 +1253,7 @@ end
         @@apig_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "APIGateway", region: region, credentials: credentials)
         @@apig_api[credentials][region]
       end
-      
+
       # Amazon's Cloudwatch Events API
       def self.cloudwatch_events(region = MU.cureRegion)
         region ||= myRegion
@@ -1274,7 +1366,7 @@ end
         begin
           response = nil
           Timeout.timeout(1) do
-            response = open("#{base_url}/#{param}").read
+            response = URI.open("#{base_url}/#{param}").read
           end
 
           response
@@ -1299,6 +1391,7 @@ end
           tag_value=MU.deploy_id,
           region: MU.curRegion,
           credentials: nil)
+        require "aws-sdk-ec2"
         attempts = 0
 
         return nil if resource.nil?
@@ -1339,6 +1432,7 @@ end
       # Mu Master, if we're in AWS.
       # @return [void]
       def self.openFirewallForClients
+        require "aws-sdk-ec2"
         MU::Cloud.resourceClass("AWS", :FirewallRule)
         begin
           if File.exist?(Etc.getpwuid(Process.uid).dir+"/.chef/knife.rb")