Revert "impr(jira): switch to paginated project endpoint for jira issue config (#89707)"

This reverts commit 515d2a1.

Co-authored-by: Christinarlong <[email protected]>

Author: getsentry-bot

src/sentry/integrations/jira/client.py

@@ -29,7 +29,6 @@ class JiraCloudClient(ApiClient):
     ISSUE_URL = "/rest/api/2/issue/%s"
     META_URL = "/rest/api/2/issue/createmeta"
     PRIORITIES_URL = "/rest/api/2/priority"
-    PROJECTS_PAGINATED_URL = "/rest/api/2/project/search"
     PROJECT_URL = "/rest/api/2/project"
     SEARCH_URL = "/rest/api/2/search/"
     VERSIONS_URL = "/rest/api/2/project/%s/versions"
@@ -123,12 +122,7 @@ def create_comment(self, issue_key, comment):
     def update_comment(self, issue_key, comment_id, comment):
         return self.put(self.COMMENT_URL % (issue_key, comment_id), data={"body": comment})
 
-    def get_projects_paginated(self, params: dict[str, Any] | None = None):
-        response = self.get(self.PROJECTS_PAGINATED_URL, params=params)
-        return response
-
     def get_projects_list(self):
-        """deprecated - please use paginated projects endpoint"""
         return self.get_cached(self.PROJECT_URL)
 
     def get_project_key_for_id(self, project_id) -> str:

src/sentry/integrations/jira/endpoints/search.py

@@ -5,12 +5,10 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
 from sentry.integrations.api.bases.integration import IntegrationEndpoint
-from sentry.integrations.jira.integration import JiraProjectMapping
 from sentry.integrations.models.integration import Integration
 from sentry.organizations.services.organization import RpcOrganization
 from sentry.shared_integrations.exceptions import ApiError, ApiUnauthorized, IntegrationError
