[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

api/features/feature_external_resources/models.py

@@ -170,9 +170,7 @@ def _handle_gitlab_after_save(self, state: str) -> None:
             self.feature.save()
 
         feature_states: list[FeatureState] = []
-        environments = Environment.objects.filter(
-            project_id=self.feature.project_id
-        )
+        environments = Environment.objects.filter(project_id=self.feature.project_id)
         for environment in environments:
             q = Q(
                 feature_id=self.feature_id,

api/features/feature_external_resources/views.py

@@ -69,13 +69,14 @@ def list(self, request, *args, **kwargs) -> Response:  # type: ignore[no-untyped
                     )
                 elif resource_type.startswith("GITLAB_"):
                     try:
+                        import re as _re
+
                         from integrations.gitlab.client import (
                             get_gitlab_issue_mr_title_and_state as get_gitlab_metadata,
                         )
                         from integrations.gitlab.models import (
                             GitLabConfiguration,
                         )
-                        import re as _re
 
                         feature_obj = get_object_or_404(
                             Feature.objects.filter(id=self.kwargs["feature_pk"]),
@@ -86,10 +87,16 @@ def list(self, request, *args, **kwargs) -> Response:  # type: ignore[no-untyped
                         if gitlab_config and gitlab_config.gitlab_project_id:
                             # Parse resource IID from URL
                             if resource_type == "GITLAB_MR":
-                                match = _re.search(r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/merge_requests/(\d+)$", resource_url)
+                                match = _re.search(
+                                    r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/merge_requests/(\d+)$",
+                                    resource_url,
+                                )
                                 api_type = "merge_requests"
                             else:
-                                match = _re.search(r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/(?:issues|work_items)/(\d+)$", resource_url)
+                                match = _re.search(
+                                    r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/(?:issues|work_items)/(\d+)$",
+                                    resource_url,
+                                )
                                 api_type = "issues"
 
                             if match:
@@ -106,7 +113,9 @@ def list(self, request, *args, **kwargs) -> Response:  # type: ignore[no-untyped
 
         return Response(data={"results": data})
 
-    def _create_gitlab_resource(self, request: Any, feature: Any, resource_type: str, *args: Any, **kwargs: Any) -> Response:
+    def _create_gitlab_resource(
+        self, request: Any, feature: Any, resource_type: str, *args: Any, **kwargs: Any
+    ) -> Response:
         from integrations.gitlab.models import GitLabConfiguration
 
         try:
@@ -127,12 +136,16 @@ def _create_gitlab_resource(self, request: Any, feature: Any, resource_type: str
         if resource_type == "GITLAB_MR":
             pattern = r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/merge_requests/(\d+)$"
         else:
-            pattern = r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/(?:issues|work_items)/(\d+)$"
+            pattern = (
+                r"https?://[^/]+/([^/-]+(?:/[^/-]+)*)/-/(?:issues|work_items)/(\d+)$"
+            )
 
         url_match = re.search(pattern, url)
         if url_match:
             _project_path, resource_iid = url_match.groups()
-            api_resource_type = "merge_requests" if resource_type == "GITLAB_MR" else "issues"
+            api_resource_type = (
+                "merge_requests" if resource_type == "GITLAB_MR" else "issues"
+            )
             if gitlab_config.tagging_enabled and gitlab_config.gitlab_project_id:
                 label_gitlab_issue_mr(
                     instance_url=gitlab_config.gitlab_instance_url,
@@ -149,7 +162,9 @@ def _create_gitlab_resource(self, request: Any, feature: Any, resource_type: str
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def _create_github_resource(self, request: Any, feature: Any, resource_type: str, *args: Any, **kwargs: Any) -> Response:
+    def _create_github_resource(
+        self, request: Any, feature: Any, resource_type: str, *args: Any, **kwargs: Any
+    ) -> Response:
         github_configuration = (
             Organisation.objects.prefetch_related("github_config")
             .get(id=feature.project.organisation_id)
@@ -212,10 +227,14 @@ def create(self, request, *args, **kwargs):  # type: ignore[no-untyped-def]
 
         # Handle GitLab resources
         if resource_type in ("GITLAB_MR", "GITLAB_ISSUE"):
-            return self._create_gitlab_resource(request, feature, resource_type, *args, **kwargs)
+            return self._create_gitlab_resource(
+                request, feature, resource_type, *args, **kwargs
+            )
 
         # Handle GitHub resources
-        return self._create_github_resource(request, feature, resource_type, *args, **kwargs)
+        return self._create_github_resource(
+            request, feature, resource_type, *args, **kwargs
+        )
 
     def perform_update(self, serializer):  # type: ignore[no-untyped-def]
         external_resource_id = int(self.kwargs["pk"])

api/integrations/gitlab/gitlab.py

@@ -61,7 +61,10 @@ def _get_tag_value_for_event(
 
 
 def tag_feature_per_gitlab_event(
-    event_type: str, action: str, metadata: dict[str, Any], project_path: str,
+    event_type: str,
+    action: str,
+    metadata: dict[str, Any],
+    project_path: str,
 ) -> None:
     web_url = metadata.get("web_url", "")
 
@@ -263,9 +266,7 @@ def call_gitlab_task(
     url: str | None,
     feature_states: typing.Union[list[typing.Any], list[typing.Any]] | None,
 ) -> None:
-    gitlab_configuration = GitLabConfiguration.objects.get(
-        project_id=project_id
-    )
+    gitlab_configuration = GitLabConfiguration.objects.get(project_id=project_id)
 
     feature_data: GitLabData = generate_data(
         gitlab_configuration=gitlab_configuration,

api/integrations/gitlab/helpers.py

@@ -1,5 +1,6 @@
 def gitlab_webhook_payload_is_valid(
-    secret_token: str, gitlab_token_header: str | None,
+    secret_token: str,
+    gitlab_token_header: str | None,
 ) -> bool:
     """Verify that the webhook was sent from GitLab by comparing the secret token."""
     if not gitlab_token_header:

api/integrations/gitlab/views.py

@@ -51,9 +51,7 @@
 def gitlab_auth_required(func):  # type: ignore[no-untyped-def]
     @wraps(func)
     def wrapper(request, project_pk):  # type: ignore[no-untyped-def]
-        if not GitLabConfiguration.has_gitlab_configuration(
-            project_id=project_pk
-        ):
+        if not GitLabConfiguration.has_gitlab_configuration(project_id=project_pk):
             return Response(
                 data={
                     "detail": "This Project doesn't have a valid GitLab Configuration"
@@ -110,7 +108,9 @@ def get_serializer_class(self):  # type: ignore[no-untyped-def]
     def perform_create(self, serializer):  # type: ignore[no-untyped-def]
         project_id = self.kwargs["project_pk"]
         serializer.save(project_id=project_id)
-        if serializer.validated_data.get("tagging_enabled", False) and serializer.validated_data.get("gitlab_project_id"):
+        if serializer.validated_data.get(
+            "tagging_enabled", False
+        ) and serializer.validated_data.get("gitlab_project_id"):
             create_flagsmith_flag_label(
                 instance_url=serializer.validated_data["gitlab_instance_url"],
                 access_token=serializer.validated_data["access_token"],
@@ -121,9 +121,7 @@ def get_queryset(self):  # type: ignore[no-untyped-def]
         if getattr(self, "swagger_fake_view", False):
             return GitLabConfiguration.objects.none()
 
-        return GitLabConfiguration.objects.filter(
-            project_id=self.kwargs["project_pk"]
-        )
+        return GitLabConfiguration.objects.filter(project_id=self.kwargs["project_pk"])
 
     def create(self, request, *args, **kwargs):  # type: ignore[no-untyped-def]
         try:
@@ -165,7 +163,9 @@ def fetch_merge_requests(request, project_pk) -> Response:  # type: ignore[no-un
         access_token=gitlab_config.access_token,
         params=query_serializer.validated_data,
     )
-    return Response(data=data, content_type="application/json", status=status.HTTP_200_OK)
+    return Response(
+        data=data, content_type="application/json", status=status.HTTP_200_OK
+    )
 
 
 @api_view(["GET"])
@@ -186,7 +186,9 @@ def fetch_issues(request, project_pk) -> Response:  # type: ignore[no-untyped-de
         access_token=gitlab_config.access_token,
         params=query_serializer.validated_data,
     )
-    return Response(data=data, content_type="application/json", status=status.HTTP_200_OK)
+    return Response(
+        data=data, content_type="application/json", status=status.HTTP_200_OK
+    )
 
 
 @api_view(["GET"])
@@ -205,7 +207,9 @@ def fetch_projects(request, project_pk: int) -> Response | None:  # type: ignore
         access_token=gitlab_config.access_token,
         params=query_serializer.validated_data,
     )
-    return Response(data=data, content_type="application/json", status=status.HTTP_200_OK)
+    return Response(
+        data=data, content_type="application/json", status=status.HTTP_200_OK
+    )
 
 
 @api_view(["GET"])
@@ -225,7 +229,9 @@ def fetch_project_members(request, project_pk) -> Response:  # type: ignore[no-u
         access_token=gitlab_config.access_token,
         params=query_serializer.validated_data,
     )
-    return Response(data=response, content_type="application/json", status=status.HTTP_200_OK)
+    return Response(
+        data=response, content_type="application/json", status=status.HTTP_200_OK
+    )
 
 
 @api_view(["POST"])
@@ -279,7 +285,9 @@ def create_cleanup_issue(request, project_pk: int) -> Response:  # type: ignore[
         url_parts = summary.repository_url.rstrip("/").split("/")
         repo_path = "/".join(url_parts[-2:])  # e.g. "group/project"
 
-        if not gitlab_config.project_name or not gitlab_config.project_name.endswith(repo_path):
+        if not gitlab_config.project_name or not gitlab_config.project_name.endswith(
+            repo_path
+        ):
             continue
 
         if not gitlab_config.gitlab_project_id:

api/projects/urls.py

@@ -21,12 +21,16 @@
 from integrations.datadog.views import DataDogConfigurationViewSet
 from integrations.gitlab.views import (
     GitLabConfigurationViewSet,
-    create_cleanup_issue as gitlab_create_cleanup_issue,
-    fetch_issues as gitlab_fetch_issues,
     fetch_merge_requests,
     fetch_project_members,
     fetch_projects,
 )
+from integrations.gitlab.views import (
+    create_cleanup_issue as gitlab_create_cleanup_issue,
+)
+from integrations.gitlab.views import (
+    fetch_issues as gitlab_fetch_issues,
+)
 from integrations.grafana.views import GrafanaProjectConfigurationViewSet
 from integrations.launch_darkly.views import LaunchDarklyImportRequestViewSet
 from integrations.new_relic.views import NewRelicConfigurationViewSet

api/tests/unit/features/test_unit_feature_external_resources_views.py

@@ -1151,9 +1151,7 @@ def test_call_gitlab_task__feature_state_updated__calls_task(
         feature=feature,
         metadata='{"state": "opened"}',
     )
-    mock_call_gitlab = mocker.patch(
-        "integrations.gitlab.gitlab.call_gitlab_task"
-    )
+    mock_call_gitlab = mocker.patch("integrations.gitlab.gitlab.call_gitlab_task")
     with_environment_permissions([UPDATE_FEATURE_STATE], environment.id, False)
     feature_state = FeatureState.objects.get(
         feature=feature, environment=environment.id
@@ -1192,9 +1190,7 @@ def test_call_gitlab_task__v2_versioning_feature_state_updated__calls_task(
         feature=feature,
         metadata='{"state": "opened"}',
     )
-    mock_call_gitlab = mocker.patch(
-        "integrations.gitlab.gitlab.call_gitlab_task"
-    )
+    mock_call_gitlab = mocker.patch("integrations.gitlab.gitlab.call_gitlab_task")
 
     environment_feature_version = EnvironmentFeatureVersion.objects.create(
         environment=environment_v2_versioning, feature=feature

api/tests/unit/integrations/gitlab/test_unit_gitlab_client.py

@@ -145,7 +145,9 @@ def test_create_gitlab_issue__valid_data__creates_issue() -> None:
 
 
 @responses.activate
-def test_get_gitlab_issue_mr_title_and_state__valid_resource__returns_metadata() -> None:
+def test_get_gitlab_issue_mr_title_and_state__valid_resource__returns_metadata() -> (
+    None
+):
     # Given
     responses.add(
         responses.GET,
@@ -305,7 +307,9 @@ def test_label_gitlab_issue_mr__happy_path__adds_label() -> None:
 # ---------------------------------------------------------------
 
 
-def test_build_paginated_response__pagination_headers__returns_previous_and_next() -> None:
+def test_build_paginated_response__pagination_headers__returns_previous_and_next() -> (
+    None
+):
     # Given
     import requests
 
@@ -395,7 +399,10 @@ def test_fetch_search_gitlab_resource__with_search_text__appends_search_param()
 
     # Then
     assert len(responses.calls) == 1
-    assert "search=my+search" in responses.calls[0].request.url or "search=my%20search" in responses.calls[0].request.url
+    assert (
+        "search=my+search" in responses.calls[0].request.url
+        or "search=my%20search" in responses.calls[0].request.url
+    )
 
 
 @responses.activate