Skip to content

Commit 6fe996f

Browse files
authored
feat(secret_manager): add secret type to browse secret request (#594)
1 parent 4b1a765 commit 6fe996f

File tree

10 files changed

+60
-38
lines changed

10 files changed

+60
-38
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ async def create_job_definition(
7474
:param project_id: UUID of the Scaleway Project containing the job.
7575
:param environment_variables: Environment variables of the job.
7676
:param job_timeout: Timeout of the job in seconds.
77-
:param cron_schedule:
77+
:param cron_schedule: Configure a cron for the job.
7878
:return: :class:`JobDefinition <JobDefinition>`
7979
8080
Usage:
@@ -101,11 +101,11 @@ async def create_job_definition(
101101
cpu_limit=cpu_limit,
102102
memory_limit=memory_limit,
103103
image_uri=image_uri,
104-
command=command,
105-
description=description,
106104
region=region,
107105
name=name or random_name(prefix="job"),
108106
local_storage_capacity=local_storage_capacity,
107+
command=command,
108+
description=description,
109109
project_id=project_id,
110110
environment_variables=environment_variables,
111111
job_timeout=job_timeout,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,18 +334,18 @@ def marshal_CreateJobDefinitionRequest(
334334
if request.image_uri is not None:
335335
output["image_uri"] = request.image_uri
336336

337-
if request.command is not None:
338-
output["command"] = request.command
339-
340-
if request.description is not None:
341-
output["description"] = request.description
342-
343337
if request.name is not None:
344338
output["name"] = request.name
345339

346340
if request.local_storage_capacity is not None:
347341
output["local_storage_capacity"] = request.local_storage_capacity
348342

343+
if request.command is not None:
344+
output["command"] = request.command
345+
346+
if request.description is not None:
347+
output["description"] = request.description
348+
349349
if request.project_id is not None:
350350
output["project_id"] = request.project_id or defaults.default_project_id
351351

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,6 @@ class CreateJobDefinitionRequest:
170170
Image to use for the job.
171171
"""
172172

173-
command: str
174-
"""
175-
Startup command. If empty or not defined, the image's default command is used.
176-
"""
177-
178-
description: str
179-
"""
180-
Description of the job.
181-
"""
182-
183173
region: Optional[Region]
184174
"""
185175
Region to target. If none is passed will use default region from the config.
@@ -195,6 +185,16 @@ class CreateJobDefinitionRequest:
195185
Local storage capacity of the job (in MiB).
196186
"""
197187

188+
command: str
189+
"""
190+
Startup command. If empty or not defined, the image's default command is used.
191+
"""
192+
193+
description: str
194+
"""
195+
Description of the job.
196+
"""
197+
198198
project_id: Optional[str]
199199
"""
200200
UUID of the Scaleway Project containing the job.
@@ -211,6 +211,9 @@ class CreateJobDefinitionRequest:
211211
"""
212212

213213
cron_schedule: Optional[CreateJobDefinitionRequestCronScheduleConfig]
214+
"""
215+
Configure a cron for the job.
216+
"""
214217

215218

216219
@dataclass

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ async def browse_secrets(
367367
page: Optional[int] = None,
368368
page_size: Optional[int] = None,
369369
tags: Optional[List[str]] = None,
370+
type_: Optional[SecretType] = None,
370371
) -> BrowseSecretsResponse:
371372
"""
372373
Browse secrets.
@@ -378,6 +379,7 @@ async def browse_secrets(
378379
:param page:
379380
:param page_size:
380381
:param tags: Filter secrets by tags.
382+
:param type_: Filter by secret type (optional).
381383
:return: :class:`BrowseSecretsResponse <BrowseSecretsResponse>`
382384
383385
Usage:
@@ -402,6 +404,7 @@ async def browse_secrets(
402404
"prefix": prefix,
403405
"project_id": project_id or self.client.default_project_id,
404406
"tags": tags,
407+
"type": type_,
405408
},
406409
)
407410

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,11 @@ class BrowseSecretsRequest:
421421
Filter secrets by tags.
422422
"""
423423

424+
type_: Optional[SecretType]
425+
"""
426+
Filter by secret type (optional).
427+
"""
428+
424429

425430
@dataclass
426431
class BrowseSecretsResponse:

scaleway/scaleway/jobs/v1alpha1/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def create_job_definition(
7474
:param project_id: UUID of the Scaleway Project containing the job.
7575
:param environment_variables: Environment variables of the job.
7676
:param job_timeout: Timeout of the job in seconds.
77-
:param cron_schedule:
77+
:param cron_schedule: Configure a cron for the job.
7878
:return: :class:`JobDefinition <JobDefinition>`
7979
8080
Usage:
@@ -101,11 +101,11 @@ def create_job_definition(
101101
cpu_limit=cpu_limit,
102102
memory_limit=memory_limit,
103103
image_uri=image_uri,
104-
command=command,
105-
description=description,
106104
region=region,
107105
name=name or random_name(prefix="job"),
108106
local_storage_capacity=local_storage_capacity,
107+
command=command,
108+
description=description,
109109
project_id=project_id,
110110
environment_variables=environment_variables,
111111
job_timeout=job_timeout,

scaleway/scaleway/jobs/v1alpha1/marshalling.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,18 +334,18 @@ def marshal_CreateJobDefinitionRequest(
334334
if request.image_uri is not None:
335335
output["image_uri"] = request.image_uri
336336

337-
if request.command is not None:
338-
output["command"] = request.command
339-
340-
if request.description is not None:
341-
output["description"] = request.description
342-
343337
if request.name is not None:
344338
output["name"] = request.name
345339

346340
if request.local_storage_capacity is not None:
347341
output["local_storage_capacity"] = request.local_storage_capacity
348342

343+
if request.command is not None:
344+
output["command"] = request.command
345+
346+
if request.description is not None:
347+
output["description"] = request.description
348+
349349
if request.project_id is not None:
350350
output["project_id"] = request.project_id or defaults.default_project_id
351351

scaleway/scaleway/jobs/v1alpha1/types.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,6 @@ class CreateJobDefinitionRequest:
170170
Image to use for the job.
171171
"""
172172

173-
command: str
174-
"""
175-
Startup command. If empty or not defined, the image's default command is used.
176-
"""
177-
178-
description: str
179-
"""
180-
Description of the job.
181-
"""
182-
183173
region: Optional[Region]
184174
"""
185175
Region to target. If none is passed will use default region from the config.
@@ -195,6 +185,16 @@ class CreateJobDefinitionRequest:
195185
Local storage capacity of the job (in MiB).
196186
"""
197187

188+
command: str
189+
"""
190+
Startup command. If empty or not defined, the image's default command is used.
191+
"""
192+
193+
description: str
194+
"""
195+
Description of the job.
196+
"""
197+
198198
project_id: Optional[str]
199199
"""
200200
UUID of the Scaleway Project containing the job.
@@ -211,6 +211,9 @@ class CreateJobDefinitionRequest:
211211
"""
212212

213213
cron_schedule: Optional[CreateJobDefinitionRequestCronScheduleConfig]
214+
"""
215+
Configure a cron for the job.
216+
"""
214217

215218

216219
@dataclass

scaleway/scaleway/secret/v1beta1/api.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ def browse_secrets(
367367
page: Optional[int] = None,
368368
page_size: Optional[int] = None,
369369
tags: Optional[List[str]] = None,
370+
type_: Optional[SecretType] = None,
370371
) -> BrowseSecretsResponse:
371372
"""
372373
Browse secrets.
@@ -378,6 +379,7 @@ def browse_secrets(
378379
:param page:
379380
:param page_size:
380381
:param tags: Filter secrets by tags.
382+
:param type_: Filter by secret type (optional).
381383
:return: :class:`BrowseSecretsResponse <BrowseSecretsResponse>`
382384
383385
Usage:
@@ -402,6 +404,7 @@ def browse_secrets(
402404
"prefix": prefix,
403405
"project_id": project_id or self.client.default_project_id,
404406
"tags": tags,
407+
"type": type_,
405408
},
406409
)
407410

scaleway/scaleway/secret/v1beta1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,11 @@ class BrowseSecretsRequest:
421421
Filter secrets by tags.
422422
"""
423423

424+
type_: Optional[SecretType]
425+
"""
426+
Filter by secret type (optional).
427+
"""
428+
424429

425430
@dataclass
426431
class BrowseSecretsResponse:

0 commit comments

Comments
 (0)