Revert "Add excluded/included events to get_event_logs api (apache#37641

)" This reverts commit 0b9e2a7.
romsharon98 · Mar 5, 2024 · cea8a46 · cea8a46
1 parent 7de8a51
commit cea8a46
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 58 deletions.
diff --git a/airflow/api_connexion/endpoints/event_log_endpoint.py b/airflow/api_connexion/endpoints/event_log_endpoint.py
@@ -58,8 +58,6 @@ def get_event_logs(
     task_id: str | None = None,
     owner: str | None = None,
     event: str | None = None,
-    excluded_events: str | None = None,
-    included_events: str | None = None,
     before: str | None = None,
     after: str | None = None,
     limit: int,
@@ -90,12 +88,6 @@ def get_event_logs(
         query = query.where(Log.owner == owner)
     if event:
         query = query.where(Log.event == event)
-    if included_events:
-        included_events_list = included_events.split(",")
-        query = query.where(Log.event.in_(included_events_list))
-    if excluded_events:
-        excluded_events_list = excluded_events.split(",")
-        query = query.where(Log.event.notin_(excluded_events_list))
     if before:
         query = query.where(Log.dttm < timezone.parse(before))
     if after:

diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
@@ -1160,22 +1160,6 @@ paths:
         - $ref: "#/components/parameters/Owner"
         - $ref: "#/components/parameters/Before"
         - $ref: "#/components/parameters/After"
-        - name: included_events
-          in: query
-          schema:
-            type: string
-          required: false
-          description: |
-            One or more event names separated by commas. If set, only return event logs with events matching this pattern.
-            *New in version 2.9.0*
-        - name: excluded_events
-          in: query
-          schema:
-            type: string
-          required: false
-          description: |
-            One or more event names separated by commas. If set, only return event logs with events that do not match this pattern.
-            *New in version 2.9.0*
       responses:
         "200":
           description: Success.

diff --git a/airflow/www/static/js/types/api-generated.ts b/airflow/www/static/js/types/api-generated.ts
@@ -3499,16 +3499,6 @@ export interface operations {
         before?: components["parameters"]["Before"];
         /** Timestamp to select event logs occurring after. */
         after?: components["parameters"]["After"];
-        /**
-         * One or more event names separated by commas. If set, only return event logs with events matching this pattern.
-         * *New in version 2.9.0*
-         */
-        included_events?: string;
-        /**
-         * One or more event names separated by commas. If set, only return event logs with events that do not match this pattern.
-         * *New in version 2.9.0*
-         */
-        excluded_events?: string;
       };
     };
     responses: {

diff --git a/tests/api_connexion/endpoints/test_event_log_endpoint.py b/tests/api_connexion/endpoints/test_event_log_endpoint.py
@@ -291,30 +291,6 @@ def test_should_filter_eventlogs_by_when(self, create_log_model, session):
             assert response.status_code == 200
             assert {eventlog["event"] for eventlog in response.json["event_logs"]} == expected_eventlogs
 
-    def test_should_filter_eventlogs_by_included_events(self, create_log_model):
-        for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
-            create_log_model(event=event, when=self.default_time)
-        response = self.client.get(
-            "/api/v1/eventLogs?included_events=TEST_EVENT_1,TEST_EVENT_2",
-            environ_overrides={"REMOTE_USER": "test_granular"},
-        )
-        assert response.status_code == 200
-        response_data = response.json
-        assert len(response_data["event_logs"]) == 2
-        assert {"TEST_EVENT_1", "TEST_EVENT_2"} == {x["event"] for x in response_data["event_logs"]}
-
-    def test_should_filter_eventlogs_by_excluded_events(self, create_log_model):
-        for event in ["TEST_EVENT_1", "TEST_EVENT_2", "cli_scheduler"]:
-            create_log_model(event=event, when=self.default_time)
-        response = self.client.get(
-            "/api/v1/eventLogs?excluded_events=TEST_EVENT_1,TEST_EVENT_2",
-            environ_overrides={"REMOTE_USER": "test_granular"},
-        )
-        assert response.status_code == 200
-        response_data = response.json
-        assert len(response_data["event_logs"]) == 1
-        assert {"cli_scheduler"} == {x["event"] for x in response_data["event_logs"]}
-
 
 class TestGetEventLogPagination(TestEventLogEndpoint):
     @pytest.mark.parametrize(