From 46f5ee4fd79821129c9e5b1a9f6685f3ded96a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Wed, 12 Apr 2023 17:11:32 +0200 Subject: [PATCH] Behavioral Analytics - Fix failing YAML tests on main (#95193) * Fix failing tests on main --- ...tion.post_behavioral_analytics_event.json} | 2 +- x-pack/plugin/ent-search/qa/rest/build.gradle | 2 +- .../90_behavioral_analytics_event_post.yml | 48 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) rename rest-api-spec/src/main/resources/rest-api-spec/api/{behavioral_analytics.post_event.json => search_application.post_behavioral_analytics_event.json} (94%) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/behavioral_analytics.post_event.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json similarity index 94% rename from rest-api-spec/src/main/resources/rest-api-spec/api/behavioral_analytics.post_event.json rename to rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json index 2a8206b5fefa3..0de23b23d3797 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/behavioral_analytics.post_event.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json @@ -1,5 +1,5 @@ { - "behavioral_analytics.post_event": { + "search_application.post_behavioral_analytics_event": { "documentation": { "url": "http://todo.com/tbd", "description": "Creates a behavioral analytics event for existing collection." diff --git a/x-pack/plugin/ent-search/qa/rest/build.gradle b/x-pack/plugin/ent-search/qa/rest/build.gradle index da915fc3e87a6..8c717bda1380c 100644 --- a/x-pack/plugin/ent-search/qa/rest/build.gradle +++ b/x-pack/plugin/ent-search/qa/rest/build.gradle @@ -7,7 +7,7 @@ dependencies { restResources { restApi { - include '_common', 'cluster', 'nodes', 'indices', 'index', 'search_application', 'behavioral_analytics' + include '_common', 'cluster', 'nodes', 'indices', 'index', 'search_application' } } diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/90_behavioral_analytics_event_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/90_behavioral_analytics_event_post.yml index ba5598becfd2d..c28282504ae98 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/90_behavioral_analytics_event_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/90_behavioral_analytics_event_post.yml @@ -1,12 +1,12 @@ setup: - do: - behavioral_analytics.put: + search_application.put_behavioral_analytics: name: my-test-analytics-collection --- teardown: - do: - behavioral_analytics.delete: + search_application.delete_behavioral_analytics: name: my-test-analytics-collection ignore: 404 @@ -15,7 +15,7 @@ teardown: --- "Post page_view analytics event": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -30,7 +30,7 @@ teardown: "Post page_view analytics event - Missing page.url": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -43,7 +43,7 @@ teardown: --- "Post page_view analytics event - With document": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -60,7 +60,7 @@ teardown: --- "Post page_view analytics event - With page title": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -75,7 +75,7 @@ teardown: --- "Post page_view analytics event - With referrer": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -91,7 +91,7 @@ teardown: --- "Post search analytics event": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -106,7 +106,7 @@ teardown: "Post search analytics event – Missing search query": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -119,7 +119,7 @@ teardown: --- "Post search analytics event - With sort order": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -135,7 +135,7 @@ teardown: --- "Post search analytics event - With sort name and direction": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -152,7 +152,7 @@ teardown: --- "Post search analytics event - With pagination": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -169,7 +169,7 @@ teardown: --- "Post search analytics event - With search application": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -184,7 +184,7 @@ teardown: --- "Post search analytics event - With search results": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search" body: @@ -214,7 +214,7 @@ teardown: --- "Post search_click analytics event": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search_click" body: @@ -232,7 +232,7 @@ teardown: --- "Post search_click analytics event - Page Only": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search_click" body: @@ -248,7 +248,7 @@ teardown: --- "Post search_click analytics event - Document Only": - do: - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search_click" body: @@ -266,7 +266,7 @@ teardown: "Post search_click analytics event – Missing search query": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search_click" body: @@ -282,7 +282,7 @@ teardown: "Post search_click analytics event – Missing page url and document": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "search_click" body: @@ -299,7 +299,7 @@ teardown: "Post analytics event - Analytics collection does not exist": - do: catch: "missing" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: test-nonexistent-analytics-collection event_type: "page_view" body: @@ -314,7 +314,7 @@ teardown: "Post analytics event - Event type does not exist": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "nonexistent-event-type" body: @@ -331,7 +331,7 @@ teardown: "Post page_view analytics event - Missing session.id": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -345,7 +345,7 @@ teardown: "Post page_view analytics event - Missing user.id": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "page_view" body: @@ -359,7 +359,7 @@ teardown: "Post analytics event - Unknown event field": - do: catch: "bad_request" - behavioral_analytics.post_event: + search_application.post_behavioral_analytics_event: collection_name: my-test-analytics-collection event_type: "nonexistent-event-type" body: