Skip to content

Commit 2950600

Browse files
feat(all): synchronize apis (#289)
Co-authored-by: Nathanael DEMACON <ndemacon@scaleway.com>
1 parent 8dd7457 commit 2950600

File tree

30 files changed

+882
-78
lines changed

30 files changed

+882
-78
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ def unmarshal_TokenScopes(data: Any) -> TokenScopes:
7272
field = data.get("query_metrics", None)
7373
args["query_metrics"] = field
7474

75+
field = data.get("query_traces", None)
76+
args["query_traces"] = field
77+
7578
field = data.get("setup_alerts", None)
7679
args["setup_alerts"] = field
7780

@@ -87,6 +90,9 @@ def unmarshal_TokenScopes(data: Any) -> TokenScopes:
8790
field = data.get("write_metrics", None)
8891
args["write_metrics"] = field
8992

93+
field = data.get("write_traces", None)
94+
args["write_traces"] = field
95+
9096
return TokenScopes(**args)
9197

9298

@@ -396,6 +402,9 @@ def marshal_TokenScopes(
396402
if request.query_metrics is not None:
397403
output["query_metrics"] = request.query_metrics
398404

405+
if request.query_traces is not None:
406+
output["query_traces"] = request.query_traces
407+
399408
if request.setup_alerts is not None:
400409
output["setup_alerts"] = request.setup_alerts
401410

@@ -411,6 +420,9 @@ def marshal_TokenScopes(
411420
if request.write_metrics is not None:
412421
output["write_metrics"] = request.write_metrics
413422

423+
if request.write_traces is not None:
424+
output["write_traces"] = request.write_traces
425+
414426
return output
415427

416428

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,22 @@ class TokenScopes:
407407

408408
setup_logs_rules: bool
409409
"""
410-
Permission to setup logs rules.
410+
Permission to set up logs rules.
411411
"""
412412

413413
setup_alerts: bool
414414
"""
415-
Permission to setup alerts.
415+
Permission to set up alerts.
416+
"""
417+
418+
query_traces: bool
419+
"""
420+
Permission to fetch traces.
421+
"""
422+
423+
write_traces: bool
424+
"""
425+
Permission to write traces.
416426
"""
417427

418428

scaleway-async/scaleway_async/domain/v2beta1/api.py

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This file was automatically generated. DO NOT EDIT.
22
# If you have any remark or suggestion do not hesitate to open an issue.
33

4+
from datetime import datetime
45
from typing import Awaitable, List, Optional, Union
56

67
from scaleway_core.api import API
@@ -173,12 +174,17 @@ async def list_dns_zones(
173174
self,
174175
*,
175176
domain: str,
176-
dns_zone: str,
177177
organization_id: Optional[str] = None,
178178
project_id: Optional[str] = None,
179179
order_by: ListDNSZonesRequestOrderBy = ListDNSZonesRequestOrderBy.DOMAIN_ASC,
180180
page: Optional[int] = None,
181181
page_size: Optional[int] = None,
182+
dns_zone: Optional[str] = None,
183+
dns_zones: Optional[List[str]] = None,
184+
created_after: Optional[datetime] = None,
185+
created_before: Optional[datetime] = None,
186+
updated_after: Optional[datetime] = None,
187+
updated_before: Optional[datetime] = None,
182188
) -> ListDNSZonesResponse:
183189
"""
184190
List DNS zones.
@@ -190,29 +196,36 @@ async def list_dns_zones(
190196
:param page_size: Maximum number of DNS zones to return per page.
191197
:param domain: Domain on which to filter the returned DNS zones.
192198
:param dns_zone: DNS zone on which to filter the returned DNS zones.
199+
:param dns_zones: DNS zones on which to filter the returned DNS zones.
200+
:param created_after: Only list DNS zones created after this date.
201+
:param created_before: Only list DNS zones created before this date.
202+
:param updated_after: Only list DNS zones updated after this date.
203+
:param updated_before: Only list DNS zones updated before this date.
193204
:return: :class:`ListDNSZonesResponse <ListDNSZonesResponse>`
194205
195206
Usage:
196207
::
197208
198-
result = await api.list_dns_zones(
199-
domain="example",
200-
dns_zone="example",
201-
)
209+
result = await api.list_dns_zones(domain="example")
202210
"""
203211

204212
res = self._request(
205213
"GET",
206214
"/domain/v2beta1/dns-zones",
207215
params={
216+
"created_after": created_after,
217+
"created_before": created_before,
208218
"dns_zone": dns_zone,
219+
"dns_zones": dns_zones,
209220
"domain": domain,
210221
"order_by": order_by,
211222
"organization_id": organization_id
212223
or self.client.default_organization_id,
213224
"page": page,
214225
"page_size": page_size or self.client.default_page_size,
215226
"project_id": project_id or self.client.default_project_id,
227+
"updated_after": updated_after,
228+
"updated_before": updated_before,
216229
},
217230
)
218231

@@ -223,12 +236,17 @@ async def list_dns_zones_all(
223236
self,
224237
*,
225238
domain: str,
226-
dns_zone: str,
227239
organization_id: Optional[str] = None,
228240
project_id: Optional[str] = None,
229241
order_by: Optional[ListDNSZonesRequestOrderBy] = None,
230242
page: Optional[int] = None,
231243
page_size: Optional[int] = None,
244+
dns_zone: Optional[str] = None,
245+
dns_zones: Optional[List[str]] = None,
246+
created_after: Optional[datetime] = None,
247+
created_before: Optional[datetime] = None,
248+
updated_after: Optional[datetime] = None,
249+
updated_before: Optional[datetime] = None,
232250
) -> List[DNSZone]:
233251
"""
234252
List DNS zones.
@@ -240,15 +258,17 @@ async def list_dns_zones_all(
240258
:param page_size: Maximum number of DNS zones to return per page.
241259
:param domain: Domain on which to filter the returned DNS zones.
242260
:param dns_zone: DNS zone on which to filter the returned DNS zones.
261+
:param dns_zones: DNS zones on which to filter the returned DNS zones.
262+
:param created_after: Only list DNS zones created after this date.
263+
:param created_before: Only list DNS zones created before this date.
264+
:param updated_after: Only list DNS zones updated after this date.
265+
:param updated_before: Only list DNS zones updated before this date.
243266
:return: :class:`List[ListDNSZonesResponse] <List[ListDNSZonesResponse]>`
244267
245268
Usage:
246269
::
247270
248-
result = await api.list_dns_zones_all(
249-
domain="example",
250-
dns_zone="example",
251-
)
271+
result = await api.list_dns_zones_all(domain="example")
252272
"""
253273

254274
return await fetch_all_pages_async(
@@ -257,12 +277,17 @@ async def list_dns_zones_all(
257277
fetcher=self.list_dns_zones,
258278
args={
259279
"domain": domain,
260-
"dns_zone": dns_zone,
261280
"organization_id": organization_id,
262281
"project_id": project_id,
263282
"order_by": order_by,
264283
"page": page,
265284
"page_size": page_size,
285+
"dns_zone": dns_zone,
286+
"dns_zones": dns_zones,
287+
"created_after": created_after,
288+
"created_before": created_before,
289+
"updated_after": updated_after,
290+
"updated_before": updated_before,
266291
},
267292
)
268293

scaleway-async/scaleway_async/domain/v2beta1/types.py

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@ class ListDNSZonesRequestOrderBy(str, Enum, metaclass=StrEnumMeta):
239239
DOMAIN_DESC = "domain_desc"
240240
SUBDOMAIN_ASC = "subdomain_asc"
241241
SUBDOMAIN_DESC = "subdomain_desc"
242+
CREATED_AT_ASC = "created_at_asc"
243+
CREATED_AT_DESC = "created_at_desc"
244+
UPDATED_AT_ASC = "updated_at_asc"
245+
UPDATED_AT_DESC = "updated_at_desc"
242246

243247
def __str__(self) -> str:
244248
return str(self.value)
@@ -1390,9 +1394,35 @@ class ListDNSZonesRequest:
13901394
Domain on which to filter the returned DNS zones.
13911395
"""
13921396

1393-
dns_zone: str
1397+
dns_zone: Optional[str]
13941398
"""
13951399
DNS zone on which to filter the returned DNS zones.
1400+
:deprecated
1401+
"""
1402+
1403+
dns_zones: Optional[List[str]]
1404+
"""
1405+
DNS zones on which to filter the returned DNS zones.
1406+
"""
1407+
1408+
created_after: Optional[datetime]
1409+
"""
1410+
Only list DNS zones created after this date.
1411+
"""
1412+
1413+
created_before: Optional[datetime]
1414+
"""
1415+
Only list DNS zones created before this date.
1416+
"""
1417+
1418+
updated_after: Optional[datetime]
1419+
"""
1420+
Only list DNS zones updated after this date.
1421+
"""
1422+
1423+
updated_before: Optional[datetime]
1424+
"""
1425+
Only list DNS zones updated before this date.
13961426
"""
13971427

13981428

scaleway-async/scaleway_async/instance/v1/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
from .types import ListSnapshotsResponse
6969
from .types import ListVolumesResponse
7070
from .types import ListVolumesTypesResponse
71+
from .types import MigrationPlan
7172
from .types import PlacementGroup
7273
from .types import PlacementGroupServer
7374
from .types import PrivateNIC
@@ -189,6 +190,7 @@
189190
"ListSnapshotsResponse",
190191
"ListVolumesResponse",
191192
"ListVolumesTypesResponse",
193+
"MigrationPlan",
192194
"PlacementGroup",
193195
"PlacementGroupServer",
194196
"PrivateNIC",

0 commit comments

Comments
 (0)