Skip to content

Commit 661db26

Browse files
scaleway-botscaleway-bot
authored
feat(ipam): register serverless_container and serverless_function (#852)
1 parent 8c3f3b1 commit 661db26

File tree

4 files changed

+52
-48
lines changed

4 files changed

+52
-48
lines changed

‎scaleway-async/scaleway_async/ipam/v1/api.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from scaleway_core.api import API
77
from scaleway_core.bridge import (
8-
Region,
8+
Region as ScwRegion,
99
)
1010
from scaleway_core.utils import (
1111
OneOfPossibility,
@@ -50,7 +50,7 @@ async def book_ip(
5050
*,
5151
source: Source,
5252
is_ipv6: bool,
53-
region: Optional[Region] = None,
53+
region: Optional[ScwRegion] = None,
5454
project_id: Optional[str] = None,
5555
address: Optional[str] = None,
5656
tags: Optional[List[str]] = None,
@@ -105,7 +105,7 @@ async def release_ip(
105105
self,
106106
*,
107107
ip_id: str,
108-
region: Optional[Region] = None,
108+
region: Optional[ScwRegion] = None,
109109
) -> None:
110110
"""
111111
Release an IP.
@@ -137,7 +137,7 @@ async def release_ip(
137137
async def release_ip_set(
138138
self,
139139
*,
140-
region: Optional[Region] = None,
140+
region: Optional[ScwRegion] = None,
141141
ip_ids: Optional[List[str]] = None,
142142
) -> None:
143143
"""
@@ -172,7 +172,7 @@ async def get_ip(
172172
self,
173173
*,
174174
ip_id: str,
175-
region: Optional[Region] = None,
175+
region: Optional[ScwRegion] = None,
176176
) -> IP:
177177
"""
178178
Get an IP.
@@ -206,7 +206,7 @@ async def update_ip(
206206
self,
207207
*,
208208
ip_id: str,
209-
region: Optional[Region] = None,
209+
region: Optional[ScwRegion] = None,
210210
tags: Optional[List[str]] = None,
211211
reverses: Optional[List[Reverse]] = None,
212212
) -> IP:
@@ -252,7 +252,7 @@ async def update_ip(
252252
async def list_i_ps(
253253
self,
254254
*,
255-
region: Optional[Region] = None,
255+
region: Optional[ScwRegion] = None,
256256
order_by: Optional[ListIPsRequestOrderBy] = None,
257257
page: Optional[int] = None,
258258
page_size: Optional[int] = None,
@@ -348,7 +348,7 @@ async def list_i_ps(
348348
async def list_i_ps_all(
349349
self,
350350
*,
351-
region: Optional[Region] = None,
351+
region: Optional[ScwRegion] = None,
352352
order_by: Optional[ListIPsRequestOrderBy] = None,
353353
page: Optional[int] = None,
354354
page_size: Optional[int] = None,
@@ -436,7 +436,7 @@ async def attach_ip(
436436
*,
437437
ip_id: str,
438438
resource: CustomResource,
439-
region: Optional[Region] = None,
439+
region: Optional[ScwRegion] = None,
440440
) -> IP:
441441
"""
442442
Attach IP to custom resource.
@@ -481,7 +481,7 @@ async def detach_ip(
481481
*,
482482
ip_id: str,
483483
resource: CustomResource,
484-
region: Optional[Region] = None,
484+
region: Optional[ScwRegion] = None,
485485
) -> IP:
486486
"""
487487
Detach IP from a custom resource.
@@ -526,7 +526,7 @@ async def move_ip(
526526
*,
527527
ip_id: str,
528528
from_resource: CustomResource,
529-
region: Optional[Region] = None,
529+
region: Optional[ScwRegion] = None,
530530
to_resource: Optional[CustomResource] = None,
531531
) -> IP:
532532
"""

‎scaleway-async/scaleway_async/ipam/v1/types.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from typing import List, Optional
99

1010
from scaleway_core.bridge import (
11-
Region,
12-
Zone,
11+
Region as ScwRegion,
12+
Zone as ScwZone,
1313
)
1414
from scaleway_core.utils import (
1515
StrEnumMeta,
@@ -48,6 +48,8 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
4848
MGDB_INSTANCE = "mgdb_instance"
4949
APPLE_SILICON_SERVER = "apple_silicon_server"
5050
APPLE_SILICON_PRIVATE_NIC = "apple_silicon_private_nic"
51+
SERVERLESS_CONTAINER = "serverless_container"
52+
SERVERLESS_FUNCTION = "serverless_function"
5153

5254
def __str__(self) -> str:
5355
return str(self.value)
@@ -143,7 +145,7 @@ class IP:
143145
Array of reverses associated with the IP.
144146
"""
145147

146-
region: Region
148+
region: ScwRegion
147149
"""
148150
Region of the IP.
149151
"""
@@ -168,7 +170,7 @@ class IP:
168170
Resource which the IP is attached to.
169171
"""
170172

171-
zone: Optional[Zone]
173+
zone: Optional[ScwZone]
172174
"""
173175
Zone of the IP, if zonal.
174176
"""
@@ -186,7 +188,7 @@ class AttachIPRequest:
186188
Custom resource to be attached to the IP.
187189
"""
188190

189-
region: Optional[Region]
191+
region: Optional[ScwRegion]
190192
"""
191193
Region to target. If none is passed will use default region from the config.
192194
"""
@@ -204,7 +206,7 @@ class BookIPRequest:
204206
Request an IPv6 instead of an IPv4.
205207
"""
206208

207-
region: Optional[Region]
209+
region: Optional[ScwRegion]
208210
"""
209211
Region to target. If none is passed will use default region from the config.
210212
"""
@@ -242,7 +244,7 @@ class DetachIPRequest:
242244
Custom resource currently attached to the IP.
243245
"""
244246

245-
region: Optional[Region]
247+
region: Optional[ScwRegion]
246248
"""
247249
Region to target. If none is passed will use default region from the config.
248250
"""
@@ -255,15 +257,15 @@ class GetIPRequest:
255257
IP ID.
256258
"""
257259

258-
region: Optional[Region]
260+
region: Optional[ScwRegion]
259261
"""
260262
Region to target. If none is passed will use default region from the config.
261263
"""
262264

263265

264266
@dataclass
265267
class ListIPsRequest:
266-
region: Optional[Region]
268+
region: Optional[ScwRegion]
267269
"""
268270
Region to target. If none is passed will use default region from the config.
269271
"""
@@ -374,7 +376,7 @@ class MoveIPRequest:
374376
Custom resource currently attached to the IP.
375377
"""
376378

377-
region: Optional[Region]
379+
region: Optional[ScwRegion]
378380
"""
379381
Region to target. If none is passed will use default region from the config.
380382
"""
@@ -392,15 +394,15 @@ class ReleaseIPRequest:
392394
IP ID.
393395
"""
394396

395-
region: Optional[Region]
397+
region: Optional[ScwRegion]
396398
"""
397399
Region to target. If none is passed will use default region from the config.
398400
"""
399401

400402

401403
@dataclass
402404
class ReleaseIPSetRequest:
403-
region: Optional[Region]
405+
region: Optional[ScwRegion]
404406
"""
405407
Region to target. If none is passed will use default region from the config.
406408
"""
@@ -415,7 +417,7 @@ class UpdateIPRequest:
415417
IP ID.
416418
"""
417419

418-
region: Optional[Region]
420+
region: Optional[ScwRegion]
419421
"""
420422
Region to target. If none is passed will use default region from the config.
421423
"""

‎scaleway/scaleway/ipam/v1/api.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from scaleway_core.api import API
77
from scaleway_core.bridge import (
8-
Region,
8+
Region as ScwRegion,
99
)
1010
from scaleway_core.utils import (
1111
OneOfPossibility,
@@ -50,7 +50,7 @@ def book_ip(
5050
*,
5151
source: Source,
5252
is_ipv6: bool,
53-
region: Optional[Region] = None,
53+
region: Optional[ScwRegion] = None,
5454
project_id: Optional[str] = None,
5555
address: Optional[str] = None,
5656
tags: Optional[List[str]] = None,
@@ -105,7 +105,7 @@ def release_ip(
105105
self,
106106
*,
107107
ip_id: str,
108-
region: Optional[Region] = None,
108+
region: Optional[ScwRegion] = None,
109109
) -> None:
110110
"""
111111
Release an IP.
@@ -137,7 +137,7 @@ def release_ip(
137137
def release_ip_set(
138138
self,
139139
*,
140-
region: Optional[Region] = None,
140+
region: Optional[ScwRegion] = None,
141141
ip_ids: Optional[List[str]] = None,
142142
) -> None:
143143
"""
@@ -172,7 +172,7 @@ def get_ip(
172172
self,
173173
*,
174174
ip_id: str,
175-
region: Optional[Region] = None,
175+
region: Optional[ScwRegion] = None,
176176
) -> IP:
177177
"""
178178
Get an IP.
@@ -206,7 +206,7 @@ def update_ip(
206206
self,
207207
*,
208208
ip_id: str,
209-
region: Optional[Region] = None,
209+
region: Optional[ScwRegion] = None,
210210
tags: Optional[List[str]] = None,
211211
reverses: Optional[List[Reverse]] = None,
212212
) -> IP:
@@ -252,7 +252,7 @@ def update_ip(
252252
def list_i_ps(
253253
self,
254254
*,
255-
region: Optional[Region] = None,
255+
region: Optional[ScwRegion] = None,
256256
order_by: Optional[ListIPsRequestOrderBy] = None,
257257
page: Optional[int] = None,
258258
page_size: Optional[int] = None,
@@ -348,7 +348,7 @@ def list_i_ps(
348348
def list_i_ps_all(
349349
self,
350350
*,
351-
region: Optional[Region] = None,
351+
region: Optional[ScwRegion] = None,
352352
order_by: Optional[ListIPsRequestOrderBy] = None,
353353
page: Optional[int] = None,
354354
page_size: Optional[int] = None,
@@ -436,7 +436,7 @@ def attach_ip(
436436
*,
437437
ip_id: str,
438438
resource: CustomResource,
439-
region: Optional[Region] = None,
439+
region: Optional[ScwRegion] = None,
440440
) -> IP:
441441
"""
442442
Attach IP to custom resource.
@@ -481,7 +481,7 @@ def detach_ip(
481481
*,
482482
ip_id: str,
483483
resource: CustomResource,
484-
region: Optional[Region] = None,
484+
region: Optional[ScwRegion] = None,
485485
) -> IP:
486486
"""
487487
Detach IP from a custom resource.
@@ -526,7 +526,7 @@ def move_ip(
526526
*,
527527
ip_id: str,
528528
from_resource: CustomResource,
529-
region: Optional[Region] = None,
529+
region: Optional[ScwRegion] = None,
530530
to_resource: Optional[CustomResource] = None,
531531
) -> IP:
532532
"""

0 commit comments

Comments
 (0)