@@ -86,21 +84,6 @@ def get(
             users = [{"value": user_id, "label": display} for user_id, display in user_tuples]
             return Response(users)
 
-        if field == "project" and features.has(
-            "organizations:jira-paginated-projects", organization, actor=request.user
-        ):
-            try:
-                response = jira_client.get_projects_paginated(params={"query": query})
-            except (ApiUnauthorized, ApiError):
-                return Response({"detail": "Unable to fetch projects from Jira"}, status=400)
-
-            projects = [
-                JiraProjectMapping(label=f"{p["key"]} - {p["name"]}", value=p["id"])
-                for p in response.get("values", [])
-            ]
-
-            return Response(projects)
-
         try:
             response = jira_client.get_field_autocomplete(name=field, value=query)
         except (ApiUnauthorized, ApiError):

src/sentry/integrations/jira/integration.py

@@ -789,13 +789,7 @@ def get_create_issue_config(self, group: Group | None, user: RpcUser, **kwargs):
         project_id = params.get("project", defaults.get("project"))
         client = self.get_client()
         try:
-            jira_projects = (
-                client.get_projects_paginated({"maxResults": MAX_PER_PROJECT_QUERIES})["values"]
-                if features.has(
-                    "organizations:jira-paginated-projects", group.organization, actor=user
-                )
-                else client.get_projects_list()
-            )
+            jira_projects = client.get_projects_list()
         except ApiError as e:
             logger.info(
                 "jira.get-create-issue-config.no-projects",
@@ -828,23 +822,15 @@ def get_create_issue_config(self, group: Group | None, user: RpcUser, **kwargs):
             if not any(c for c in issue_type_choices if c[0] == issue_type):
                 issue_type = issue_type_meta["id"]
 
-        projects_form_field = {
-            "name": "project",
-            "label": "Jira Project",
-            "choices": [(p["id"], f"{p["key"]} - {p["name"]}") for p in jira_projects],
-            "default": meta["id"],
-            "type": "select",
-            "updatesForm": True,
-            "required": True,
-        }
-        if features.has("organizations:jira-paginated-projects", group.organization, actor=user):
-            paginated_projects_url = reverse(
-                "sentry-extensions-jira-search", args=[self.organization.slug, self.model.id]
-            )
-            projects_form_field["url"] = paginated_projects_url
-
         fields = [
-            projects_form_field,
+            {
+                "name": "project",
+                "label": "Jira Project",
+                "choices": [(p["id"], p["key"]) for p in jira_projects],
+                "default": meta["id"],
+                "type": "select",
+                "updatesForm": True,
+            },
             *fields,
             {
                 "name": "issuetype",

tests/sentry/integrations/jira/test_integration.py

@@ -112,10 +112,9 @@ def test_get_create_issue_config(self):
                     "name": "project",
                     "default": "10000",
                     "updatesForm": True,
-                    "choices": [("10000", "EX - Example"), ("10001", "ABC - Alphabetical")],
+                    "choices": [("10000", "EX"), ("10001", "ABC")],
                     "label": "Jira Project",
                     "type": "select",
-                    "required": True,
                 },
                 {
                     "default": "message",
@@ -209,81 +208,6 @@ def test_get_create_issue_config(self):
                 },
             ]
 
-    @responses.activate
-    @with_feature("organizations:jira-paginated-projects")
-    def test_get_create_issue_config_paginated_projects(self):
-        """Test that projects are fetched using pagination when the feature flag is enabled"""
-        event = self.store_event(
-            data={
-                "event_id": "a" * 32,
-                "message": "message",
-                "timestamp": self.min_ago,
-            },
-            project_id=self.project.id,
-            default_event_type=EventType.DEFAULT,
-        )
-        group = event.group
-        assert group is not None
-
-        # Mock the paginated projects response
-        responses.add(
-            responses.GET,
-            "https://example.atlassian.net/rest/api/2/project/search",
-            json={
-                "values": [
-                    {"id": "10000", "key": "PROJ1", "name": "Project 1"},
-                    {"id": "10001", "key": "PROJ2", "name": "Project 2"},
-                ],
-                "total": 2,
-            },
-        )
-
-        # Mock the create issue metadata endpoint
-        responses.add(
-            responses.GET,
-            "https://example.atlassian.net/rest/api/2/issue/createmeta",
-            json={
-                "projects": [
-                    {
-                        "id": "10000",
-                        "key": "PROJ1",
-                        "name": "Project 1",
-                        "issuetypes": [
-                            {
-                                "description": "An error in the code",
-                                "fields": {
-                                    "issuetype": {
-                                        "key": "issuetype",
-                                        "name": "Issue Type",
-                                        "required": True,
-                                    }
-                                },
-                                "id": "bug1",
-                                "name": "Bug",
-                            }
-                        ],
-                    }
-                ]
-            },
-        )
-
-        installation = self.integration.get_installation(self.organization.id)
-        fields = installation.get_create_issue_config(group, self.user)
-
-        # Find the project field in the config
-        project_field = next(field for field in fields if field["name"] == "project")
-
-        # Verify the project field is configured correctly
-        assert (
-            project_field["url"]
-            == f"/extensions/jira/search/{self.organization.slug}/{self.integration.id}/"
-        )
-        assert project_field["choices"] == [
-            ("10000", "PROJ1 - Project 1"),
-            ("10001", "PROJ2 - Project 2"),
-        ]
-        assert project_field["type"] == "select"
-
     def test_get_create_issue_config_customer_domain(self):
         event = self.store_event(
             data={
@@ -441,12 +365,11 @@ def test_get_create_issue_config_with_default_and_param(self):
 
             assert project_field == {
                 "default": "10000",
-                "choices": [("10000", "EX - Example"), ("10001", "ABC - Alphabetical")],
+                "choices": [("10000", "EX"), ("10001", "ABC")],
                 "type": "select",
                 "name": "project",
                 "label": "Jira Project",
                 "updatesForm": True,
-                "required": True,
             }
 
     def test_get_create_issue_config_with_default(self):
@@ -475,12 +398,11 @@ def test_get_create_issue_config_with_default(self):
 
             assert project_field == {
                 "default": "10001",
-                "choices": [("10000", "EX - Example"), ("10001", "ABC - Alphabetical")],
+                "choices": [("10000", "EX"), ("10001", "ABC")],
                 "type": "select",
                 "name": "project",
                 "label": "Jira Project",
                 "updatesForm": True,
-                "required": True,
             }
 
     @patch("sentry.integrations.jira.integration.JiraIntegration.fetch_issue_create_meta")
@@ -525,12 +447,11 @@ def test_get_create_issue_config_with_default_project_deleted(
 
             assert project_field == {
                 "default": "10001",
-                "choices": [("10000", "EX - Example"), ("10001", "ABC - Alphabetical")],
+                "choices": [("10000", "EX"), ("10001", "ABC")],
                 "type": "select",
                 "name": "project",
                 "label": "Jira Project",
                 "updatesForm": True,
-                "required": True,
             }
 
     def test_get_create_issue_config_with_label_default(self):

tests/sentry/integrations/jira/test_search_endpoint.py

@@ -6,7 +6,6 @@
 
 from fixtures.integrations.stub_service import StubService
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.silo import control_silo_test
 
 
@@ -182,49 +181,3 @@ def test_customfield_search_error(self):
         assert resp.data == {
             "detail": "Unable to fetch autocomplete for customfield_0123 from Jira"
         }
-
-    @responses.activate
-    @with_feature("organizations:jira-paginated-projects")
-    def test_project_search_with_pagination(self):
-        responses.add(
-            responses.GET,
-            "https://example.atlassian.net/rest/api/2/project/search",
-            json={
-                "values": [
-                    {"id": "10000", "key": "EX", "name": "Example"},
-                ],
-                "total": 2,
-            },
-        )
-
-        self.login_as(self.user)
-
-        path = reverse(
-            "sentry-extensions-jira-search", args=[self.organization.slug, self.integration.id]
-        )
-
-        resp = self.client.get(f"{path}?field=project&query=example")
-        assert resp.status_code == 200
-        assert resp.data == [
-            {"label": "EX - Example", "value": "10000"},
-        ]
-
-    @responses.activate
-    @with_feature("organizations:jira-paginated-projects")
-    def test_project_search_error_with_pagination(self):
-        responses.add(
-            responses.GET,
-            "https://example.atlassian.net/rest/api/2/project/search",
-            status=500,
-            body="susge",
-        )
-
-        self.login_as(self.user)
-
-        path = reverse(
-            "sentry-extensions-jira-search", args=[self.organization.slug, self.integration.id]
-        )
-
-        resp = self.client.get(f"{path}?field=project&query=example")
-        assert resp.status_code == 400
-        assert resp.data == {"detail": "Unable to fetch projects from Jira"}