Skip to content

feat: update generated APIs #1912

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

Open
scaleway-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: update generated APIs #1912

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
4 changes: 4 additions & 0 deletions scaleway-async/scaleway_async/instance/v2alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from .types import ServerTypeGpuInfo
from .types import ServerTypeLimits
from .types import ServerIP
from .types import CreateTemplateRequestPrivateNetworkTemplate
from .types import CreateTemplateRequestVolumeTemplate
from .types import SecurityGroupRuleConfig
from .types import SecurityGroup
Expand All @@ -53,6 +54,7 @@
from .types import ServerRDPPassword
from .types import ServerVolume
from .types import UpdateServerRequestPublicNetworkInterface
from .types import UpdateTemplateRequestUpdatePrivateNetworks
from .types import UpdateTemplateRequestUpdateVolumes
from .types import AddSecurityGroupRulesRequest
from .types import AddSecurityGroupRulesResponse
Expand Down Expand Up @@ -165,6 +167,7 @@
"ServerTypeGpuInfo",
"ServerTypeLimits",
"ServerIP",
"CreateTemplateRequestPrivateNetworkTemplate",
"CreateTemplateRequestVolumeTemplate",
"SecurityGroupRuleConfig",
"SecurityGroup",
Expand All @@ -182,6 +185,7 @@
"ServerRDPPassword",
"ServerVolume",
"UpdateServerRequestPublicNetworkInterface",
"UpdateTemplateRequestUpdatePrivateNetworks",
"UpdateTemplateRequestUpdateVolumes",
"AddSecurityGroupRulesRequest",
"AddSecurityGroupRulesResponse",
Expand Down
18 changes: 12 additions & 6 deletions scaleway-async/scaleway_async/instance/v2alpha1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
CreateServerRequestPublicNetworkInterface,
CreateServerRequestServerVolume,
CreateTemplateRequest,
CreateTemplateRequestPrivateNetworkTemplate,
CreateTemplateRequestVolumeTemplate,
DeleteSecurityGroupRulesRequest,
DetachServerFileSystemRequest,
Expand Down Expand Up @@ -76,6 +77,7 @@
UpdateServerRequest,
UpdateServerRequestPublicNetworkInterface,
UpdateTemplateRequest,
UpdateTemplateRequestUpdatePrivateNetworks,
UpdateTemplateRequestUpdateVolumes,
UserData,
)
Expand Down Expand Up @@ -2341,7 +2343,9 @@ async def create_template(
security_group_id: Optional[str] = None,
placement_group_id: Optional[str] = None,
volumes: Optional[list[CreateTemplateRequestVolumeTemplate]] = None,
private_network_ids: Optional[list[str]] = None,
private_networks: Optional[
list[CreateTemplateRequestPrivateNetworkTemplate]
] = None,
windows_rdp_ssh_key_id: Optional[str] = None,
filesystem_ids: Optional[list[str]] = None,
) -> Template:
Expand All @@ -2359,7 +2363,7 @@ async def create_template(
:param security_group_id:
:param placement_group_id:
:param volumes:
:param private_network_ids:
:param private_networks:
:param windows_rdp_ssh_key_id:
:param filesystem_ids:
:return: :class:`Template <Template>`
Expand Down Expand Up @@ -2393,7 +2397,7 @@ async def create_template(
security_group_id=security_group_id,
placement_group_id=placement_group_id,
volumes=volumes,
private_network_ids=private_network_ids,
private_networks=private_networks,
windows_rdp_ssh_key_id=windows_rdp_ssh_key_id,
filesystem_ids=filesystem_ids,
),
Expand Down Expand Up @@ -2448,7 +2452,9 @@ async def update_template(
security_group_id: Optional[str] = None,
placement_group_id: Optional[str] = None,
update_volumes: Optional[UpdateTemplateRequestUpdateVolumes] = None,
private_network_ids: Optional[list[str]] = None,
update_private_networks: Optional[
UpdateTemplateRequestUpdatePrivateNetworks
] = None,
public_ip_v4_count: Optional[int] = None,
public_ip_v6_count: Optional[int] = None,
windows_rdp_ssh_key_id: Optional[str] = None,
Expand All @@ -2466,7 +2472,7 @@ async def update_template(
:param security_group_id:
:param placement_group_id:
:param update_volumes:
:param private_network_ids:
:param update_private_networks:
:param public_ip_v4_count:
:param public_ip_v6_count:
:param windows_rdp_ssh_key_id:
Expand Down Expand Up @@ -2498,7 +2504,7 @@ async def update_template(
security_group_id=security_group_id,
placement_group_id=placement_group_id,
update_volumes=update_volumes,
private_network_ids=private_network_ids,
update_private_networks=update_private_networks,
public_ip_v4_count=public_ip_v4_count,
public_ip_v6_count=public_ip_v6_count,
windows_rdp_ssh_key_id=windows_rdp_ssh_key_id,
Expand Down
79 changes: 66 additions & 13 deletions scaleway-async/scaleway_async/instance/v2alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
ServerRDPPassword,
ServerVolume,
Server,
CreateTemplateRequestPrivateNetworkTemplate,
CreateTemplateRequestVolumeTemplate,
Template,
UserData,
Expand Down Expand Up @@ -76,6 +77,7 @@
UpdateSecurityGroupRuleRequest,
UpdateServerRequestPublicNetworkInterface,
UpdateServerRequest,
UpdateTemplateRequestUpdatePrivateNetworks,
UpdateTemplateRequestUpdateVolumes,
UpdateTemplateRequest,
)
Expand Down Expand Up @@ -1026,12 +1028,6 @@ def unmarshal_TemplateSummary(data: Any) -> TemplateSummary:
else:
args["public_ip_v6_count"] = None

field = data.get("private_network_ids", None)
if field is not None:
args["private_network_ids"] = field
else:
args["private_network_ids"] = None

field = data.get("filesystem_ids", None)
if field is not None:
args["filesystem_ids"] = field
Expand Down Expand Up @@ -1525,6 +1521,25 @@ def unmarshal_Server(data: Any) -> Server:
return Server(**args)


def unmarshal_CreateTemplateRequestPrivateNetworkTemplate(
data: Any,
) -> CreateTemplateRequestPrivateNetworkTemplate:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'CreateTemplateRequestPrivateNetworkTemplate' failed as data isn't a dictionary."
)

args: dict[str, Any] = {}

field = data.get("private_network_id", None)
if field is not None:
args["private_network_id"] = field
else:
args["private_network_id"] = None

return CreateTemplateRequestPrivateNetworkTemplate(**args)


def unmarshal_CreateTemplateRequestVolumeTemplate(
data: Any,
) -> CreateTemplateRequestVolumeTemplate:
Expand Down Expand Up @@ -1658,11 +1673,15 @@ def unmarshal_Template(data: Any) -> Template:
else:
args["volumes"] = None

field = data.get("private_network_ids", None)
field = data.get("private_networks", None)
if field is not None:
args["private_network_ids"] = field
args["private_networks"] = (
[unmarshal_CreateTemplateRequestPrivateNetworkTemplate(v) for v in field]
if field is not None
else None
)
else:
args["private_network_ids"] = None
args["private_networks"] = None

field = data.get("filesystem_ids", None)
if field is not None:
Expand Down Expand Up @@ -2110,6 +2129,18 @@ def marshal_CreateServerRequest(
return output


def marshal_CreateTemplateRequestPrivateNetworkTemplate(
request: CreateTemplateRequestPrivateNetworkTemplate,
defaults: ProfileDefaults,
) -> dict[str, Any]:
output: dict[str, Any] = {}

if request.private_network_id is not None:
output["private_network_id"] = request.private_network_id

return output


def marshal_CreateTemplateRequestVolumeTemplate(
request: CreateTemplateRequestVolumeTemplate,
defaults: ProfileDefaults,
Expand Down Expand Up @@ -2189,8 +2220,11 @@ def marshal_CreateTemplateRequest(
for item in request.volumes
]

if request.private_network_ids is not None:
output["private_network_ids"] = request.private_network_ids
if request.private_networks is not None:
output["private_networks"] = [
marshal_CreateTemplateRequestPrivateNetworkTemplate(item, defaults)
for item in request.private_networks
]

if request.windows_rdp_ssh_key_id is not None:
output["windows_rdp_ssh_key_id"] = request.windows_rdp_ssh_key_id
Expand Down Expand Up @@ -2551,6 +2585,21 @@ def marshal_UpdateServerRequest(
return output


def marshal_UpdateTemplateRequestUpdatePrivateNetworks(
request: UpdateTemplateRequestUpdatePrivateNetworks,
defaults: ProfileDefaults,
) -> dict[str, Any]:
output: dict[str, Any] = {}

if request.private_networks is not None:
output["private_networks"] = [
marshal_CreateTemplateRequestPrivateNetworkTemplate(item, defaults)
for item in request.private_networks
]

return output


def marshal_UpdateTemplateRequestUpdateVolumes(
request: UpdateTemplateRequestUpdateVolumes,
defaults: ProfileDefaults,
Expand Down Expand Up @@ -2595,8 +2644,12 @@ def marshal_UpdateTemplateRequest(
request.update_volumes, defaults
)

if request.private_network_ids is not None:
output["private_network_ids"] = request.private_network_ids
if request.update_private_networks is not None:
output["update_private_networks"] = (
marshal_UpdateTemplateRequestUpdatePrivateNetworks(
request.update_private_networks, defaults
)
)

if request.public_ip_v4_count is not None:
output["public_ip_v4_count"] = request.public_ip_v4_count
Expand Down
19 changes: 15 additions & 4 deletions scaleway-async/scaleway_async/instance/v2alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ class ServerIP:
default: bool


@dataclass
class CreateTemplateRequestPrivateNetworkTemplate:
private_network_id: str


@dataclass
class CreateTemplateRequestVolumeTemplate:
volume_type: CreateServerRequestServerVolumeVolumeType
Expand Down Expand Up @@ -455,7 +460,6 @@ class TemplateSummary:
server_type: str
public_ip_v4_count: int
public_ip_v6_count: int
private_network_ids: list[str]
filesystem_ids: list[str]
zone: ScwZone
"""
Expand Down Expand Up @@ -510,6 +514,11 @@ class UpdateServerRequestPublicNetworkInterface:
security_group_id: Optional[str] = None


@dataclass
class UpdateTemplateRequestUpdatePrivateNetworks:
private_networks: list[CreateTemplateRequestPrivateNetworkTemplate]


@dataclass
class UpdateTemplateRequestUpdateVolumes:
volumes: list[CreateTemplateRequestVolumeTemplate]
Expand Down Expand Up @@ -682,7 +691,9 @@ class CreateTemplateRequest:
volumes: Optional[list[CreateTemplateRequestVolumeTemplate]] = field(
default_factory=list
)
private_network_ids: Optional[list[str]] = field(default_factory=list)
private_networks: Optional[list[CreateTemplateRequestPrivateNetworkTemplate]] = (
field(default_factory=list)
)
windows_rdp_ssh_key_id: Optional[str] = None
filesystem_ids: Optional[list[str]] = field(default_factory=list)

Expand Down Expand Up @@ -1264,7 +1275,7 @@ class Template:
public_ip_v4_count: int
public_ip_v6_count: int
volumes: list[CreateTemplateRequestVolumeTemplate]
private_network_ids: list[str]
private_networks: list[CreateTemplateRequestPrivateNetworkTemplate]
filesystem_ids: list[str]
zone: ScwZone
"""
Expand Down Expand Up @@ -1373,7 +1384,7 @@ class UpdateTemplateRequest:
security_group_id: Optional[str] = None
placement_group_id: Optional[str] = None
update_volumes: Optional[UpdateTemplateRequestUpdateVolumes] = None
private_network_ids: Optional[list[str]] = field(default_factory=list)
update_private_networks: Optional[UpdateTemplateRequestUpdatePrivateNetworks] = None
public_ip_v4_count: Optional[int] = None
public_ip_v6_count: Optional[int] = None
windows_rdp_ssh_key_id: Optional[str] = None
Expand Down
4 changes: 4 additions & 0 deletions scaleway/scaleway/instance/v2alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from .types import ServerTypeGpuInfo
from .types import ServerTypeLimits
from .types import ServerIP
from .types import CreateTemplateRequestPrivateNetworkTemplate
from .types import CreateTemplateRequestVolumeTemplate
from .types import SecurityGroupRuleConfig
from .types import SecurityGroup
Expand All @@ -53,6 +54,7 @@
from .types import ServerRDPPassword
from .types import ServerVolume
from .types import UpdateServerRequestPublicNetworkInterface
from .types import UpdateTemplateRequestUpdatePrivateNetworks
from .types import UpdateTemplateRequestUpdateVolumes
from .types import AddSecurityGroupRulesRequest
from .types import AddSecurityGroupRulesResponse
Expand Down Expand Up @@ -165,6 +167,7 @@
"ServerTypeGpuInfo",
"ServerTypeLimits",
"ServerIP",
"CreateTemplateRequestPrivateNetworkTemplate",
"CreateTemplateRequestVolumeTemplate",
"SecurityGroupRuleConfig",
"SecurityGroup",
Expand All @@ -182,6 +185,7 @@
"ServerRDPPassword",
"ServerVolume",
"UpdateServerRequestPublicNetworkInterface",
"UpdateTemplateRequestUpdatePrivateNetworks",
"UpdateTemplateRequestUpdateVolumes",
"AddSecurityGroupRulesRequest",
"AddSecurityGroupRulesResponse",
Expand Down
Loading
Loading