feat(serverless_jobs): improve retry_policy handling for job definition updates (#1785)

Co-authored-by: Prototool Bot <prototool-bot@scaleway.com>
Co-authored-by: Yacine Fodil <105779815+yfodil@users.noreply.github.com>

Author: 3 people

scaleway-async/scaleway_async/jobs/v1alpha2/__init__.py

@@ -20,6 +20,7 @@
 from .types import JobRun
 from .types import Trigger
 from .types import UpdateJobDefinitionRequestCronScheduleConfig
+from .types import UpdateJobDefinitionRequestUpdateRetryPolicy
 from .types import UpdateTriggerRequestCronConfig
 from .types import CreateJobDefinitionRequest
 from .types import CreateSecretsRequest
@@ -73,6 +74,7 @@
     "JobRun",
     "Trigger",
     "UpdateJobDefinitionRequestCronScheduleConfig",
+    "UpdateJobDefinitionRequestUpdateRetryPolicy",
     "UpdateTriggerRequestCronConfig",
     "CreateJobDefinitionRequest",
     "CreateSecretsRequest",

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

@@ -40,6 +40,7 @@
     Trigger,
     UpdateJobDefinitionRequest,
     UpdateJobDefinitionRequestCronScheduleConfig,
+    UpdateJobDefinitionRequestUpdateRetryPolicy,
     UpdateSecretRequest,
     UpdateTriggerRequest,
     UpdateTriggerRequestCronConfig,
@@ -294,7 +295,7 @@ async def update_job_definition(
         description: Optional[str] = None,
         job_timeout: Optional[str] = None,
         cron_schedule: Optional[UpdateJobDefinitionRequestCronScheduleConfig] = None,
-        retry_policy: Optional[RetryPolicy] = None,
+        retry_policy: Optional[UpdateJobDefinitionRequestUpdateRetryPolicy] = None,
     ) -> JobDefinition:
         """
         Update an existing job definition associated with the specified unique identifier.

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

@@ -38,6 +38,7 @@
     CreateTriggerRequest,
     StartJobDefinitionRequest,
     UpdateJobDefinitionRequestCronScheduleConfig,
+    UpdateJobDefinitionRequestUpdateRetryPolicy,
     UpdateJobDefinitionRequest,
     UpdateSecretRequest,
     UpdateTriggerRequestCronConfig,
@@ -910,6 +911,18 @@ def marshal_UpdateJobDefinitionRequestCronScheduleConfig(
     return output
 
 
+def marshal_UpdateJobDefinitionRequestUpdateRetryPolicy(
+    request: UpdateJobDefinitionRequestUpdateRetryPolicy,
+    defaults: ProfileDefaults,
+) -> dict[str, Any]:
+    output: dict[str, Any] = {}
+
+    if request.max_retries is not None:
+        output["max_retries"] = request.max_retries
+
+    return output
+
+
 def marshal_UpdateJobDefinitionRequest(
     request: UpdateJobDefinitionRequest,
     defaults: ProfileDefaults,
@@ -955,7 +968,9 @@ def marshal_UpdateJobDefinitionRequest(
         )
 
     if request.retry_policy is not None:
-        output["retry_policy"] = marshal_RetryPolicy(request.retry_policy, defaults)
+        output["retry_policy"] = marshal_UpdateJobDefinitionRequestUpdateRetryPolicy(
+            request.retry_policy, defaults
+        )
 
     return output
 

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

@@ -431,6 +431,11 @@ class UpdateJobDefinitionRequestCronScheduleConfig:
     timezone: Optional[str] = None
 
 
+@dataclass
+class UpdateJobDefinitionRequestUpdateRetryPolicy:
+    max_retries: Optional[int] = None
+
+
 @dataclass
 class UpdateTriggerRequestCronConfig:
     schedule: Optional[str] = None
@@ -948,7 +953,7 @@ class UpdateJobDefinitionRequest:
     Configure a cron for the job.
     """
 
-    retry_policy: Optional[RetryPolicy] = None
+    retry_policy: Optional[UpdateJobDefinitionRequestUpdateRetryPolicy] = None
     """
     Retry behaviour in case of job failure.
     """

scaleway/scaleway/jobs/v1alpha2/__init__.py

@@ -20,6 +20,7 @@
 from .types import JobRun
 from .types import Trigger
 from .types import UpdateJobDefinitionRequestCronScheduleConfig
+from .types import UpdateJobDefinitionRequestUpdateRetryPolicy
 from .types import UpdateTriggerRequestCronConfig
 from .types import CreateJobDefinitionRequest
 from .types import CreateSecretsRequest
@@ -73,6 +74,7 @@
     "JobRun",
     "Trigger",
     "UpdateJobDefinitionRequestCronScheduleConfig",
+    "UpdateJobDefinitionRequestUpdateRetryPolicy",
     "UpdateTriggerRequestCronConfig",
     "CreateJobDefinitionRequest",
     "CreateSecretsRequest",

scaleway/scaleway/jobs/v1alpha2/api.py

@@ -40,6 +40,7 @@
     Trigger,
     UpdateJobDefinitionRequest,
     UpdateJobDefinitionRequestCronScheduleConfig,
+    UpdateJobDefinitionRequestUpdateRetryPolicy,
     UpdateSecretRequest,
     UpdateTriggerRequest,
     UpdateTriggerRequestCronConfig,
@@ -294,7 +295,7 @@ def update_job_definition(
         description: Optional[str] = None,
         job_timeout: Optional[str] = None,
         cron_schedule: Optional[UpdateJobDefinitionRequestCronScheduleConfig] = None,
-        retry_policy: Optional[RetryPolicy] = None,
+        retry_policy: Optional[UpdateJobDefinitionRequestUpdateRetryPolicy] = None,
     ) -> JobDefinition:
         """
         Update an existing job definition associated with the specified unique identifier.

scaleway/scaleway/jobs/v1alpha2/marshalling.py

@@ -38,6 +38,7 @@
     CreateTriggerRequest,
     StartJobDefinitionRequest,
     UpdateJobDefinitionRequestCronScheduleConfig,
+    UpdateJobDefinitionRequestUpdateRetryPolicy,
     UpdateJobDefinitionRequest,
     UpdateSecretRequest,
     UpdateTriggerRequestCronConfig,
@@ -910,6 +911,18 @@ def marshal_UpdateJobDefinitionRequestCronScheduleConfig(
     return output
 
 
+def marshal_UpdateJobDefinitionRequestUpdateRetryPolicy(
+    request: UpdateJobDefinitionRequestUpdateRetryPolicy,
+    defaults: ProfileDefaults,
+) -> dict[str, Any]:
+    output: dict[str, Any] = {}
+
+    if request.max_retries is not None:
+        output["max_retries"] = request.max_retries
+
+    return output
+
+
 def marshal_UpdateJobDefinitionRequest(
     request: UpdateJobDefinitionRequest,
     defaults: ProfileDefaults,
@@ -955,7 +968,9 @@ def marshal_UpdateJobDefinitionRequest(
         )
 
     if request.retry_policy is not None:
-        output["retry_policy"] = marshal_RetryPolicy(request.retry_policy, defaults)
+        output["retry_policy"] = marshal_UpdateJobDefinitionRequestUpdateRetryPolicy(
+            request.retry_policy, defaults
+        )
 
     return output
 

scaleway/scaleway/jobs/v1alpha2/types.py

@@ -431,6 +431,11 @@ class UpdateJobDefinitionRequestCronScheduleConfig:
     timezone: Optional[str] = None
 
 
+@dataclass
+class UpdateJobDefinitionRequestUpdateRetryPolicy:
+    max_retries: Optional[int] = None
+
+
 @dataclass
 class UpdateTriggerRequestCronConfig:
     schedule: Optional[str] = None
@@ -948,7 +953,7 @@ class UpdateJobDefinitionRequest:
     Configure a cron for the job.
     """
 
-    retry_policy: Optional[RetryPolicy] = None
+    retry_policy: Optional[UpdateJobDefinitionRequestUpdateRetryPolicy] = None
     """
     Retry behaviour in case of job failure.
     """