Skip to content

Commit 30b5df8

Browse files
scaleway-botscaleway-bot
authored
fix: add prefix to Zone and Region import (scaleway#832)
1 parent 4e6bf2e commit 30b5df8

File tree

132 files changed

+4142
-4140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+4142
-4140
lines changed

‎scaleway-async/scaleway_async/applesilicon/v1alpha1/api.py

Lines changed: 24 additions & 24 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-
Zone,
8+
Zone as ScwZone,
99
)
1010
from scaleway_core.utils import (
1111
WaitForOptions,
@@ -68,7 +68,7 @@ class ApplesiliconV1Alpha1API(API):
6868
async def list_server_types(
6969
self,
7070
*,
71-
zone: Optional[Zone] = None,
71+
zone: Optional[ScwZone] = None,
7272
) -> ListServerTypesResponse:
7373
"""
7474
List server types.
@@ -96,7 +96,7 @@ async def get_server_type(
9696
self,
9797
*,
9898
server_type: str,
99-
zone: Optional[Zone] = None,
99+
zone: Optional[ScwZone] = None,
100100
) -> ServerType:
101101
"""
102102
Get a server type.
@@ -129,7 +129,7 @@ async def create_server(
129129
*,
130130
type_: str,
131131
enable_vpc: bool,
132-
zone: Optional[Zone] = None,
132+
zone: Optional[ScwZone] = None,
133133
name: Optional[str] = None,
134134
project_id: Optional[str] = None,
135135
os_id: Optional[str] = None,
@@ -178,7 +178,7 @@ async def create_server(
178178
async def list_servers(
179179
self,
180180
*,
181-
zone: Optional[Zone] = None,
181+
zone: Optional[ScwZone] = None,
182182
order_by: Optional[ListServersRequestOrderBy] = None,
183183
project_id: Optional[str] = None,
184184
organization_id: Optional[str] = None,
@@ -223,7 +223,7 @@ async def list_servers(
223223
async def list_servers_all(
224224
self,
225225
*,
226-
zone: Optional[Zone] = None,
226+
zone: Optional[ScwZone] = None,
227227
order_by: Optional[ListServersRequestOrderBy] = None,
228228
project_id: Optional[str] = None,
229229
organization_id: Optional[str] = None,
@@ -264,7 +264,7 @@ async def list_servers_all(
264264
async def list_os(
265265
self,
266266
*,
267-
zone: Optional[Zone] = None,
267+
zone: Optional[ScwZone] = None,
268268
page: Optional[int] = None,
269269
page_size: Optional[int] = None,
270270
server_type: Optional[str] = None,
@@ -305,7 +305,7 @@ async def list_os(
305305
async def list_os_all(
306306
self,
307307
*,
308-
zone: Optional[Zone] = None,
308+
zone: Optional[ScwZone] = None,
309309
page: Optional[int] = None,
310310
page_size: Optional[int] = None,
311311
server_type: Optional[str] = None,
@@ -344,7 +344,7 @@ async def get_os(
344344
self,
345345
*,
346346
os_id: str,
347-
zone: Optional[Zone] = None,
347+
zone: Optional[ScwZone] = None,
348348
) -> OS:
349349
"""
350350
Get an Operating System (OS).
@@ -376,7 +376,7 @@ async def get_server(
376376
self,
377377
*,
378378
server_id: str,
379-
zone: Optional[Zone] = None,
379+
zone: Optional[ScwZone] = None,
380380
) -> Server:
381381
"""
382382
Get a server.
@@ -408,7 +408,7 @@ async def wait_for_server(
408408
self,
409409
*,
410410
server_id: str,
411-
zone: Optional[Zone] = None,
411+
zone: Optional[ScwZone] = None,
412412
options: Optional[WaitForOptions[Server, Union[bool, Awaitable[bool]]]] = None,
413413
) -> Server:
414414
"""
@@ -445,7 +445,7 @@ async def update_server(
445445
self,
446446
*,
447447
server_id: str,
448-
zone: Optional[Zone] = None,
448+
zone: Optional[ScwZone] = None,
449449
name: Optional[str] = None,
450450
schedule_deletion: Optional[bool] = None,
451451
enable_vpc: Optional[bool] = None,
@@ -493,7 +493,7 @@ async def delete_server(
493493
self,
494494
*,
495495
server_id: str,
496-
zone: Optional[Zone] = None,
496+
zone: Optional[ScwZone] = None,
497497
) -> None:
498498
"""
499499
Delete a server.
@@ -523,7 +523,7 @@ async def reboot_server(
523523
self,
524524
*,
525525
server_id: str,
526-
zone: Optional[Zone] = None,
526+
zone: Optional[ScwZone] = None,
527527
) -> Server:
528528
"""
529529
Reboot a server.
@@ -556,7 +556,7 @@ async def reinstall_server(
556556
self,
557557
*,
558558
server_id: str,
559-
zone: Optional[Zone] = None,
559+
zone: Optional[ScwZone] = None,
560560
os_id: Optional[str] = None,
561561
) -> Server:
562562
"""
@@ -598,7 +598,7 @@ async def start_connectivity_diagnostic(
598598
self,
599599
*,
600600
server_id: str,
601-
zone: Optional[Zone] = None,
601+
zone: Optional[ScwZone] = None,
602602
) -> StartConnectivityDiagnosticResponse:
603603
"""
604604
:param server_id:
@@ -634,7 +634,7 @@ async def get_connectivity_diagnostic(
634634
self,
635635
*,
636636
diagnostic_id: str,
637-
zone: Optional[Zone] = None,
637+
zone: Optional[ScwZone] = None,
638638
) -> ConnectivityDiagnostic:
639639
"""
640640
:param diagnostic_id:
@@ -671,7 +671,7 @@ async def get_server_private_network(
671671
*,
672672
server_id: str,
673673
private_network_id: str,
674-
zone: Optional[Zone] = None,
674+
zone: Optional[ScwZone] = None,
675675
) -> ServerPrivateNetwork:
676676
"""
677677
:param server_id:
@@ -707,7 +707,7 @@ async def wait_for_server_private_network(
707707
*,
708708
server_id: str,
709709
private_network_id: str,
710-
zone: Optional[Zone] = None,
710+
zone: Optional[ScwZone] = None,
711711
options: Optional[
712712
WaitForOptions[ServerPrivateNetwork, Union[bool, Awaitable[bool]]]
713713
] = None,
@@ -751,7 +751,7 @@ async def add_server_private_network(
751751
*,
752752
server_id: str,
753753
private_network_id: str,
754-
zone: Optional[Zone] = None,
754+
zone: Optional[ScwZone] = None,
755755
ipam_ip_ids: Optional[List[str]] = None,
756756
) -> ServerPrivateNetwork:
757757
"""
@@ -797,7 +797,7 @@ async def set_server_private_networks(
797797
*,
798798
server_id: str,
799799
per_private_network_ipam_ip_ids: Dict[str, List[str]],
800-
zone: Optional[Zone] = None,
800+
zone: Optional[ScwZone] = None,
801801
) -> SetServerPrivateNetworksResponse:
802802
"""
803803
Set multiple Private Networks on a server.
@@ -838,7 +838,7 @@ async def set_server_private_networks(
838838
async def list_server_private_networks(
839839
self,
840840
*,
841-
zone: Optional[Zone] = None,
841+
zone: Optional[ScwZone] = None,
842842
order_by: Optional[ListServerPrivateNetworksRequestOrderBy] = None,
843843
page: Optional[int] = None,
844844
page_size: Optional[int] = None,
@@ -892,7 +892,7 @@ async def list_server_private_networks(
892892
async def list_server_private_networks_all(
893893
self,
894894
*,
895-
zone: Optional[Zone] = None,
895+
zone: Optional[ScwZone] = None,
896896
order_by: Optional[ListServerPrivateNetworksRequestOrderBy] = None,
897897
page: Optional[int] = None,
898898
page_size: Optional[int] = None,
@@ -944,7 +944,7 @@ async def delete_server_private_network(
944944
*,
945945
server_id: str,
946946
private_network_id: str,
947-
zone: Optional[Zone] = None,
947+
zone: Optional[ScwZone] = None,
948948
) -> None:
949949
"""
950950
Delete a Private Network.

‎scaleway-async/scaleway_async/applesilicon/v1alpha1/types.py

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

1010
from scaleway_core.bridge import (
11-
Zone,
11+
Zone as ScwZone,
1212
)
1313
from scaleway_core.utils import (
1414
StrEnumMeta,
@@ -354,7 +354,7 @@ class Server:
354354
Set to true to mark the server for automatic deletion depending on `deletable_at` date. Set to false to cancel an existing deletion schedule. Leave unset otherwise.
355355
"""
356356

357-
zone: Zone
357+
zone: ScwZone
358358
"""
359359
Zone of the server.
360360
"""
@@ -417,7 +417,7 @@ class CreateServerRequest:
417417
Activate the Private Network feature for this server. This feature is configured through the Apple Silicon - Private Networks API.
418418
"""
419419

420-
zone: Optional[Zone]
420+
zone: Optional[ScwZone]
421421
"""
422422
Zone to target. If none is passed will use default zone from the config.
423423
"""
@@ -445,7 +445,7 @@ class DeleteServerRequest:
445445
UUID of the server you want to delete.
446446
"""
447447

448-
zone: Optional[Zone]
448+
zone: Optional[ScwZone]
449449
"""
450450
Zone to target. If none is passed will use default zone from the config.
451451
"""
@@ -455,7 +455,7 @@ class DeleteServerRequest:
455455
class GetConnectivityDiagnosticRequest:
456456
diagnostic_id: str
457457

458-
zone: Optional[Zone]
458+
zone: Optional[ScwZone]
459459
"""
460460
Zone to target. If none is passed will use default zone from the config.
461461
"""
@@ -468,7 +468,7 @@ class GetOSRequest:
468468
UUID of the OS you want to get.
469469
"""
470470

471-
zone: Optional[Zone]
471+
zone: Optional[ScwZone]
472472
"""
473473
Zone to target. If none is passed will use default zone from the config.
474474
"""
@@ -481,7 +481,7 @@ class GetServerRequest:
481481
UUID of the server you want to get.
482482
"""
483483

484-
zone: Optional[Zone]
484+
zone: Optional[ScwZone]
485485
"""
486486
Zone to target. If none is passed will use default zone from the config.
487487
"""
@@ -494,15 +494,15 @@ class GetServerTypeRequest:
494494
Server type identifier.
495495
"""
496496

497-
zone: Optional[Zone]
497+
zone: Optional[ScwZone]
498498
"""
499499
Zone to target. If none is passed will use default zone from the config.
500500
"""
501501

502502

503503
@dataclass
504504
class ListOSRequest:
505-
zone: Optional[Zone]
505+
zone: Optional[ScwZone]
506506
"""
507507
Zone to target. If none is passed will use default zone from the config.
508508
"""
@@ -550,7 +550,7 @@ class ListServerPrivateNetworksResponse:
550550

551551
@dataclass
552552
class ListServerTypesRequest:
553-
zone: Optional[Zone]
553+
zone: Optional[ScwZone]
554554
"""
555555
Zone to target. If none is passed will use default zone from the config.
556556
"""
@@ -566,7 +566,7 @@ class ListServerTypesResponse:
566566

567567
@dataclass
568568
class ListServersRequest:
569-
zone: Optional[Zone]
569+
zone: Optional[ScwZone]
570570
"""
571571
Zone to target. If none is passed will use default zone from the config.
572572
"""
@@ -622,7 +622,7 @@ class PrivateNetworkApiAddServerPrivateNetworkRequest:
622622
ID of the Private Network.
623623
"""
624624

625-
zone: Optional[Zone]
625+
zone: Optional[ScwZone]
626626
"""
627627
Zone to target. If none is passed will use default zone from the config.
628628
"""
@@ -645,7 +645,7 @@ class PrivateNetworkApiDeleteServerPrivateNetworkRequest:
645645
ID of the Private Network.
646646
"""
647647

648-
zone: Optional[Zone]
648+
zone: Optional[ScwZone]
649649
"""
650650
Zone to target. If none is passed will use default zone from the config.
651651
"""
@@ -657,15 +657,15 @@ class PrivateNetworkApiGetServerPrivateNetworkRequest:
657657

658658
private_network_id: str
659659

660-
zone: Optional[Zone]
660+
zone: Optional[ScwZone]
661661
"""
662662
Zone to target. If none is passed will use default zone from the config.
663663
"""
664664

665665

666666
@dataclass
667667
class PrivateNetworkApiListServerPrivateNetworksRequest:
668-
zone: Optional[Zone]
668+
zone: Optional[ScwZone]
669669
"""
670670
Zone to target. If none is passed will use default zone from the config.
671671
"""
@@ -723,7 +723,7 @@ class PrivateNetworkApiSetServerPrivateNetworksRequest:
723723
Object where the keys are the IDs of Private Networks and the values are arrays of IPAM IDs representing the IPs to assign to this Apple silicon server on the Private Network. If the array supplied for a Private Network is empty, the next available IP from the Private Network's CIDR block will automatically be used for attachment.
724724
"""
725725

726-
zone: Optional[Zone]
726+
zone: Optional[ScwZone]
727727
"""
728728
Zone to target. If none is passed will use default zone from the config.
729729
"""
@@ -736,7 +736,7 @@ class RebootServerRequest:
736736
UUID of the server you want to reboot.
737737
"""
738738

739-
zone: Optional[Zone]
739+
zone: Optional[ScwZone]
740740
"""
741741
Zone to target. If none is passed will use default zone from the config.
742742
"""
@@ -749,7 +749,7 @@ class ReinstallServerRequest:
749749
UUID of the server you want to reinstall.
750750
"""
751751

752-
zone: Optional[Zone]
752+
zone: Optional[ScwZone]
753753
"""
754754
Zone to target. If none is passed will use default zone from the config.
755755
"""
@@ -769,7 +769,7 @@ class SetServerPrivateNetworksResponse:
769769
class StartConnectivityDiagnosticRequest:
770770
server_id: str
771771

772-
zone: Optional[Zone]
772+
zone: Optional[ScwZone]
773773
"""
774774
Zone to target. If none is passed will use default zone from the config.
775775
"""
@@ -787,7 +787,7 @@ class UpdateServerRequest:
787787
UUID of the server you want to update.
788788
"""
789789

790-
zone: Optional[Zone]
790+
zone: Optional[ScwZone]
791791
"""
792792
Zone to target. If none is passed will use default zone from the config.
793793
"""

0 commit comments

Comments
 (0)