aws_info.rb in jets-0.8.18

- old
+ new

@@ -5,26 +5,30 @@
     include AwsServices
 
     def region
       return 'us-east-1' if test?
 
+      return ENV['JETS_AWS_REGION'] if ENV['JETS_AWS_REGION'] # highest precedence
+      return ENV['AWS_REGION'] if ENV['AWS_REGION']
+
       region = nil
 
       # First try to get it from the ~/.aws/config
       region = `aws configure get region`.strip rescue nil
       return region if region
 
       # Second try the metadata endpoint, should be available on AWS Lambda environment
       # https://stackoverflow.com/questions/4249488/find-region-from-within-an-ec2-instance
       begin
-        az = `curl -s http://169.254.169.254/latest/meta-data/placement/availability-zone`
+        az = `curl -s --max-time 5 --connect-timeout 5 http://169.254.169.254/latest/meta-data/placement/availability-zone`
         region = az.strip.chop # remove last char
+        region = nil if region == ''
       rescue
       end
       return region if region
 
-      ENV['JETS_AWS_REGION'] || 'us-east-1' # default if all else fails
+      'us-east-1' # default if all else fails
     end
     memoize :region
 
     # aws sts get-caller-identity
     def account
@@ -35,6 +39,6 @@
 
     def test?
       ENV['TEST'] || ENV['CIRCLECI']
     end
   end
-end
\ No newline at end of file
+end