Skip to content

Commit

Permalink
fix: add prefix to Zone and Region import (#832)
Browse files Browse the repository at this point in the history
  • Loading branch information
@scaleway-bot
scaleway-bot authored Jan 15, 2025
1 parent 4e6bf2e commit 30b5df8
Show file tree
Hide file tree
Showing 132 changed files with 4,142 additions and 4,140 deletions.
48 changes: 24 additions & 24 deletions scaleway-async/scaleway_async/applesilicon/v1alpha1/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from scaleway_core.api import API
from scaleway_core.bridge import (
Zone,
Zone as ScwZone,
)
from scaleway_core.utils import (
WaitForOptions,
Expand Down Expand Up @@ -68,7 +68,7 @@ class ApplesiliconV1Alpha1API(API):
async def list_server_types(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> ListServerTypesResponse:
"""
List server types.
Expand Down Expand Up @@ -96,7 +96,7 @@ async def get_server_type(
self,
*,
server_type: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> ServerType:
"""
Get a server type.
Expand Down Expand Up @@ -129,7 +129,7 @@ async def create_server(
*,
type_: str,
enable_vpc: bool,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
name: Optional[str] = None,
project_id: Optional[str] = None,
os_id: Optional[str] = None,
Expand Down Expand Up @@ -178,7 +178,7 @@ async def create_server(
async def list_servers(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
order_by: Optional[ListServersRequestOrderBy] = None,
project_id: Optional[str] = None,
organization_id: Optional[str] = None,
Expand Down Expand Up @@ -223,7 +223,7 @@ async def list_servers(
async def list_servers_all(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
order_by: Optional[ListServersRequestOrderBy] = None,
project_id: Optional[str] = None,
organization_id: Optional[str] = None,
Expand Down Expand Up @@ -264,7 +264,7 @@ async def list_servers_all(
async def list_os(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
server_type: Optional[str] = None,
Expand Down Expand Up @@ -305,7 +305,7 @@ async def list_os(
async def list_os_all(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
server_type: Optional[str] = None,
Expand Down Expand Up @@ -344,7 +344,7 @@ async def get_os(
self,
*,
os_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> OS:
"""
Get an Operating System (OS).
Expand Down Expand Up @@ -376,7 +376,7 @@ async def get_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> Server:
"""
Get a server.
Expand Down Expand Up @@ -408,7 +408,7 @@ async def wait_for_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
options: Optional[WaitForOptions[Server, Union[bool, Awaitable[bool]]]] = None,
) -> Server:
"""
Expand Down Expand Up @@ -445,7 +445,7 @@ async def update_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
name: Optional[str] = None,
schedule_deletion: Optional[bool] = None,
enable_vpc: Optional[bool] = None,
Expand Down Expand Up @@ -493,7 +493,7 @@ async def delete_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> None:
"""
Delete a server.
Expand Down Expand Up @@ -523,7 +523,7 @@ async def reboot_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> Server:
"""
Reboot a server.
Expand Down Expand Up @@ -556,7 +556,7 @@ async def reinstall_server(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
os_id: Optional[str] = None,
) -> Server:
"""
Expand Down Expand Up @@ -598,7 +598,7 @@ async def start_connectivity_diagnostic(
self,
*,
server_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> StartConnectivityDiagnosticResponse:
"""
:param server_id:
Expand Down Expand Up @@ -634,7 +634,7 @@ async def get_connectivity_diagnostic(
self,
*,
diagnostic_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> ConnectivityDiagnostic:
"""
:param diagnostic_id:
Expand Down Expand Up @@ -671,7 +671,7 @@ async def get_server_private_network(
*,
server_id: str,
private_network_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> ServerPrivateNetwork:
"""
:param server_id:
Expand Down Expand Up @@ -707,7 +707,7 @@ async def wait_for_server_private_network(
*,
server_id: str,
private_network_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
options: Optional[
WaitForOptions[ServerPrivateNetwork, Union[bool, Awaitable[bool]]]
] = None,
Expand Down Expand Up @@ -751,7 +751,7 @@ async def add_server_private_network(
*,
server_id: str,
private_network_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
ipam_ip_ids: Optional[List[str]] = None,
) -> ServerPrivateNetwork:
"""
Expand Down Expand Up @@ -797,7 +797,7 @@ async def set_server_private_networks(
*,
server_id: str,
per_private_network_ipam_ip_ids: Dict[str, List[str]],
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> SetServerPrivateNetworksResponse:
"""
Set multiple Private Networks on a server.
Expand Down Expand Up @@ -838,7 +838,7 @@ async def set_server_private_networks(
async def list_server_private_networks(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
order_by: Optional[ListServerPrivateNetworksRequestOrderBy] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
Expand Down Expand Up @@ -892,7 +892,7 @@ async def list_server_private_networks(
async def list_server_private_networks_all(
self,
*,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
order_by: Optional[ListServerPrivateNetworksRequestOrderBy] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
Expand Down Expand Up @@ -944,7 +944,7 @@ async def delete_server_private_network(
*,
server_id: str,
private_network_id: str,
zone: Optional[Zone] = None,
zone: Optional[ScwZone] = None,
) -> None:
"""
Delete a Private Network.
Expand Down
40 changes: 20 additions & 20 deletions scaleway-async/scaleway_async/applesilicon/v1alpha1/types.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from typing import Dict, List, Optional

from scaleway_core.bridge import (
Zone,
Zone as ScwZone,
)
from scaleway_core.utils import (
StrEnumMeta,
Expand Down Expand Up @@ -354,7 +354,7 @@ class Server:
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.
"""

zone: Zone
zone: ScwZone
"""
Zone of the server.
"""
Expand Down Expand Up @@ -417,7 +417,7 @@ class CreateServerRequest:
Activate the Private Network feature for this server. This feature is configured through the Apple Silicon - Private Networks API.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand Down Expand Up @@ -445,7 +445,7 @@ class DeleteServerRequest:
UUID of the server you want to delete.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -455,7 +455,7 @@ class DeleteServerRequest:
class GetConnectivityDiagnosticRequest:
diagnostic_id: str

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -468,7 +468,7 @@ class GetOSRequest:
UUID of the OS you want to get.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -481,7 +481,7 @@ class GetServerRequest:
UUID of the server you want to get.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -494,15 +494,15 @@ class GetServerTypeRequest:
Server type identifier.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""


@dataclass
class ListOSRequest:
zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand Down Expand Up @@ -550,7 +550,7 @@ class ListServerPrivateNetworksResponse:

@dataclass
class ListServerTypesRequest:
zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -566,7 +566,7 @@ class ListServerTypesResponse:

@dataclass
class ListServersRequest:
zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand Down Expand Up @@ -622,7 +622,7 @@ class PrivateNetworkApiAddServerPrivateNetworkRequest:
ID of the Private Network.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -645,7 +645,7 @@ class PrivateNetworkApiDeleteServerPrivateNetworkRequest:
ID of the Private Network.
"""

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

private_network_id: str

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""


@dataclass
class PrivateNetworkApiListServerPrivateNetworksRequest:
zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand Down Expand Up @@ -723,7 +723,7 @@ class PrivateNetworkApiSetServerPrivateNetworksRequest:
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.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -736,7 +736,7 @@ class RebootServerRequest:
UUID of the server you want to reboot.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -749,7 +749,7 @@ class ReinstallServerRequest:
UUID of the server you want to reinstall.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -769,7 +769,7 @@ class SetServerPrivateNetworksResponse:
class StartConnectivityDiagnosticRequest:
server_id: str

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand All @@ -787,7 +787,7 @@ class UpdateServerRequest:
UUID of the server you want to update.
"""

zone: Optional[Zone]
zone: Optional[ScwZone]
"""
Zone to target. If none is passed will use default zone from the config.
"""
Expand Down
Loading

0 comments on commit 30b5df8

Please sign in to comment.