Skip to content

Commit 3b4b287

Browse files
authored
refactor(serverless_jobs): add new route to create secrets (#658)
1 parent 2eeda3e commit 3b4b287

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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,
104106
region=region,
105107
name=name or random_name(prefix="job"),
106108
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.name is not None:
338-
output["name"] = request.name
339-
340-
if request.local_storage_capacity is not None:
341-
output["local_storage_capacity"] = request.local_storage_capacity
342-
343337
if request.command is not None:
344338
output["command"] = request.command
345339

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

343+
if request.name is not None:
344+
output["name"] = request.name
345+
346+
if request.local_storage_capacity is not None:
347+
output["local_storage_capacity"] = request.local_storage_capacity
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,29 @@ class CreateJobDefinitionRequest:
170170
Image to use for the job.
171171
"""
172172

173-
region: Optional[Region]
173+
command: str
174174
"""
175-
Region to target. If none is passed will use default region from the config.
175+
Startup command. If empty or not defined, the image's default command is used.
176176
"""
177177

178-
name: Optional[str]
178+
description: str
179179
"""
180-
Name of the job definition.
180+
Description of the job.
181181
"""
182182

183-
local_storage_capacity: Optional[int]
183+
region: Optional[Region]
184184
"""
185-
Local storage capacity of the job (in MiB).
185+
Region to target. If none is passed will use default region from the config.
186186
"""
187187

188-
command: str
188+
name: Optional[str]
189189
"""
190-
Startup command. If empty or not defined, the image's default command is used.
190+
Name of the job definition.
191191
"""
192192

193-
description: str
193+
local_storage_capacity: Optional[int]
194194
"""
195-
Description of the job.
195+
Local storage capacity of the job (in MiB).
196196
"""
197197

198198
project_id: Optional[str]

scaleway/scaleway/jobs/v1alpha1/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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,
104106
region=region,
105107
name=name or random_name(prefix="job"),
106108
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.name is not None:
338-
output["name"] = request.name
339-
340-
if request.local_storage_capacity is not None:
341-
output["local_storage_capacity"] = request.local_storage_capacity
342-
343337
if request.command is not None:
344338
output["command"] = request.command
345339

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

343+
if request.name is not None:
344+
output["name"] = request.name
345+
346+
if request.local_storage_capacity is not None:
347+
output["local_storage_capacity"] = request.local_storage_capacity
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,29 @@ class CreateJobDefinitionRequest:
170170
Image to use for the job.
171171
"""
172172

173-
region: Optional[Region]
173+
command: str
174174
"""
175-
Region to target. If none is passed will use default region from the config.
175+
Startup command. If empty or not defined, the image's default command is used.
176176
"""
177177

178-
name: Optional[str]
178+
description: str
179179
"""
180-
Name of the job definition.
180+
Description of the job.
181181
"""
182182

183-
local_storage_capacity: Optional[int]
183+
region: Optional[Region]
184184
"""
185-
Local storage capacity of the job (in MiB).
185+
Region to target. If none is passed will use default region from the config.
186186
"""
187187

188-
command: str
188+
name: Optional[str]
189189
"""
190-
Startup command. If empty or not defined, the image's default command is used.
190+
Name of the job definition.
191191
"""
192192

193-
description: str
193+
local_storage_capacity: Optional[int]
194194
"""
195-
Description of the job.
195+
Local storage capacity of the job (in MiB).
196196
"""
197197

198198
project_id: Optional[str]

0 commit comments

Comments
 (0)