From 2ab0081b64d12f170a3461ce5beb65b06c61d17b Mon Sep 17 00:00:00 2001
From: Julien Brochet <jbrochet@scaleway.com>
Date: Wed, 26 Jul 2023 10:32:16 +0200
Subject: [PATCH] feat(api): migrate deprecated Scaleway API URLs

---
 scaleway/apis/api_account.py            |  2 +-
 scaleway/apis/api_billing.py            |  2 +-
 scaleway/apis/api_compute.py            | 20 ++++++++++----------
 scaleway/tests/apis/test_api_billing.py |  2 +-
 scaleway/tests/apis/test_api_compute.py |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scaleway/apis/api_account.py b/scaleway/apis/api_account.py
index 9dc0aef..9bc0b11 100644
--- 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
index 4dfe366..bcc3754 100644
--- 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
index 216e314..8b1bbc5 100644
--- 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
index 92adbb9..aca0df3 100644
--- 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
index 0996c48..1e74cbd 100644
--- 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"