Skip to content

feat(api): migrate deprecated Scaleway API URLs #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2023
Merged

feat(api): migrate deprecated Scaleway API URLs #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scaleway/apis/api_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion scaleway/apis/api_billing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions scaleway/apis/api_compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
}
}

Expand Down
2 changes: 1 addition & 1 deletion scaleway/tests/apis/test_api_billing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
6 changes: 3 additions & 3 deletions scaleway/tests/apis/test_api_compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down