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

Merge pull request #33 from nicholasklick/region_is_null

Browse source 
BUGFIX: When fog_credentials endpoint is set @region defaults to nil
This commit is contained in:
Wesley Beary 2015-01-25 18:26:58 -06:00
commit 963b150a7e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/fog/aws/storage.rb
View file

@ -399,17 +399,21 @@ module Fog
def initialize(options={}) def initialize(options={})
@use_iam_profile = options[:use_iam_profile] @use_iam_profile = options[:use_iam_profile]
@region = options[:region] || DEFAULT_REGION
if @endpoint = options[:endpoint] if @endpoint = options[:endpoint]
endpoint = URI.parse(@endpoint) endpoint = URI.parse(@endpoint)
@host = endpoint.host @host = endpoint.host
@scheme = endpoint.scheme @scheme = endpoint.scheme
@port = endpoint.port @port = endpoint.port
else else
@region = options[:region] || DEFAULT_REGION
@host = options[:host] || region_to_host(@region) @host = options[:host] || region_to_host(@region)
@scheme = options[:scheme] || DEFAULT_SCHEME @scheme = options[:scheme] || DEFAULT_SCHEME
@port = options[:port] || DEFAULT_SCHEME_PORT[@scheme] @port = options[:port] || DEFAULT_SCHEME_PORT[@scheme]
end end
@path_style = options[:path_style] || false @path_style = options[:path_style] || false
@signature_version = options.fetch(:aws_signature_version, 4) @signature_version = options.fetch(:aws_signature_version, 4)
validate_signature_version! validate_signature_version!
@ -471,13 +475,14 @@ module Fog
validate_signature_version! validate_signature_version!
@path_style = options[:path_style] || false @path_style = options[:path_style] || false
@region = options[:region] || DEFAULT_REGION
if @endpoint = options[:endpoint] if @endpoint = options[:endpoint]
endpoint = URI.parse(@endpoint) endpoint = URI.parse(@endpoint)
@host = endpoint.host @host = endpoint.host
@scheme = endpoint.scheme @scheme = endpoint.scheme
@port = endpoint.port @port = endpoint.port
else else
@region = options[:region] || DEFAULT_REGION
@host = options[:host] || region_to_host(@region) @host = options[:host] || region_to_host(@region)
@scheme = options[:scheme] || DEFAULT_SCHEME @scheme = options[:scheme] || DEFAULT_SCHEME
@port = options[:port] || DEFAULT_SCHEME_PORT[@scheme] @port = options[:port] || DEFAULT_SCHEME_PORT[@scheme]