modules/mu/clouds/aws.rb in cloud-mu-2.0.0.pre.alpha vs modules/mu/clouds/aws.rb in cloud-mu-2.0.0.pre.alpha2

- old
+ new

@@ -485,10 +485,13 @@ ## rescue ::Aws::IAM::Errors => e # XXX why does this NameError here? # rescue Exception => e # MU.log "Got #{e.inspect} while trying to figure out our account number", MU::WARN, details: caller # end # if user_list.nil? or user_list.size == 0 - mac = MU::Cloud::AWS.getAWSMetaData("network/interfaces/macs/").split(/\n/)[0] + resp = MU::Cloud::AWS.getAWSMetaData("network/interfaces/macs/") + return nil if !resp + + mac = resp.split(/\n/)[0] acct_num = MU::Cloud::AWS.getAWSMetaData("network/interfaces/macs/#{mac}owner-id") acct_num.chomp! # else # acct_num = MU::Cloud::AWS.iam(region: credConfig['region']).list_users.users.first.arn.split(/:/)[4] # end