From 596e6b89333de870aa3a0f094e52cf0730d90318 Mon Sep 17 00:00:00 2001 From: Scaleway Bot Date: Fri, 29 Mar 2024 16:29:09 +0100 Subject: [PATCH] feat(serverless_jobs): add started_at in JobRun (#470) --- .../jobs/v1alpha1/marshalling.py | 28 +++++++++++-------- .../scaleway_async/jobs/v1alpha1/types.py | 20 +++++++------ .../scaleway/jobs/v1alpha1/marshalling.py | 28 +++++++++++-------- scaleway/scaleway/jobs/v1alpha1/types.py | 20 +++++++------ 4 files changed, 54 insertions(+), 42 deletions(-) diff --git a/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py index 2a83e09c..ecb70454 100644 --- a/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py @@ -146,18 +146,6 @@ def unmarshal_JobRun(data: Any) -> JobRun: if field is not None: args["command"] = field - field = data.get("environment_variables", None) - if field is not None: - args["environment_variables"] = field - - field = data.get("local_storage_capacity", None) - if field is not None: - args["local_storage_capacity"] = field - - field = data.get("region", None) - if field is not None: - args["region"] = field - field = data.get("created_at", None) if field is not None: args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field @@ -180,6 +168,22 @@ def unmarshal_JobRun(data: Any) -> JobRun: if field is not None: args["run_duration"] = field + field = data.get("environment_variables", None) + if field is not None: + args["environment_variables"] = field + + field = data.get("local_storage_capacity", None) + if field is not None: + args["local_storage_capacity"] = field + + field = data.get("region", None) + if field is not None: + args["region"] = field + + field = data.get("started_at", None) + if field is not None: + args["started_at"] = parser.isoparse(field) if isinstance(field, str) else field + return JobRun(**args) diff --git a/scaleway-async/scaleway_async/jobs/v1alpha1/types.py b/scaleway-async/scaleway_async/jobs/v1alpha1/types.py index a7c2234c..63579d2d 100644 --- a/scaleway-async/scaleway_async/jobs/v1alpha1/types.py +++ b/scaleway-async/scaleway_async/jobs/v1alpha1/types.py @@ -111,15 +111,6 @@ class JobRun: command: str - environment_variables: Dict[str, str] - - local_storage_capacity: int - - region: Region - """ - Region to target. If none is passed will use default region from the config. - """ - created_at: Optional[datetime] updated_at: Optional[datetime] @@ -130,6 +121,17 @@ class JobRun: run_duration: Optional[str] + environment_variables: Dict[str, str] + + local_storage_capacity: int + + region: Region + """ + Region to target. If none is passed will use default region from the config. + """ + + started_at: Optional[datetime] + @dataclass class UpdateJobDefinitionRequestCronScheduleConfig: diff --git a/scaleway/scaleway/jobs/v1alpha1/marshalling.py b/scaleway/scaleway/jobs/v1alpha1/marshalling.py index 2a83e09c..ecb70454 100644 --- a/scaleway/scaleway/jobs/v1alpha1/marshalling.py +++ b/scaleway/scaleway/jobs/v1alpha1/marshalling.py @@ -146,18 +146,6 @@ def unmarshal_JobRun(data: Any) -> JobRun: if field is not None: args["command"] = field - field = data.get("environment_variables", None) - if field is not None: - args["environment_variables"] = field - - field = data.get("local_storage_capacity", None) - if field is not None: - args["local_storage_capacity"] = field - - field = data.get("region", None) - if field is not None: - args["region"] = field - field = data.get("created_at", None) if field is not None: args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field @@ -180,6 +168,22 @@ def unmarshal_JobRun(data: Any) -> JobRun: if field is not None: args["run_duration"] = field + field = data.get("environment_variables", None) + if field is not None: + args["environment_variables"] = field + + field = data.get("local_storage_capacity", None) + if field is not None: + args["local_storage_capacity"] = field + + field = data.get("region", None) + if field is not None: + args["region"] = field + + field = data.get("started_at", None) + if field is not None: + args["started_at"] = parser.isoparse(field) if isinstance(field, str) else field + return JobRun(**args) diff --git a/scaleway/scaleway/jobs/v1alpha1/types.py b/scaleway/scaleway/jobs/v1alpha1/types.py index a7c2234c..63579d2d 100644 --- a/scaleway/scaleway/jobs/v1alpha1/types.py +++ b/scaleway/scaleway/jobs/v1alpha1/types.py @@ -111,15 +111,6 @@ class JobRun: command: str - environment_variables: Dict[str, str] - - local_storage_capacity: int - - region: Region - """ - Region to target. If none is passed will use default region from the config. - """ - created_at: Optional[datetime] updated_at: Optional[datetime] @@ -130,6 +121,17 @@ class JobRun: run_duration: Optional[str] + environment_variables: Dict[str, str] + + local_storage_capacity: int + + region: Region + """ + Region to target. If none is passed will use default region from the config. + """ + + started_at: Optional[datetime] + @dataclass class UpdateJobDefinitionRequestCronScheduleConfig: