Bump atlassian-python-api from 3.41.21 to 4.0.3 (#1125)

* Bump atlassian-python-api from 3.41.21 to 4.0.3

Bumps [atlassian-python-api](https://github.com/atlassian-api/atlassian-python-api) from 3.41.21 to 4.0.3.
- [Release notes](https://github.com/atlassian-api/atlassian-python-api/releases)
- [Commits](atlassian-api/atlassian-python-api@3.41.21...4.0.3)

---
updated-dependencies:
- dependency-name: atlassian-python-api
  dependency-version: 4.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Please mypy

* Deterministic queryparam order

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mathieu Leplatre <[email protected]>

Author: dependabot[bot]

jbi/jira/client.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Collection, Iterable, Optional
+from typing import Any, Collection, Iterable, Optional, Union
 
 import requests
 from atlassian import Jira
@@ -84,7 +84,7 @@ def paginated_projects(
         expand=None,
         url=None,
         keys: Optional[Collection[str]] = None,
-    ):
+    ) -> dict:
         """Returns a paginated list of projects visible to the user.
 
         https://developer.atlassian.com/cloud/jira/platform/rest/v2/api-group-projects/#api-rest-api-2-project-search-get
@@ -97,20 +97,23 @@ def paginated_projects(
                 "``projects_from_cloud`` method is only available for Jira Cloud platform"
             )
 
-        params = []
+        params_dict: dict[str, Any] = {}
 
         if keys is not None:
             if len(keys) > 50:
                 raise ValueError("Up to 50 project keys can be provided.")
-            params = [("keys", key) for key in keys]
+            params_dict["keys"] = list(keys)
 
         if included_archived:
-            params.append(("includeArchived", included_archived))
+            params_dict["includeArchived"] = included_archived
         if expand:
-            params.append(("expand", expand))
+            params_dict["expand"] = expand
         page_url = url or self.resource_url("project/search")
         is_url_absolute = bool(page_url.lower().startswith("http"))
-        return self.get(page_url, params=params, absolute=is_url_absolute)
+        projects: Union[dict, None] = self.get(
+            page_url, params=params_dict, absolute=is_url_absolute
+        )
+        return projects if projects else {"values": []}
 
     @instrumented_method
     def permitted_projects(self, permissions: Optional[Iterable] = None) -> list[dict]:
@@ -125,5 +128,5 @@ def permitted_projects(self, permissions: Optional[Iterable] = None) -> list[dic
             "/rest/api/2/permissions/project",
             json={"permissions": list(permissions)},
         )
-        projects: list[dict] = response["projects"]
+        projects: list[dict] = response["projects"] if response else []
         return projects

jbi/jira/service.py

@@ -519,7 +519,7 @@ def check_jira_all_project_issue_types_exist(self, actions):
 
         try:
             paginated_project_response = self.client.paginated_projects(
-                expand="issueTypes", keys=actions.configured_jira_projects_keys
+                expand="issueTypes", keys=sorted(actions.configured_jira_projects_keys)
             )
         except requests.RequestException:
             return [

poetry.lock

@@ -10,7 +10,7 @@ python = ">=3.12, <3.14"
 fastapi = "^0.115.12"
 pydantic = {version = "^2.11.3", extras = ["email"]}
 uvicorn = {extras = ["standard"], version = "^0.34.2"}
-atlassian-python-api = "^3.41.21"
+atlassian-python-api = "^4.0.3"
 dockerflow = {extras = ["fastapi"], version = "2024.4.2"}
 Jinja2 = "^3.1.6"
 sentry-sdk = {extras = ["fastapi"], version = "^2.27.0"}

pyproject.toml

@@ -86,7 +86,7 @@ def test_paginated_projects_with_keys(settings, jira_client, mocked_responses):
         responses.GET,
         url,
         status=200,
-        match=[responses.matchers.query_string_matcher("keys=ABC&keys=DEF")],
+        match=[responses.matchers.query_string_matcher("keys=['ABC', 'DEF']")],
         json=mocked_response_data,
     )
     resp = jira_client.paginated_projects(keys=["ABC", "DEF"])

tests/unit/jira/test_client.py

@@ -422,8 +422,8 @@ def test_all_project_issue_types_exist(
         status=200,
         match=[
             responses.matchers.query_string_matcher(
-                "keys=ABC&keys=DEF&expand=issueTypes"
-            )
+                "keys=['ABC', 'DEF']&expand=issueTypes"
+            ),
         ],
         json={"values": project_data},
     )