Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d404bcb

Browse files
Merge pull request #47 from scaleway/agw
feat(api): migrate deprecated Scaleway API URLs
2 parents c04a7d8 + 2ab0081 commit d404bcb

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎scaleway/apis/api_account.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class BadToken(InvalidToken):
3131
class AccountAPI(API):
3232
""" Interacts with Scaleway Account API.
3333
"""
34-
base_url = 'https://account.scaleway.com/'
34+
base_url = 'https://api.scaleway.com/account/v1'
3535

3636
def perm_matches(self, request_perm, effective_perm):
3737
""" Evaluates whether `request_perm` is granted by `effective_perm`.

‎scaleway/apis/api_billing.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class BillingAPI(API):
55

6-
base_url = 'https://billing.scaleway.com'
6+
base_url = 'https://api.scaleway.com/billing/v1'
77

88
def __init__(self, **kwargs):
99
base_url = kwargs.pop('base_url', BillingAPI.base_url)

‎scaleway/apis/api_compute.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@
1212

1313
REGIONS = {
1414
'par1': {
15-
'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/',
15+
'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/',
1616
},
1717
'ams1': {
18-
'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/',
18+
'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/',
1919
},
2020
'fr-par-1': {
21-
'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-1/',
21+
'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-1/',
2222
},
2323
'fr-par-2': {
24-
'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-2/',
24+
'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-2/',
2525
},
2626
'fr-par-3': {
27-
'url': 'https://api-fr-par.scaleway.com/instance/v1/zones/fr-par-3/',
27+
'url': 'https://api.scaleway.com/instance/v1/zones/fr-par-3/',
2828
},
2929
'nl-ams-1': {
30-
'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-1/',
30+
'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1/',
3131
},
3232
'nl-ams-2': {
33-
'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-2/',
33+
'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-2/',
3434
},
3535
'nl-ams-3': {
36-
'url': 'https://api-nl-ams.scaleway.com/instance/v1/zones/nl-ams-3/',
36+
'url': 'https://api.scaleway.com/instance/v1/zones/nl-ams-3/',
3737
},
3838
'pl-waw-1': {
39-
'url': 'https://api-pl-waw.scaleway.com/instance/v1/zones/pl-waw-1/',
39+
'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-1/',
4040
},
4141
'pl-waw-2': {
42-
'url': 'https://api-pl-waw.scaleway.com/instance/v1/zones/pl-waw-2/',
42+
'url': 'https://api.scaleway.com/instance/v1/zones/pl-waw-2/',
4343
}
4444
}
4545

‎scaleway/tests/apis/test_api_billing.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
class TestBillingAPI(unittest.TestCase):
77

88
def test_valid_endpoint(self):
9-
self.assertEqual(BillingAPI().base_url, 'https://billing.scaleway.com')
9+
self.assertEqual(BillingAPI().base_url, 'https://api.scaleway.com/billing/v1')

‎scaleway/tests/apis/test_api_compute.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ def test_set_region(self):
99
# Default region: par1.
1010
self.assertEqual(
1111
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/'
1313
)
1414

1515
# Explicit "region".
1616
self.assertEqual(
1717
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/'
1919
)
2020

2121
self.assertEqual(
2222
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/'
2424
)
2525

2626
# Explicit "base_url"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /