fog-aws 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dea4e752400d125510799d22baef7ef0070ec79ca82ca0a69b486c9c70ad101
-  data.tar.gz: a114a750ceae8289eca40561c0f9ff287b22da510d1aad328e9691f5245b7a9d
+  metadata.gz: f289bf7f4001b92e347106bdfda3d867b870bec5669ac28b5cb9cec528807ab7
+  data.tar.gz: 5fd55a3abe362e701f30eac3b6b0c590f070635442a74ee00309d954369e4e81
 SHA512:
-  metadata.gz: 83ea3407d7642e2dec7ac3263be136bb573f6e5b9d7f41a57ea3f223a8037eebd7a8f41aaf310d4523ae814af4c20ec1069a40629df92870a245033730cb98c2
-  data.tar.gz: 48580b9cb5e5668ef9e7b8356b6efa58aa3391936222148a4cabbc5f45b08bf77334669877d57435b765cbf8a84218a79a01eac657cda73beda06b3382cafb33
+  metadata.gz: 9e2b3950738fdeeacdeb9ec7ebe7edb561a4906b8b0d909a80ee743a4d9604a77e1d00732e44c0786b180b82352accfc907e15aba7ac9b001d68c5e782667dba
+  data.tar.gz: 7cb59578e078f5210866b6db6b2a81f2148df51bb5e42533adbefff6050f7edcfa414ea05b448c677e5638044184fe4c01ff43cb7079be6ed72fe47727f0ca29

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v3.6.3](https://github.com/fog/fog-aws/tree/v3.6.3) (2020-04-22)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.6.2...v3.6.3)
+
+**Merged pull requests:**
+
+- Add South Africa \(Cape Town\) Region [\#556](https://github.com/fog/fog-aws/pull/556) ([lvangool](https://github.com/lvangool))
+- Adds Instance Type r5.16xlarge and r5.8xlarge [\#555](https://github.com/fog/fog-aws/pull/555) ([rupikakapoor](https://github.com/rupikakapoor))
+- Update kinesis.rb [\#553](https://github.com/fog/fog-aws/pull/553) ([ioquatix](https://github.com/ioquatix))
+
 ## [v3.6.2](https://github.com/fog/fog-aws/tree/v3.6.2) (2020-03-24)
 [Full Changelog](https://github.com/fog/fog-aws/compare/v3.5.2...v3.6.2)
 

data/fog-aws.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/lib/fog/aws/credential_fetcher.rb

@@ -3,6 +3,7 @@ module Fog
     module CredentialFetcher
 
       INSTANCE_METADATA_HOST = "http://169.254.169.254"
+      INSTANCE_METADATA_TOKEN = "/latest/api/token"
       INSTANCE_METADATA_PATH = "/latest/meta-data/iam/security-credentials/"
       INSTANCE_METADATA_AZ = "/latest/meta-data/placement/availability-zone/"
 
@@ -25,13 +26,17 @@ module Fog
 
                 if region.nil?
                   connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
-                  region = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
+                  token = connection.put(:path => INSTANCE_METADATA_TOKEN, :idempotent => true, :expects => 200, :headers => { "X-aws-ec2-metadata-token-ttl-seconds" => "300" }).body
+                  token_header = { "X-aws-ec2-metadata-token" => token }
+                  region = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200, :headers => token_header).body[0..-2]
                 end
               else
                 connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
-                role_name = connection.get(:path => INSTANCE_METADATA_PATH, :idempotent => true, :expects => 200).body
-                role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :idempotent => true, :expects => 200).body
-                region ||= connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
+                token = connection.put(:path => INSTANCE_METADATA_TOKEN, :idempotent => true, :expects => 200, :headers => { "X-aws-ec2-metadata-token-ttl-seconds" => "300" }).body
+                token_header = { "X-aws-ec2-metadata-token" => token }
+                role_name = connection.get(:path => INSTANCE_METADATA_PATH, :idempotent => true, :expects => 200, :headers => token_header).body
+                role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :idempotent => true, :expects => 200, :headers => token_header).body
+                region ||= connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200, :headers => token_header).body[0..-2]
               end
 
               session = Fog::JSON.decode(role_data)

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.6.3"
+    VERSION = "3.6.4"
   end
 end

data/tests/credentials_tests.rb

@@ -7,6 +7,8 @@ Shindo.tests('AWS | credentials', ['aws']) do
   Fog.unmock!
   begin
     Excon.defaults[:mock] = true
+    Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 200, body: 'token1234' })
+
     Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 200, body: 'arole' })
     Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 200, body: 'us-west-1a' })
 
@@ -62,6 +64,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
 
     default_credentials = Fog::AWS::Compute.fetch_credentials({})
     tests('#fetch_credentials when the url 404s') do
+      Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 404, body: 'not found' })
       Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 404, body: 'not bound' })
       Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 400, body: 'not found' })
       returns(default_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,9 +143,7 @@ description: |-
 email:
 - me@joshualane.com
 - geemus@gmail.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: