chore(serverless_jobs): filter job defs and runs by organization_id (#…

…487)
scaleway · Apr 11, 2024 · a813285 · a813285
1 parent cf0f122
commit a813285
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/scaleway-async/scaleway_async/jobs/v1alpha1/api.py b/scaleway-async/scaleway_async/jobs/v1alpha1/api.py
@@ -159,6 +159,7 @@ async def list_job_definitions(
         page_size: Optional[int] = None,
         order_by: Optional[ListJobDefinitionsRequestOrderBy] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> ListJobDefinitionsResponse:
         """
         List all your job definitions with filters.
@@ -167,6 +168,7 @@ async def list_job_definitions(
         :param page_size:
         :param order_by:
         :param project_id:
+        :param organization_id:
         :return: :class:`ListJobDefinitionsResponse <ListJobDefinitionsResponse>`
 
         Usage:
@@ -184,6 +186,8 @@ async def list_job_definitions(
             f"/serverless-jobs/v1alpha1/regions/{param_region}/job-definitions",
             params={
                 "order_by": order_by,
+                "organization_id": organization_id
+                or self.client.default_organization_id,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "project_id": project_id or self.client.default_project_id,
@@ -201,6 +205,7 @@ async def list_job_definitions_all(
         page_size: Optional[int] = None,
         order_by: Optional[ListJobDefinitionsRequestOrderBy] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> List[JobDefinition]:
         """
         List all your job definitions with filters.
@@ -209,6 +214,7 @@ async def list_job_definitions_all(
         :param page_size:
         :param order_by:
         :param project_id:
+        :param organization_id:
         :return: :class:`List[JobDefinition] <List[JobDefinition]>`
 
         Usage:
@@ -227,6 +233,7 @@ async def list_job_definitions_all(
                 "page_size": page_size,
                 "order_by": order_by,
                 "project_id": project_id,
+                "organization_id": organization_id,
             },
         )
 
@@ -462,6 +469,7 @@ async def list_job_runs(
         order_by: Optional[ListJobRunsRequestOrderBy] = None,
         job_definition_id: Optional[str] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> ListJobRunsResponse:
         """
         List all job runs with filters.
@@ -471,6 +479,7 @@ async def list_job_runs(
         :param order_by:
         :param job_definition_id:
         :param project_id:
+        :param organization_id:
         :return: :class:`ListJobRunsResponse <ListJobRunsResponse>`
 
         Usage:
@@ -489,6 +498,8 @@ async def list_job_runs(
             params={
                 "job_definition_id": job_definition_id,
                 "order_by": order_by,
+                "organization_id": organization_id
+                or self.client.default_organization_id,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "project_id": project_id or self.client.default_project_id,
@@ -507,6 +518,7 @@ async def list_job_runs_all(
         order_by: Optional[ListJobRunsRequestOrderBy] = None,
         job_definition_id: Optional[str] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> List[JobRun]:
         """
         List all job runs with filters.
@@ -516,6 +528,7 @@ async def list_job_runs_all(
         :param order_by:
         :param job_definition_id:
         :param project_id:
+        :param organization_id:
         :return: :class:`List[JobRun] <List[JobRun]>`
 
         Usage:
@@ -535,5 +548,6 @@ async def list_job_runs_all(
                 "order_by": order_by,
                 "job_definition_id": job_definition_id,
                 "project_id": project_id,
+                "organization_id": organization_id,
             },
         )
diff --git a/scaleway-async/scaleway_async/jobs/v1alpha1/types.py b/scaleway-async/scaleway_async/jobs/v1alpha1/types.py
@@ -260,6 +260,8 @@ class ListJobDefinitionsRequest:
 
     project_id: Optional[str]
 
+    organization_id: Optional[str]
+
 
 @dataclass
 class ListJobDefinitionsResponse:
@@ -285,6 +287,8 @@ class ListJobRunsRequest:
 
     project_id: Optional[str]
 
+    organization_id: Optional[str]
+
 
 @dataclass
 class ListJobRunsResponse:

diff --git a/scaleway/scaleway/jobs/v1alpha1/api.py b/scaleway/scaleway/jobs/v1alpha1/api.py
@@ -159,6 +159,7 @@ def list_job_definitions(
         page_size: Optional[int] = None,
         order_by: Optional[ListJobDefinitionsRequestOrderBy] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> ListJobDefinitionsResponse:
         """
         List all your job definitions with filters.
@@ -167,6 +168,7 @@ def list_job_definitions(
         :param page_size:
         :param order_by:
         :param project_id:
+        :param organization_id:
         :return: :class:`ListJobDefinitionsResponse <ListJobDefinitionsResponse>`
 
         Usage:
@@ -184,6 +186,8 @@ def list_job_definitions(
             f"/serverless-jobs/v1alpha1/regions/{param_region}/job-definitions",
             params={
                 "order_by": order_by,
+                "organization_id": organization_id
+                or self.client.default_organization_id,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "project_id": project_id or self.client.default_project_id,
@@ -201,6 +205,7 @@ def list_job_definitions_all(
         page_size: Optional[int] = None,
         order_by: Optional[ListJobDefinitionsRequestOrderBy] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> List[JobDefinition]:
         """
         List all your job definitions with filters.
@@ -209,6 +214,7 @@ def list_job_definitions_all(
         :param page_size:
         :param order_by:
         :param project_id:
+        :param organization_id:
         :return: :class:`List[JobDefinition] <List[JobDefinition]>`
 
         Usage:
@@ -227,6 +233,7 @@ def list_job_definitions_all(
                 "page_size": page_size,
                 "order_by": order_by,
                 "project_id": project_id,
+                "organization_id": organization_id,
             },
         )
 
@@ -462,6 +469,7 @@ def list_job_runs(
         order_by: Optional[ListJobRunsRequestOrderBy] = None,
         job_definition_id: Optional[str] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> ListJobRunsResponse:
         """
         List all job runs with filters.
@@ -471,6 +479,7 @@ def list_job_runs(
         :param order_by:
         :param job_definition_id:
         :param project_id:
+        :param organization_id:
         :return: :class:`ListJobRunsResponse <ListJobRunsResponse>`
 
         Usage:
@@ -489,6 +498,8 @@ def list_job_runs(
             params={
                 "job_definition_id": job_definition_id,
                 "order_by": order_by,
+                "organization_id": organization_id
+                or self.client.default_organization_id,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "project_id": project_id or self.client.default_project_id,
@@ -507,6 +518,7 @@ def list_job_runs_all(
         order_by: Optional[ListJobRunsRequestOrderBy] = None,
         job_definition_id: Optional[str] = None,
         project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
     ) -> List[JobRun]:
         """
         List all job runs with filters.
@@ -516,6 +528,7 @@ def list_job_runs_all(
         :param order_by:
         :param job_definition_id:
         :param project_id:
+        :param organization_id:
         :return: :class:`List[JobRun] <List[JobRun]>`
 
         Usage:
@@ -535,5 +548,6 @@ def list_job_runs_all(
                 "order_by": order_by,
                 "job_definition_id": job_definition_id,
                 "project_id": project_id,
+                "organization_id": organization_id,
             },
         )
diff --git a/scaleway/scaleway/jobs/v1alpha1/types.py b/scaleway/scaleway/jobs/v1alpha1/types.py
@@ -260,6 +260,8 @@ class ListJobDefinitionsRequest:
 
     project_id: Optional[str]
 
+    organization_id: Optional[str]
+
 
 @dataclass
 class ListJobDefinitionsResponse:
@@ -285,6 +287,8 @@ class ListJobRunsRequest:
 
     project_id: Optional[str]
 
+    organization_id: Optional[str]
+
 
 @dataclass
 class ListJobRunsResponse: