kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Merge pull request #728 from paxan/dont-hardcode-regions 

Don't hardcode regions
This commit is contained in:
Wesley Beary 2012-02-03 07:46:31 -08:00
parent 96cc7a2aba 34efabbe48
commit cbd2a4e1dd
14 changed files with 23 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/fog/aws/auto_scaling.rb
View File

@ -77,24 +77,7 @@ module Fog
@connection_options = options[:connection_options] || {}
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'autoscaling.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'autoscaling.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'autoscaling.eu-west-1.amazonaws.com'
when 'us-east-1'
'autoscaling.us-east-1.amazonaws.com'
when 'us-west-1'
'autoscaling.us-west-1.amazonaws.com'
when 'us-west-2'
'autoscaling.us-west-2.amazonaws.com'
when 'sa-east-1'
'autoscaling.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "autoscaling.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@port = options[:port] || 443
@persistent = options[:persistent] || false

19
lib/fog/aws/cloud_formation.rb
View File

@ -54,24 +54,7 @@ module Fog
@connection_options = options[:connection_options] || {}
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'cloudformation.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'cloudformation.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'cloudformation.eu-west-1.amazonaws.com'
when 'us-east-1'
'cloudformation.us-east-1.amazonaws.com'
when 'us-west-1'
'cloudformation.us-west-1.amazonaws.com'
when 'us-west-2'
'cloudformation.us-west-2.amazonaws.com'
when 'sa-east-1'
'cloudformation.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

21
lib/fog/aws/cloud_watch.rb
View File

@ -57,7 +57,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1', 'ap-northeast-1']
# * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
#
# ==== Returns
# * CloudWatch object with connection to AWS.
@ -68,24 +68,7 @@ module Fog
@connection_options = options[:connection_options] || {}
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'monitoring.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'monitoring.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'monitoring.eu-west-1.amazonaws.com'
when 'us-east-1'
'monitoring.us-east-1.amazonaws.com'
when 'us-west-1'
'monitoring.us-west-1.amazonaws.com'
when 'us-west-2'
'monitoring.us-west-2.amazonaws.com'
when 'sa-east-1'
'monitoring.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

23
lib/fog/aws/compute.rb
View File

@ -248,8 +248,8 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in
# ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance,
# 'eu-west-1', 'us-east-1', and etc.
# * aws_session_token<~String> - when using Session Tokens or Federated Users, a session_token must be presented
#
# ==== Returns
@ -271,24 +271,7 @@ module Fog
@port = endpoint.port
@scheme = endpoint.scheme
else
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'ec2.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'ec2.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'ec2.eu-west-1.amazonaws.com'
when 'us-east-1'
'ec2.us-east-1.amazonaws.com'
when 'us-west-1'
'ec2.us-west-1.amazonaws.com'
when 'us-west-2'
'ec2.us-west-2.amazonaws.com'
when 'sa-east-1'
'ec2.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "ec2.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

19
lib/fog/aws/dynamodb.rb
View File

@ -90,24 +90,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'dynamodb.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'dynamodb.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'dynamodb.eu-west-1.amazonaws.com'
when 'us-east-1'
'dynamodb.us-east-1.amazonaws.com'
when 'us-west-1'
'dynamodb.us-west-1.amazonaws.com'
when 'us-west-2'
'dynamodb.us-west-2.amazonaws.com'
when 'sa-east-1'
'dynamodb.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "dynamodb.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || '80' #443

15
lib/fog/aws/elasticache.rb
View File

@ -54,20 +54,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'us-east-1'
'elasticache.us-east-1.amazonaws.com'
when 'us-west-1'
'elasticache.us-west-1.amazonaws.com'
when 'eu-west-1'
'elasticache.eu-west-1.amazonaws.com'
when 'ap-southeast-1'
'elasticache.ap-southeast-1.amazonaws.com'
when 'ap-northeast-1'
'elasticache.ap-northeast-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "elasticache.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'

21
lib/fog/aws/elb.rb
View File

@ -106,7 +106,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
#
# ==== Returns
# * ELB object with connection to AWS.
@ -119,24 +119,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'elasticloadbalancing.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'elasticloadbalancing.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'elasticloadbalancing.eu-west-1.amazonaws.com'
when 'us-east-1'
'elasticloadbalancing.us-east-1.amazonaws.com'
when 'us-west-1'
'elasticloadbalancing.us-west-1.amazonaws.com'
when 'us-west-2'
'elasticloadbalancing.us-west-2.amazonaws.com'
when 'sa-east-1'
'elasticloadbalancing.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "elasticloadbalancing.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

21
lib/fog/aws/emr.rb
View File

