fix: Regional API domain processing

lib/twilio-ruby/base/client_base.rb

@@ -3,9 +3,20 @@ module REST
     class ClientBase
       # rubocop:disable Style/ClassVars
       @@default_region = 'us1'
+      @@region_mappings = {
+        'au1' => 'sydney',
+        'br1' => 'sao-paulo',
+        'de1' => 'frankfurt',
+        'ie1' => 'dublin',
+        'jp1' => 'tokyo',
+        'jp2' => 'osaka',
+        'sg1' => 'singapore',
+        'us1' => 'ashburn',
+        'us2' => 'umatilla'
+      }
       # rubocop:enable Style/ClassVars
 
-      attr_accessor :http_client, :username, :password, :account_sid, :auth_token, :region, :edge, :logger,
+      attr_accessor :http_client, :username, :password, :account_sid, :auth_token, :region, :logger,
                     :user_agent_extensions, :credentials
 
       # rubocop:disable Metrics/ParameterLists
@@ -14,7 +25,7 @@ def initialize(username = nil, password = nil, account_sid = nil, region = nil,
         @username = username || Twilio.account_sid
         @password = password || Twilio.auth_token
         @region = region || Twilio.region
-        @edge = Twilio.edge
+        @edge = !region.nil? ? @@region_mappings[region] : nil
         @account_sid = account_sid || @username
         @auth_token = @password
         @auth = [@username, @password]
@@ -23,6 +34,16 @@ def initialize(username = nil, password = nil, account_sid = nil, region = nil,
         @user_agent_extensions = user_agent_extensions || []
       end
 
+      def edge=(value)
+        warn '[DEPRECATION] `edge` is deprecated and will be removed in a future version. Use `region` instead.'
+        @edge = value
+      end
+
+      def edge
+        warn '[DEPRECATION] `edge` is deprecated and will be removed in a future version. Use `region` instead.'
+        @edge
+      end
+
       def credential_provider(credential_provider = nil)
         @credentials = credential_provider
         self

spec/rest/client_spec.rb

@@ -26,7 +26,7 @@
       expect(@client.auth_token).to eq('someToken')
       expect(@client.http_client).to eq('someClient')
       expect(@client.region).to eq('someRegion')
-      expect(@client.edge).to eq('someEdge')
+      expect(@client.edge).to eq(nil)
       expect(@client.logger).to eq('someLogger')
     end
 
@@ -41,6 +41,28 @@
       expect(@client.logger).to eq('myLogger')
     end
 
+    it 'uses the region edge mapping' do
+      @client = Twilio::REST::Client.new('myUser', 'myPassword', 'someSid', 'ie1', 'myClient', 'myLogger')
+      expect(@client.account_sid).to eq('someSid')
+      expect(@client.auth_token).to eq('myPassword')
+      expect(@client.region).to eq('ie1')
+      expect(@client.edge).to eq('dublin')
+      expect(@client.logger).to eq('myLogger')
+    end
+
+    it 'catches warning when setting edge' do
+      original_stderr = $stderr
+      $stderr = StringIO.new
+      begin
+        @client = Twilio::REST::Client.new
+        @client.edge = 'deprecatedEdge'
+        warnings = $stderr.string
+        expect(warnings).to include('[DEPRECATION] `edge` is deprecated and will be removed in a future version. Use `region` instead.')
+      ensure
+        $stderr = original_stderr
+      end
+    end
+
     class MyVersion < Twilio::REST::Version
       def initialize(domain)
         super