diff --git a/lib/fog/aws/emr.rb b/lib/fog/aws/emr.rb index cd6d5d9d8..42e3be2c7 100644 --- a/lib/fog/aws/emr.rb +++ b/lib/fog/aws/emr.rb @@ -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