Skip to content

Commit 5f90d83

Browse files
authored
Merge branch 'main' into v1.5912.0
2 parents 20c2278 + 6859ae8 commit 5f90d83

File tree

32 files changed

+6924
-0
lines changed

32 files changed

+6924
-0
lines changed

scaleway-async/scaleway_async/applesilicon/v1alpha1/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from .types import ConnectivityDiagnosticActionType
44
from .types import ConnectivityDiagnosticDiagnosticStatus
55
from .types import ListServersRequestOrderBy
6+
from .types import ServerPrivateNetworkStatus
7+
from .content import SERVER_PRIVATE_NETWORK_TRANSIENT_STATUSES
68
from .types import ServerStatus
79
from .content import SERVER_TRANSIENT_STATUSES
810
from .types import ServerTypeStock
@@ -39,6 +41,8 @@
3941
"ConnectivityDiagnosticActionType",
4042
"ConnectivityDiagnosticDiagnosticStatus",
4143
"ListServersRequestOrderBy",
44+
"ServerPrivateNetworkStatus",
45+
"SERVER_PRIVATE_NETWORK_TRANSIENT_STATUSES",
4246
"ServerStatus",
4347
"SERVER_TRANSIENT_STATUSES",
4448
"ServerTypeStock",

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ async def create_server(
116116
self,
117117
*,
118118
type_: str,
119+
enable_vpc: bool,
119120
zone: Optional[Zone] = None,
120121
name: Optional[str] = None,
121122
project_id: Optional[str] = None,
@@ -125,6 +126,7 @@ async def create_server(
125126
Create a server.
126127
Create a new server in the targeted zone, specifying its configuration including name and type.
127128
:param type_: Create a server of the given type.
129+
:param enable_vpc: Activate the Private Network feature for this server. This feature is configured through the Apple Silicon - Private Networks API.
128130
:param zone: Zone to target. If none is passed will use default zone from the config.
129131
:param name: Create a server with this given name.
130132
:param project_id: Create a server in the given project ID.
@@ -136,6 +138,7 @@ async def create_server(
136138
137139
result = await api.create_server(
138140
type="example",
141+
enable_vpc=False,
139142
)
140143
"""
141144

@@ -147,6 +150,7 @@ async def create_server(
147150
body=marshal_CreateServerRequest(
148151
CreateServerRequest(
149152
type_=type_,
153+
enable_vpc=enable_vpc,
150154
zone=zone,
151155
name=name or random_name(prefix="as"),
152156
project_id=project_id,
@@ -432,6 +436,7 @@ async def update_server(
432436
zone: Optional[Zone] = None,
433437
name: Optional[str] = None,
434438
schedule_deletion: Optional[bool] = None,
439+
enable_vpc: Optional[bool] = None,
435440
) -> Server:
436441
"""
437442
Update a server.
@@ -440,6 +445,7 @@ async def update_server(
440445
:param zone: Zone to target. If none is passed will use default zone from the config.
441446
:param name: Updated name for your server.
442447
:param schedule_deletion: Specify whether the server should be flagged for automatic deletion.
448+
:param enable_vpc: Activate or deactivate Private Network support for this server.
443449
:return: :class:`Server <Server>`
444450
445451
Usage:
@@ -462,6 +468,7 @@ async def update_server(
462468
zone=zone,
463469
name=name,
464470
schedule_deletion=schedule_deletion,
471+
enable_vpc=enable_vpc,
465472
),
466473
self.client,
467474
),

scaleway-async/scaleway_async/applesilicon/v1alpha1/content.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
from typing import List
44

55
from .types import (
6+
ServerPrivateNetworkStatus,
67
ServerStatus,
78
)
89

10+
SERVER_PRIVATE_NETWORK_TRANSIENT_STATUSES: List[ServerPrivateNetworkStatus] = [
11+
ServerPrivateNetworkStatus.VPC_UPDATING,
12+
]
13+
"""
14+
Lists transient statutes of the enum :class:`ServerPrivateNetworkStatus <ServerPrivateNetworkStatus>`.
15+
"""
916
SERVER_TRANSIENT_STATUSES: List[ServerStatus] = [
1017
ServerStatus.STARTING,
1118
ServerStatus.REBOOTING,

scaleway-async/scaleway_async/applesilicon/v1alpha1/marshalling.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,10 @@ def unmarshal_Server(data: Any) -> Server:
291291
if field is not None:
292292
args["delivered"] = field
293293

294+
field = data.get("vpc_status", None)
295+
if field is not None:
296+
args["vpc_status"] = field
297+
294298
field = data.get("os", None)
295299
if field is not None:
296300
args["os"] = unmarshal_OS(field)
@@ -485,6 +489,9 @@ def marshal_CreateServerRequest(
485489
if request.type_ is not None:
486490
output["type"] = request.type_
487491

492+
if request.enable_vpc is not None:
493+
output["enable_vpc"] = request.enable_vpc
494+
488495
if request.name is not None:
489496
output["name"] = request.name
490497

@@ -533,4 +540,7 @@ def marshal_UpdateServerRequest(
533540
if request.schedule_deletion is not None:
534541
output["schedule_deletion"] = request.schedule_deletion
535542

543+
if request.enable_vpc is not None:
544+
output["enable_vpc"] = request.enable_vpc
545+
536546
return output

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ def __str__(self) -> str:
4141
return str(self.value)
4242

4343

44+
class ServerPrivateNetworkStatus(str, Enum, metaclass=StrEnumMeta):
45+
VPC_UNKNOWN_STATUS = "vpc_unknown_status"
46+
VPC_ENABLED = "vpc_enabled"
47+
VPC_UPDATING = "vpc_updating"
48+
VPC_DISABLED = "vpc_disabled"
49+
50+
def __str__(self) -> str:
51+
return str(self.value)
52+
53+
4454
class ServerStatus(str, Enum, metaclass=StrEnumMeta):
4555
UNKNOWN_STATUS = "unknown_status"
4656
STARTING = "starting"
@@ -284,6 +294,11 @@ class Server:
284294
Set to true once the server has completed its provisioning steps and is ready to use. Some OS configurations might require a reinstallation of the server before delivery depending on the available stock. A reinstallation after the initial delivery will not change this flag and can be tracked using the server status.
285295
"""
286296

297+
vpc_status: ServerPrivateNetworkStatus
298+
"""
299+
Activation status of optional Private Network feature support for this server.
300+
"""
301+
287302
os: Optional[OS]
288303
"""
289304
Initially installed OS, this does not necessarily reflect the current OS version.
@@ -327,6 +342,11 @@ class CreateServerRequest:
327342
Create a server of the given type.
328343
"""
329344

345+
enable_vpc: bool
346+
"""
347+
Activate the Private Network feature for this server. This feature is configured through the Apple Silicon - Private Networks API.
348+
"""
349+
330350
zone: Optional[Zone]
331351
"""
332352
Zone to target. If none is passed will use default zone from the config.
@@ -580,3 +600,8 @@ class UpdateServerRequest:
580600
"""
581601
Specify whether the server should be flagged for automatic deletion.
582602
"""
603+
604+
enable_vpc: Optional[bool]
605+
"""
606+
Activate or deactivate Private Network support for this server.
607+
"""

scaleway-async/scaleway_async/secret/v1beta1/marshalling.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ def unmarshal_SecretVersion(data: Any) -> SecretVersion:
9292
else:
9393
args["updated_at"] = None
9494

95+
field = data.get("deleted_at", None)
96+
if field is not None:
97+
args["deleted_at"] = parser.isoparse(field) if isinstance(field, str) else field
98+
else:
99+
args["deleted_at"] = None
100+
95101
field = data.get("description", None)
96102
if field is not None:
97103
args["description"] = field

scaleway-async/scaleway_async/secret/v1beta1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ class SecretVersion:
192192
Last update of the version.
193193
"""
194194

195+
deleted_at: Optional[datetime]
196+
"""
197+
Date and time of the version's deletion.
198+
"""
199+
195200
description: Optional[str]
196201
"""
197202
Description of the version.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# This file was automatically generated. DO NOT EDIT.
2+
# If you have any remark or suggestion do not hesitate to open an issue.
3+
from .types import GatewayNetworkStatus
4+
from .content import GATEWAY_NETWORK_TRANSIENT_STATUSES
5+
from .types import GatewayStatus
6+
from .content import GATEWAY_TRANSIENT_STATUSES
7+
from .types import ListGatewayNetworksRequestOrderBy
8+
from .types import ListGatewaysRequestOrderBy
9+
from .types import ListIPsRequestOrderBy
10+
from .types import ListPatRulesRequestOrderBy
11+
from .types import PatRuleProtocol
12+
from .types import GatewayNetwork
13+
from .types import IP
14+
from .types import GatewayType
15+
from .types import Gateway
16+
from .types import PatRule
17+
from .types import SetPatRulesRequestRule
18+
from .types import CreateGatewayNetworkRequest
19+
from .types import CreateGatewayRequest
20+
from .types import CreateIPRequest
21+
from .types import CreatePatRuleRequest
22+
from .types import DeleteGatewayNetworkRequest
23+
from .types import DeleteGatewayRequest
24+
from .types import DeleteIPRequest
25+
from .types import DeletePatRuleRequest
26+
from .types import GetGatewayNetworkRequest
27+
from .types import GetGatewayRequest
28+
from .types import GetIPRequest
29+
from .types import GetPatRuleRequest
30+
from .types import ListGatewayNetworksRequest
31+
from .types import ListGatewayNetworksResponse
32+
from .types import ListGatewayTypesRequest
33+
from .types import ListGatewayTypesResponse
34+
from .types import ListGatewaysRequest
35+
from .types import ListGatewaysResponse
36+
from .types import ListIPsRequest
37+
from .types import ListIPsResponse
38+
from .types import ListPatRulesRequest
39+
from .types import ListPatRulesResponse
40+
from .types import RefreshSSHKeysRequest
41+
from .types import SetPatRulesRequest
42+
from .types import SetPatRulesResponse
43+
from .types import UpdateGatewayNetworkRequest
44+
from .types import UpdateGatewayRequest
45+
from .types import UpdateIPRequest
46+
from .types import UpdatePatRuleRequest
47+
from .types import UpgradeGatewayRequest
48+
from .api import VpcgwV2API
49+
50+
__all__ = [
51+
"GatewayNetworkStatus",
52+
"GATEWAY_NETWORK_TRANSIENT_STATUSES",
53+
"GatewayStatus",
54+
"GATEWAY_TRANSIENT_STATUSES",
55+
"ListGatewayNetworksRequestOrderBy",
56+
"ListGatewaysRequestOrderBy",
57+
"ListIPsRequestOrderBy",
58+
"ListPatRulesRequestOrderBy",
59+
"PatRuleProtocol",
60+
"GatewayNetwork",
61+
"IP",
62+
"GatewayType",
63+
"Gateway",
64+
"PatRule",
65+
"SetPatRulesRequestRule",
66+
"CreateGatewayNetworkRequest",
67+
"CreateGatewayRequest",
68+
"CreateIPRequest",
69+
"CreatePatRuleRequest",
70+
"DeleteGatewayNetworkRequest",
71+
"DeleteGatewayRequest",
72+
"DeleteIPRequest",
73+
"DeletePatRuleRequest",
74+
"GetGatewayNetworkRequest",
75+
"GetGatewayRequest",
76+
"GetIPRequest",
77+
"GetPatRuleRequest",
78+
"ListGatewayNetworksRequest",
79+
"ListGatewayNetworksResponse",
80+
"ListGatewayTypesRequest",
81+
"ListGatewayTypesResponse",
82+
"ListGatewaysRequest",
83+
"ListGatewaysResponse",
84+
"ListIPsRequest",
85+
"ListIPsResponse",
86+
"ListPatRulesRequest",
87+
"ListPatRulesResponse",
88+
"RefreshSSHKeysRequest",
89+
"SetPatRulesRequest",
90+
"SetPatRulesResponse",
91+
"UpdateGatewayNetworkRequest",
92+
"UpdateGatewayRequest",
93+
"UpdateIPRequest",
94+
"UpdatePatRuleRequest",
95+
"UpgradeGatewayRequest",
96+
"VpcgwV2API",
97+
]

0 commit comments

Comments
 (0)