kotovalexarian-likes-github/fog--fog-aws
1
0
Fork 0
mirror of https://github.com/fog/fog-aws.git synced 2022-11-09 13:50:52 -05:00
Code Releases Activity

Add support for regional STS endpoints

Browse source
This commit is contained in:
Michael Gerhart 2021-05-03 15:56:42 -04:00 • committed by Stan Hu
parent d58fbe6cdf
commit cbd3354777
No known key found for this signature in database
GPG key ID: 8D3931AD39CC7A20
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/fog/aws/credential_fetcher.rb
View file

@ -13,8 +13,6 @@ module Fog
CONTAINER_CREDENTIALS_HOST = "http://169.254.170.2"
STS_GLOBAL_ENDPOINT = "https://sts.amazonaws.com"
module ServiceMethods
def fetch_credentials(options)
if options[:use_iam_profile] && Fog.mocking?
@ -44,7 +42,14 @@ module Fog
:WebIdentityToken => File.read(options[:aws_web_identity_token_file] || ENV.fetch("AWS_WEB_IDENTITY_TOKEN_FILE")),
:Version => "2011-06-15",
}
connection = options[:connection] || Excon.new(STS_GLOBAL_ENDPOINT, :query => params)
if ENV["AWS_STS_REGIONAL_ENDPOINTS"] == "regional" && ENV["AWS_DEFAULT_REGION"]
STS_ENDPOINT = "https://sts.#{ENV['AWS_DEFAULT_REGION']}.amazonaws.com"
else
STS_ENDPOINT = "https://sts.amazonaws.com"
end
connection = options[:connection] || Excon.new(STS_ENDPOINT, :query => params)
document = Nokogiri::XML(connection.get(:idempotent => true, :expects => 200).body)
session = {

18
tests/credentials_tests.rb
View file

@ -83,6 +83,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
aws_secret_access_key: 'dummysecret',
aws_session_token: 'dummytoken',
region: 'us-west-1',
STS_ENDPOINT: "https://sts.amazonaws.com"
aws_credentials_expire_at: expires_at
) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
end
@ -95,10 +96,27 @@ Shindo.tests('AWS | credentials', ['aws']) do
aws_secret_access_key: 'dummysecret',
aws_session_token: 'dummytoken',
region: 'us-west-1',
STS_ENDPOINT: "https://sts.amazonaws.com"
aws_credentials_expire_at: expires_at
) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
end
ENV["AWS_STS_REGIONAL_ENDPOINTS"] = "regional"
ENV["AWS_REGION"] = "us-west-1"
tests('#fetch_credentials with regional sts endpoint') do
returns(
aws_access_key_id: 'dummykey',
aws_secret_access_key: 'dummysecret',
aws_session_token: 'dummytoken',
region: 'us-west-1',
STS_ENDPOINT: "https://sts.us-west-1.amazonaws.com"
aws_credentials_expire_at: expires_at
) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
end
ENV["AWS_STS_REGIONAL_ENDPOINTS"] = nil
ENV["AWS_REGION"] = nil
ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = nil
compute = Fog::AWS::Compute.new(use_iam_profile: true)