@ -57,7 +57,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance, in 'eu-west-1', 'us-east-1' and etc.
#
# ==== Returns
# * EMR object with connection to AWS.
@ -68,24 +68,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'elasticmapreduce.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'elasticmapreduce.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'elasticmapreduce.eu-west-1.amazonaws.com'
when 'us-east-1'
'elasticmapreduce.us-east-1.amazonaws.com'
when 'us-west-1'
'elasticmapreduce.us-west-1.amazonaws.com'
when 'us-west-2'
'elasticmapreduce.us-west-2.amazonaws.com'
when 'sa-east-1'
'elasticmapreduce.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "elasticmapreduce.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

21
lib/fog/aws/rds.rb
View File

@ -115,7 +115,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
#
# ==== Returns
# * ELB object with connection to AWS.
@ -126,24 +126,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'rds.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'rds.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'rds.eu-west-1.amazonaws.com'
when 'us-east-1'
'rds.us-east-1.amazonaws.com'
when 'us-west-1'
'rds.us-west-1.amazonaws.com'
when 'us-west-2'
'rds.us-west-2.amazonaws.com'
when 'sa-east-1'
'rds.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "rds.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

9
lib/fog/aws/ses.rb
View File

@ -40,7 +40,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance, 'us-east-1' and etc.
#
# ==== Returns
# * SES object with connection to AWS.
@ -52,12 +52,7 @@ module Fog
@connection_options = options[:connection_options] || {}
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'us-east-1'
'email.us-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "email.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

19
lib/fog/aws/simpledb.rb
View File

@ -76,24 +76,7 @@ module Fog
@nil_string = options[:nil_string]|| 'nil'
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'sdb.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'sdb.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'sdb.eu-west-1.amazonaws.com'
when 'us-east-1'
'sdb.amazonaws.com'
when 'us-west-1'
'sdb.us-west-1.amazonaws.com'
when 'us-west-2'
'sdb.us-west-2.amazonaws.com'
when 'sa-east-1'
'sdb.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "sdb.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443

17
lib/fog/aws/sns.rb
View File

@ -56,22 +56,7 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-southeast-1'
'sns.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'sns.eu-west-1.amazonaws.com'
when 'us-east-1'
'sns.us-east-1.amazonaws.com'
when 'us-west-1'
'sns.us-west-1.amazonaws.com'
when 'us-west-2'
'sns.us-west-2.amazonaws.com'
when 'sa-east-1'
'sns.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@host = options[:host] || "sns.#{options[:region]}.amazonaws.com"
@path = options[:path] || '/'
@persistent = options[:persistent] || false

14
lib/fog/aws/sqs.rb
View File

@ -71,7 +71,7 @@ module Fog
#
# ==== Parameters
# * options<~Hash> - config arguments for connection. Defaults to {}.
# * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
# * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
#
# ==== Returns
# * SQS object with connection to AWS.
@ -83,20 +83,10 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-southeast-1'
'ap-southeast-1.queue.amazonaws.com'
when 'eu-west-1'
'eu-west-1.queue.amazonaws.com'
when 'us-east-1'
'queue.amazonaws.com'
when 'us-west-1'
'us-west-1.queue.amazonaws.com'
when 'us-west-2'
'us-west-2.queue.amazonaws.com'
when 'sa-east-1'
'sa-east-1.queue.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
"#{options[:region]}.queue.amazonaws.com"
end
@path = options[:path] || '/'
@persistent = options[:persistent] || false

30
lib/fog/aws/storage.rb
View File

@ -192,24 +192,10 @@ module Fog
@aws_secret_access_key = options[:aws_secret_access_key]
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
's3-ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
's3-ap-southeast-1.amazonaws.com'
when 'eu-west-1'
's3-eu-west-1.amazonaws.com'
when 'us-east-1'
's3.amazonaws.com'
when 'sa-east-1'
's3-sa-east-1.amazonaws.com'
when 'us-west-1'
's3-us-west-1.amazonaws.com'
when 'us-west-2'
's3-us-west-2.amazonaws.com'
when 'sa-east-1'
's3-sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
"s3-#{options[:region]}.amazonaws.com"
end
@region = options[:region]
end
@ -270,22 +256,10 @@ module Fog
else
options[:region] ||= 'us-east-1'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
's3-ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
's3-ap-southeast-1.amazonaws.com'
when 'eu-west-1'
's3-eu-west-1.amazonaws.com'
when 'us-east-1'
's3.amazonaws.com'
when 'sa-east-1'
's3-sa-east-1.amazonaws.com'
when 'us-west-1'
's3-us-west-1.amazonaws.com'
when 'us-west-2'
's3-us-west-2.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
"s3-#{options[:region]}.amazonaws.com"
end
@path = options[:path] || '/'
@persistent = options[:persistent] || true