chore: remove Region.from_region_id backup domain qbox and s3

qiniu · Sep 6, 2024 · 2891faf · 2891faf
1 parent 0dbde38
commit 2891faf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 33 deletions.
diff --git a/qiniu/http/region.py b/qiniu/http/region.py
@@ -17,7 +17,6 @@ class ServiceName(Enum):
     RS = 'rs'
     RSF = 'rsf'
     API = 'api'
-    S3 = 's3'
 
 
 class Region:
@@ -77,34 +76,25 @@ def from_region_id(region_id, **kwargs):
         services_hosts = {
             ServiceName.UC: ['uc.qiniuapi.com'],
             ServiceName.UP: [
-                # TODO(lihs): backend seems mark qbox.me to old
-                'up-{0}.qiniup.com'.format(region_id),
-                'up-{0}.qbox.me'.format(region_id)
+                'upload-{0}.qiniup.com'.format(region_id),
+                'up-{0}.qiniup.com'.format(region_id)
             ] if not is_z0 else [
-                'up.qiniup.com',
-                'up.qbox.me'
+                'upload.qiniup.com',
+                'up.qiniup.com'
             ],
             ServiceName.IO: [
                 'iovip-{0}.qiniuio.com'.format(region_id),
-                'iovip-{0}.qbox.me'.format(region_id)
             ] if not is_z0 else [
                 'iovip.qiniuio.com',
-                'iovip.qbox.me'
             ],
             ServiceName.RS: [
                 'rs-{0}.qiniuapi.com'.format(region_id),
-                'rs-{0}.qbox.me'.format(region_id)
             ],
             ServiceName.RSF: [
                 'rsf-{0}.qiniuapi.com'.format(region_id),
-                'rsf-{0}.qbox.me'.format(region_id)
             ],
             ServiceName.API: [
                 'api-{0}.qiniuapi.com'.format(region_id),
-                'api-{0}.qbox.me'.format(region_id)
-            ],
-            ServiceName.S3: [
-                's3.{0}.qiniucs.com'.format(region_id),
             ]
         }
         services = {

diff --git a/tests/cases/test_http/test_region.py b/tests/cases/test_http/test_region.py
@@ -48,28 +48,21 @@ def test_from_region_id(self):
                 'https://uc.qiniuapi.com'
             ],
             ServiceName.UP: [
-                'https://up.qiniup.com',
-                'https://up.qbox.me'
+                'https://upload.qiniup.com',
+                'https://up.qiniup.com'
             ],
             ServiceName.UP_ACC: [],
             ServiceName.IO: [
                 'https://iovip.qiniuio.com',
-                'https://iovip.qbox.me'
             ],
             ServiceName.RS: [
                 'https://rs-z0.qiniuapi.com',
-                'https://rs-z0.qbox.me'
             ],
             ServiceName.RSF: [
                 'https://rsf-z0.qiniuapi.com',
-                'https://rsf-z0.qbox.me'
             ],
             ServiceName.API: [
                 'https://api-z0.qiniuapi.com',
-                'https://api-z0.qbox.me'
-            ],
-            ServiceName.S3: [
-                'https://s3.z0.qiniucs.com'
             ]
         }
 
@@ -109,28 +102,21 @@ def test_from_region_id_with_custom_options(self):
                 preferred_scheme + '://uc.qiniuapi.com'
             ],
             ServiceName.UP: [
-                preferred_scheme + '://up-z1.qiniup.com',
-                preferred_scheme + '://up-z1.qbox.me'
+                preferred_scheme + '://upload-z1.qiniup.com',
+                preferred_scheme + '://up-z1.qiniup.com'
             ],
             ServiceName.UP_ACC: [],
             ServiceName.IO: [
                 preferred_scheme + '://iovip-z1.qiniuio.com',
-                preferred_scheme + '://iovip-z1.qbox.me'
             ],
             ServiceName.RS: [
                 preferred_scheme + '://rs-z1.qiniuapi.com',
-                preferred_scheme + '://rs-z1.qbox.me'
             ],
             ServiceName.RSF: [
                 preferred_scheme + '://rsf-z1.qiniuapi.com',
-                preferred_scheme + '://rsf-z1.qbox.me'
             ],
             ServiceName.API: [
                 preferred_scheme + '://api-z1.qiniuapi.com',
-                preferred_scheme + '://api-z1.qbox.me'
-            ],
-            ServiceName.S3: [
-                preferred_scheme + '://s3.z1.qiniucs.com'
             ],
             'custom-service': [
                 custom_service_endpoint.get_value()
@@ -156,7 +142,7 @@ def test_clone(self):
         cloned_region.region_id = 'another'
         cloned_region.services[ServiceName.UP][0].host = 'another-uc.qiniuapi.com'
         assert region.region_id == 'z0'
-        assert region.services[ServiceName.UP][0].get_value() == 'https://up.qiniup.com'
+        assert region.services[ServiceName.UP][0].get_value() == 'https://upload.qiniup.com'
         assert cloned_region.services[ServiceName.UP][0].get_value() == 'https://another-uc.qiniuapi.com'
 
     def test_merge(self):