Skip to content

Commit 100860f

Browse files
scaleway-botLaure-di
scaleway-bot
and
Laure-di
authored
feat(serverless): add timestamps to function resources (#720)
Co-authored-by: Laure-di <[email protected]>
1 parent 83f13b7 commit 100860f

File tree

4 files changed

+118
-52
lines changed

4 files changed

+118
-52
lines changed

‎scaleway-async/scaleway_async/function/v1beta1/marshalling.py‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,30 @@ def unmarshal_Function(data: Any) -> Function:
209209
else None
210210
)
211211

212+
field = data.get("timeout", None)
213+
if field is not None:
214+
args["timeout"] = field
215+
else:
216+
args["timeout"] = None
217+
218+
field = data.get("error_message", None)
219+
if field is not None:
220+
args["error_message"] = field
221+
else:
222+
args["error_message"] = None
223+
224+
field = data.get("build_message", None)
225+
if field is not None:
226+
args["build_message"] = field
227+
else:
228+
args["build_message"] = None
229+
230+
field = data.get("description", None)
231+
if field is not None:
232+
args["description"] = field
233+
else:
234+
args["description"] = None
235+
212236
field = data.get("region", None)
213237
if field is not None:
214238
args["region"] = field
@@ -225,29 +249,23 @@ def unmarshal_Function(data: Any) -> Function:
225249
if field is not None:
226250
args["sandbox"] = field
227251

228-
field = data.get("timeout", None)
252+
field = data.get("created_at", None)
229253
if field is not None:
230-
args["timeout"] = field
254+
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
231255
else:
232-
args["timeout"] = None
256+
args["created_at"] = None
233257

234-
field = data.get("error_message", None)
258+
field = data.get("updated_at", None)
235259
if field is not None:
236-
args["error_message"] = field
260+
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
237261
else:
238-
args["error_message"] = None
262+
args["updated_at"] = None
239263

240-
field = data.get("build_message", None)
264+
field = data.get("ready_at", None)
241265
if field is not None:
242-
args["build_message"] = field
266+
args["ready_at"] = parser.isoparse(field) if isinstance(field, str) else field
243267
else:
244-
args["build_message"] = None
245-
246-
field = data.get("description", None)
247-
if field is not None:
248-
args["description"] = field
249-
else:
250-
args["description"] = None
268+
args["ready_at"] = None
251269

252270
return Function(**args)
253271

‎scaleway-async/scaleway_async/function/v1beta1/types.py‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,26 @@ class Function:
519519
Secret environment variables of the function.
520520
"""
521521

522+
timeout: Optional[str]
523+
"""
524+
Request processing time limit for the function.
525+
"""
526+
527+
error_message: Optional[str]
528+
"""
529+
Error message if the function is in "error" state.
530+
"""
531+
532+
build_message: Optional[str]
533+
"""
534+
Description of the current build step.
535+
"""
536+
537+
description: Optional[str]
538+
"""
539+
Description of the function.
540+
"""
541+
522542
region: Region
523543
"""
524544
Region in which the function is deployed.
@@ -538,24 +558,19 @@ class Function:
538558
Execution environment of the function.
539559
"""
540560

541-
timeout: Optional[str]
561+
created_at: Optional[datetime]
542562
"""
543-
Request processing time limit for the function.
563+
Creation date of the function.
544564
"""
545565

546-
error_message: Optional[str]
566+
updated_at: Optional[datetime]
547567
"""
548-
Error message if the function is in "error" state.
568+
Last update date of the function.
549569
"""
550570

551-
build_message: Optional[str]
552-
"""
553-
Description of the current build step.
571+
ready_at: Optional[datetime]
554572
"""
555-
556-
description: Optional[str]
557-
"""
558-
Description of the function.
573+
Last date when the function was successfully deployed and set to ready.
559574
"""
560575

561576

‎scaleway/scaleway/function/v1beta1/marshalling.py‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,30 @@ def unmarshal_Function(data: Any) -> Function:
209209
else None
210210
)
211211

212+
field = data.get("timeout", None)
213+
if field is not None:
214+
args["timeout"] = field
215+
else:
216+
args["timeout"] = None
217+
218+
field = data.get("error_message", None)
219+
if field is not None:
220+
args["error_message"] = field
221+
else:
222+
args["error_message"] = None
223+
224+
field = data.get("build_message", None)
225+
if field is not None:
226+
args["build_message"] = field
227+
else:
228+
args["build_message"] = None
229+
230+
field = data.get("description", None)
231+
if field is not None:
232+
args["description"] = field
233+
else:
234+
args["description"] = None
235+
212236
field = data.get("region", None)
213237
if field is not None:
214238
args["region"] = field
@@ -225,29 +249,23 @@ def unmarshal_Function(data: Any) -> Function:
225249
if field is not None:
226250
args["sandbox"] = field
227251

228-
field = data.get("timeout", None)
252+
field = data.get("created_at", None)
229253
if field is not None:
230-
args["timeout"] = field
254+
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
231255
else:
232-
args["timeout"] = None
256+
args["created_at"] = None
233257

234-
field = data.get("error_message", None)
258+
field = data.get("updated_at", None)
235259
if field is not None:
236-
args["error_message"] = field
260+
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
237261
else:
238-
args["error_message"] = None
262+
args["updated_at"] = None
239263

240-
field = data.get("build_message", None)
264+
field = data.get("ready_at", None)
241265
if field is not None:
242-
args["build_message"] = field
266+
args["ready_at"] = parser.isoparse(field) if isinstance(field, str) else field
243267
else:
244-
args["build_message"] = None
245-
246-
field = data.get("description", None)
247-
if field is not None:
248-
args["description"] = field
249-
else:
250-
args["description"] = None
268+
args["ready_at"] = None
251269

252270
return Function(**args)
253271

‎scaleway/scaleway/function/v1beta1/types.py‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,26 @@ class Function:
519519
Secret environment variables of the function.
520520
"""
521521

522+
timeout: Optional[str]
523+
"""
524+
Request processing time limit for the function.
525+
"""
526+
527+
error_message: Optional[str]
528+
"""
529+
Error message if the function is in "error" state.
530+
"""
531+
532+
build_message: Optional[str]
533+
"""
534+
Description of the current build step.
535+
"""
536+
537+
description: Optional[str]
538+
"""
539+
Description of the function.
540+
"""
541+
522542
region: Region
523543
"""
524544
Region in which the function is deployed.
@@ -538,24 +558,19 @@ class Function:
538558
Execution environment of the function.
539559
"""
540560

541-
timeout: Optional[str]
561+
created_at: Optional[datetime]
542562
"""
543-
Request processing time limit for the function.
563+
Creation date of the function.
544564
"""
545565

546-
error_message: Optional[str]
566+
updated_at: Optional[datetime]
547567
"""
548-
Error message if the function is in "error" state.
568+
Last update date of the function.
549569
"""
550570

551-
build_message: Optional[str]
552-
"""
553-
Description of the current build step.
571+
ready_at: Optional[datetime]
554572
"""
555-
556-
description: Optional[str]
557-
"""
558-
Description of the function.
573+
Last date when the function was successfully deployed and set to ready.
559574
"""
560575

561576

0 commit comments

Comments
 (0)