Merge pull request #47 from scaleway/agw

quantumsheep · web-flow · commit d404bcb12a3c · 2023-07-27T14:48:44.000+02:00
feat(api): migrate deprecated Scaleway API URLs
diff --git a/scaleway/apis/api_account.py b/scaleway/apis/api_account.py
@@ -31,7 +31,7 @@ class BadToken(InvalidToken):
 class AccountAPI(API):
     """ Interacts with Scaleway Account API.
     """
-    base_url = 'https://account.scaleway.com/'
+    base_url = 'https://api.scaleway.com/account/v1'
 
     def perm_matches(self, request_perm, effective_perm):
         """ Evaluates whether `request_perm` is granted by `effective_perm`.
diff --git a/scaleway/apis/api_billing.py b/scaleway/apis/api_billing.py
@@ -3,7 +3,7 @@
 
 class BillingAPI(API):
 
-    base_url = 'https://billing.scaleway.com'
+    base_url = 'https://api.scaleway.com/billing/v1'
 
     def __init__(self, **kwargs):
         base_url = kwargs.pop('base_url', BillingAPI.base_url)
diff --git a/scaleway/apis/api_compute.py b/scaleway/apis/api_compute.py
@@ -12,34 +12,34 @@
 
 REGIONS = {
     'par1': {
-        'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/',
     },
     'ams1': {
-        'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/',
     },
     'fr-par-1': {
-        'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/',
     },
     'fr-par-2': {
-        'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-2/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-2/',
     },
     'fr-par-3': {
-        'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-3/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-3/',
     },
     'nl-ams-1': {
-        'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/',
     },
     'nl-ams-2': {
-        'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-2/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-2/',
     },
     'nl-ams-3': {
-        'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-3/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-3/',
     },
     'pl-waw-1': {
-        'url': 'https://api-pl-waw.scaleway.com/instance/v1/zones/pl-waw-1/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-1/',
     },
     'pl-waw-2': {
-        'url': 'https://api-pl-waw.scaleway.com/instance/v1/zones/pl-waw-2/',
+        'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-2/',
     }
 }
 
diff --git a/scaleway/tests/apis/test_api_billing.py b/scaleway/tests/apis/test_api_billing.py
@@ -6,4 +6,4 @@
 class TestBillingAPI(unittest.TestCase):
 
     def test_valid_endpoint(self):
-        self.assertEqual(BillingAPI().base_url, 'https://billing.scaleway.com')
+        self.assertEqual(BillingAPI().base_url, 'https://api.scaleway.com/billing/v1')
diff --git a/scaleway/tests/apis/test_api_compute.py b/scaleway/tests/apis/test_api_compute.py
@@ -9,18 +9,18 @@ def test_set_region(self):
         # Default region: par1.
         self.assertEqual(
             ComputeAPI().base_url,
-            'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/'
+            'https://api.scaleway.com/instance/v1/zones/fr-par-1/'
         )
 
         # Explicit "region".
         self.assertEqual(
             ComputeAPI(region='par1').base_url,
-            'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/'
+            'https://api.scaleway.com/instance/v1/zones/fr-par-1/'
         )
 
         self.assertEqual(
             ComputeAPI(region='ams1').base_url,
-            'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/'
+            'https://api.scaleway.com/instance/v1/zones/nl-ams-1/'
         )
 
         # Explicit "base_url"

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,18 @@ def test_set_region(self):`
`9`	`9`	`# Default region: par1.`
`10`	`10`	`self.assertEqual(`
`11`	`11`	`ComputeAPI().base_url,`
`12`		`- 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/'`
	`12`	`+ 'https://api.scaleway.com/instance/v1/zones/fr-par-1/'`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`# Explicit "region".`
`16`	`16`	`self.assertEqual(`
`17`	`17`	`ComputeAPI(region='par1').base_url,`
`18`		`- 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/'`
	`18`	`+ 'https://api.scaleway.com/instance/v1/zones/fr-par-1/'`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`self.assertEqual(`
`22`	`22`	`ComputeAPI(region='ams1').base_url,`
`23`		`- 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/'`
	`23`	`+ 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/'`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`# Explicit "base_url"`