Merge branch '7.x' into ua/7.x/step-completion-state

elastic · Sep 8, 2021 · 7d3e404 · 7d3e404
2 parents 0e2dc7f + c2a189e
commit 7d3e404
Show file tree

Hide file tree

Showing 168 changed files with 882 additions and 797 deletions.
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/batch_size_bytes.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/batch_size_bytes.test.ts
@@ -67,6 +67,8 @@ describe('migration v2', () => {
     await root.setup();
     await expect(root.start()).resolves.toBeTruthy();
 
+    // After plugins start, some saved objects are deleted/recreated, so we
+    // wait a bit for the count to settle.
     await new Promise((resolve) => setTimeout(resolve, 5000));
 
     const esClient: ElasticsearchClient = esServer.es.getClient();

diff --git a/src/core/server/saved_objects/migrationsv2/test_helpers/retry.test.ts b/src/core/server/saved_objects/migrationsv2/test_helpers/retry.test.ts
@@ -8,8 +8,7 @@
 
 import { retryAsync } from './retry_async';
 
-// FLAKY: https://github.com/elastic/kibana/issues/110970
-describe.skip('retry', () => {
+describe('retry', () => {
   it('retries throwing functions until they succeed', async () => {
     let i = 0;
     await expect(
@@ -53,6 +52,8 @@ describe.skip('retry', () => {
       },
       { retryAttempts: 3, retryDelayMs: 100 }
     );
-    expect(Date.now() - now).toBeGreaterThanOrEqual(200);
+    // Would expect it to take 200ms but seems like timing inaccuracies
+    // sometimes causes the duration to be measured as 199ms
+    expect(Date.now() - now).toBeGreaterThanOrEqual(199);
   });
 });
diff --git a/...rprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts b/...rprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
@@ -163,7 +163,7 @@ describe('AnalyticsLogic', () => {
         await nextTick();
 
         expect(http.get).toHaveBeenCalledWith(
-          '/api/app_search/engines/test-engine/analytics/queries',
+          '/internal/app_search/engines/test-engine/analytics/queries',
           {
             query: {
               start: DEFAULT_START_DATE,
@@ -185,7 +185,7 @@ describe('AnalyticsLogic', () => {
         AnalyticsLogic.actions.loadAnalyticsData();
 
         expect(http.get).toHaveBeenCalledWith(
-          '/api/app_search/engines/test-engine/analytics/queries',
+          '/internal/app_search/engines/test-engine/analytics/queries',
           {
             query: {
               start: '1970-01-01',
@@ -229,7 +229,7 @@ describe('AnalyticsLogic', () => {
         await nextTick();
 
         expect(http.get).toHaveBeenCalledWith(
-          '/api/app_search/engines/test-engine/analytics/queries/some-query',
+          '/internal/app_search/engines/test-engine/analytics/queries/some-query',
           {
             query: {
               start: DEFAULT_START_DATE,
@@ -248,7 +248,7 @@ describe('AnalyticsLogic', () => {
         AnalyticsLogic.actions.loadQueryData('some-query');
 
         expect(http.get).toHaveBeenCalledWith(
-          '/api/app_search/engines/test-engine/analytics/queries/some-query',
+          '/internal/app_search/engines/test-engine/analytics/queries/some-query',
           {
             query: {
               start: '1970-12-30',

diff --git a/.../enterprise_search/public/applications/app_search/components/analytics/analytics_logic.ts b/.../enterprise_search/public/applications/app_search/components/analytics/analytics_logic.ts
@@ -158,7 +158,7 @@ export const AnalyticsLogic = kea<MakeLogicType<AnalyticsValues, AnalyticsAction
           tag,
           size: 20,
         };
-        const url = `/api/app_search/engines/${engineName}/analytics/queries`;
+        const url = `/internal/app_search/engines/${engineName}/analytics/queries`;
 
         const response = await http.get(url, { query });
         actions.onAnalyticsDataLoad(response);
@@ -178,7 +178,7 @@ export const AnalyticsLogic = kea<MakeLogicType<AnalyticsValues, AnalyticsAction
           end: end || DEFAULT_END_DATE,
           tag,
         };
-        const url = `/api/app_search/engines/${engineName}/analytics/queries/${query}`;
+        const url = `/internal/app_search/engines/${engineName}/analytics/queries/${query}`;
 
         const response = await http.get(url, { query: queryParams });
 

diff --git a/...plications/app_search/components/analytics/components/analytics_tables/shared_columns.tsx b/...plications/app_search/components/analytics/components/analytics_tables/shared_columns.tsx
@@ -87,7 +87,7 @@ export const ACTIONS_COLUMN = {
         try {
           const query = (item as Query).key || (item as RecentQuery).query_string || '""';
           const response = await http.get(
-            `/api/app_search/engines/${engineName}/curations/find_or_create`,
+            `/internal/app_search/engines/${engineName}/curations/find_or_create`,
             { query: { query } }
           );
           navigateToUrl(generateEnginePath(ENGINE_CURATION_PATH, { curationId: response.id }));

diff --git a/...ch/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx b/...ch/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx
@@ -49,7 +49,7 @@ export const runActionColumnTests = (wrapper: ReactWrapper) => {
       await nextTick();
 
       expect(http.get).toHaveBeenCalledWith(
-        '/api/app_search/engines/some-engine/curations/find_or_create',
+        '/internal/app_search/engines/some-engine/curations/find_or_create',
         {
           query: { query: 'some search' },
         }
@@ -63,7 +63,7 @@ export const runActionColumnTests = (wrapper: ReactWrapper) => {
       await nextTick();
 
       expect(http.get).toHaveBeenCalledWith(
-        '/api/app_search/engines/some-engine/curations/find_or_create',
+        '/internal/app_search/engines/some-engine/curations/find_or_create',
         {
           query: { query: '""' },
         }

diff --git a/...terprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts b/...terprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
@@ -154,7 +154,7 @@ describe('ApiLogsLogic', () => {
 
         ApiLogsLogic.actions.fetchApiLogs();
 
-        expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/some-engine/api_logs', {
+        expect(http.get).toHaveBeenCalledWith('/internal/app_search/engines/some-engine/api_logs', {
           query: {
             'page[current]': 1,
             'filters[date][from]': '1970-01-01T00:00:00.000Z',

diff --git a/...ns/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.ts b/...ns/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.ts
@@ -104,7 +104,7 @@ export const ApiLogsLogic = kea<MakeLogicType<ApiLogsValues, ApiLogsActions>>({
       const { engineName } = EngineLogic.values;
 
       try {
-        const response = await http.get(`/api/app_search/engines/${engineName}/api_logs`, {
+        const response = await http.get(`/internal/app_search/engines/${engineName}/api_logs`, {
           query: {
             'page[current]': values.meta.page.current,
             'filters[date][from]': getDateString(-1),

diff --git a/...applications/app_search/components/crawler/components/add_domain/add_domain_logic.test.ts b/...applications/app_search/components/crawler/components/add_domain/add_domain_logic.test.ts
@@ -286,7 +286,7 @@ describe('AddDomainLogic', () => {
         await nextTick();
 
         expect(http.post).toHaveBeenCalledWith(
-          '/api/app_search/engines/some-engine/crawler/domains',
+          '/internal/app_search/engines/some-engine/crawler/domains',
           {
             query: {
               respond_with: 'crawler_details',

diff --git a/...blic/applications/app_search/components/crawler/components/add_domain/add_domain_logic.ts b/...blic/applications/app_search/components/crawler/components/add_domain/add_domain_logic.ts
@@ -204,7 +204,7 @@ export const AddDomainLogic = kea<MakeLogicType<AddDomainLogicValues, AddDomainL
       const { http } = HttpLogic.values;
       const failureResultChange = domainValidationFailureResultChange(stepName);
 
-      const route = '/api/app_search/crawler/validate_url';
+      const route = '/internal/app_search/crawler/validate_url';
 
       try {
         const data = await http.post(route, {
@@ -254,12 +254,15 @@ export const AddDomainLogic = kea<MakeLogicType<AddDomainLogicValues, AddDomainL
       });
 
       try {
-        const response = await http.post(`/api/app_search/engines/${engineName}/crawler/domains`, {
-          query: {
-            respond_with: 'crawler_details',
-          },
-          body: requestBody,
-        });
+        const response = await http.post(
+          `/internal/app_search/engines/${engineName}/crawler/domains`,
+          {
+            query: {
+              respond_with: 'crawler_details',
+            },
+            body: requestBody,
+          }
+        );
 
         const crawlerData = crawlerDataServerToClient(response as CrawlerDataFromServer);
         CrawlerLogic.actions.onReceiveCrawlerData(crawlerData);

diff --git a/...rch/public/applications/app_search/components/crawler/components/add_domain/utils.test.ts b/...rch/public/applications/app_search/components/crawler/components/add_domain/utils.test.ts
@@ -56,7 +56,7 @@ describe('getDomainWithProtocol', () => {
 
     expect(result).toEqual('https://elastic.co');
     expect(http.post).toHaveBeenCalledTimes(1);
-    expect(http.post).toHaveBeenCalledWith('/api/app_search/crawler/validate_url', {
+    expect(http.post).toHaveBeenCalledWith('/internal/app_search/crawler/validate_url', {
       body: JSON.stringify({ url: 'https://elastic.co', checks: ['tcp', 'url_request'] }),
     });
   });
@@ -69,7 +69,7 @@ describe('getDomainWithProtocol', () => {
 
     expect(result).toEqual('http://elastic.co');
     expect(http.post).toHaveBeenCalledTimes(2);
-    expect(http.post).toHaveBeenLastCalledWith('/api/app_search/crawler/validate_url', {
+    expect(http.post).toHaveBeenLastCalledWith('/internal/app_search/crawler/validate_url', {
       body: JSON.stringify({ url: 'http://elastic.co', checks: ['tcp', 'url_request'] }),
     });
   });

diff --git a/...e_search/public/applications/app_search/components/crawler/components/add_domain/utils.ts b/...e_search/public/applications/app_search/components/crawler/components/add_domain/utils.ts
@@ -36,7 +36,7 @@ export const getDomainWithProtocol = async (domain: string) => {
 
   if (!domain.startsWith('https://') && !domain.startsWith('http://')) {
     try {
-      const route = '/api/app_search/crawler/validate_url';
+      const route = '/internal/app_search/crawler/validate_url';
       const checks = ['tcp', 'url_request'];
 
       const httpsCheckData: CrawlerDomainValidationResultFromServer = await http.post(route, {

diff --git a/...h/public/applications/app_search/components/crawler/components/crawl_rules_table.test.tsx b/...h/public/applications/app_search/components/crawler/components/crawl_rules_table.test.tsx
@@ -176,10 +176,10 @@ describe('CrawlRulesTable', () => {
         rule: CrawlerRules.beginsWith,
       };
       expect(table.prop('deleteRoute')(crawlRule)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/crawl_rules/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/crawl_rules/1'
       );
       expect(table.prop('updateRoute')(crawlRule)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/crawl_rules/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/crawl_rules/1'
       );
     });
   });

diff --git a/...search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx b/...search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx
@@ -149,10 +149,10 @@ export const CrawlRulesTable: React.FC<CrawlRulesTableProps> = ({
     },
   ];
 
-  const crawlRulesRoute = `/api/app_search/engines/${engineName}/crawler/domains/${domainId}/crawl_rules`;
-  const domainRoute = `/api/app_search/engines/${engineName}/crawler/domains/${domainId}`;
+  const crawlRulesRoute = `/internal/app_search/engines/${engineName}/crawler/domains/${domainId}/crawl_rules`;
+  const domainRoute = `/internal/app_search/engines/${engineName}/crawler/domains/${domainId}`;
   const getCrawlRuleRoute = (crawlRule: CrawlRule) =>
-    `/api/app_search/engines/${engineName}/crawler/domains/${domainId}/crawl_rules/${crawlRule.id}`;
+    `/internal/app_search/engines/${engineName}/crawler/domains/${domainId}/crawl_rules/${crawlRule.id}`;
 
   return (
     <GenericEndpointInlineEditableTable

diff --git a/.../public/applications/app_search/components/crawler/components/entry_points_table.test.tsx b/.../public/applications/app_search/components/crawler/components/entry_points_table.test.tsx
@@ -103,10 +103,10 @@ describe('EntryPointsTable', () => {
 
       const entryPoint = { id: '1', value: '/whatever' };
       expect(table.prop('deleteRoute')(entryPoint)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/entry_points/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/entry_points/1'
       );
       expect(table.prop('updateRoute')(entryPoint)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/entry_points/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/entry_points/1'
       );
     });
   });

diff --git a/...earch/public/applications/app_search/components/crawler/components/entry_points_table.tsx b/...earch/public/applications/app_search/components/crawler/components/entry_points_table.tsx
@@ -62,10 +62,10 @@ export const EntryPointsTable: React.FC<EntryPointsTableProps> = ({
     },
   ];
 
-  const entryPointsRoute = `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/entry_points`;
+  const entryPointsRoute = `/internal/app_search/engines/${engineName}/crawler/domains/${domain.id}/entry_points`;
 
   const getEntryPointRoute = (entryPoint: EntryPoint) =>
-    `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/entry_points/${entryPoint.id}`;
+    `/internal/app_search/engines/${engineName}/crawler/domains/${domain.id}/entry_points/${entryPoint.id}`;
 
   return (
     <GenericEndpointInlineEditableTable

diff --git a/...ch/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler_logic.ts b/...ch/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler_logic.ts
@@ -104,7 +104,7 @@ export const AutomaticCrawlSchedulerLogic = kea<
       const { closePopover } = ManageCrawlsPopoverLogic.actions;
 
       try {
-        await http.delete(`/api/app_search/engines/${engineName}/crawler/crawl_schedule`);
+        await http.delete(`/internal/app_search/engines/${engineName}/crawler/crawl_schedule`);
         actions.clearCrawlSchedule();
         flashSuccessToast(
           i18n.translate(
@@ -134,7 +134,7 @@ export const AutomaticCrawlSchedulerLogic = kea<
 
       try {
         const crawlSchedule: CrawlSchedule = await http.get(
-          `/api/app_search/engines/${engineName}/crawler/crawl_schedule`
+          `/internal/app_search/engines/${engineName}/crawler/crawl_schedule`
         );
         actions.setCrawlSchedule(crawlSchedule);
       } catch (e) {
@@ -161,7 +161,7 @@ export const AutomaticCrawlSchedulerLogic = kea<
 
       try {
         const crawlSchedule: CrawlSchedule = await http.put(
-          `/api/app_search/engines/${engineName}/crawler/crawl_schedule`,
+          `/internal/app_search/engines/${engineName}/crawler/crawl_schedule`,
           {
             body: JSON.stringify({
               unit: values.crawlUnit,

diff --git a/...search/components/crawler/components/manage_crawls_popover/manage_crawls_popover_logic.ts b/...search/components/crawler/components/manage_crawls_popover/manage_crawls_popover_logic.ts
@@ -53,7 +53,7 @@ export const ManageCrawlsPopoverLogic = kea<
       }
 
       try {
-        await http.post(`/api/app_search/engines/${engineName}/crawler/process_crawls`, {
+        await http.post(`/internal/app_search/engines/${engineName}/crawler/process_crawls`, {
           body: JSON.stringify(requestBody),
         });
 

diff --git a/...arch/public/applications/app_search/components/crawler/components/sitemaps_table.test.tsx b/...arch/public/applications/app_search/components/crawler/components/sitemaps_table.test.tsx
@@ -103,10 +103,10 @@ describe('SitemapsTable', () => {
 
       const sitemap = { id: '1', url: '/whatever' };
       expect(table.prop('deleteRoute')(sitemap)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/sitemaps/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/sitemaps/1'
       );
       expect(table.prop('updateRoute')(sitemap)).toEqual(
-        '/api/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/sitemaps/1'
+        '/internal/app_search/engines/my-engine/crawler/domains/6113e1407a2f2e6f42489794/sitemaps/1'
       );
     });
   });

diff --git a/...se_search/public/applications/app_search/components/crawler/components/sitemaps_table.tsx b/...se_search/public/applications/app_search/components/crawler/components/sitemaps_table.tsx
@@ -54,9 +54,9 @@ export const SitemapsTable: React.FC<SitemapsTableProps> = ({ domain, engineName
     },
   ];
 
-  const sitemapsRoute = `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps`;
+  const sitemapsRoute = `/internal/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps`;
   const getSitemapRoute = (sitemap: Sitemap) =>
-    `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps/${sitemap.id}`;
+    `/internal/app_search/engines/${engineName}/crawler/domains/${domain.id}/sitemaps/${sitemap.id}`;
 
   return (
     <GenericEndpointInlineEditableTable

diff --git a/...enterprise_search/public/applications/app_search/components/crawler/crawler_logic.test.ts b/...enterprise_search/public/applications/app_search/components/crawler/crawler_logic.test.ts
@@ -164,7 +164,7 @@ describe('CrawlerLogic', () => {
         CrawlerLogic.actions.fetchCrawlerData();
         await nextTick();
 
-        expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/some-engine/crawler');
+        expect(http.get).toHaveBeenCalledWith('/internal/app_search/engines/some-engine/crawler');
         expect(CrawlerLogic.actions.onReceiveCrawlerData).toHaveBeenCalledWith(
           MOCK_CLIENT_CRAWLER_DATA
         );
@@ -190,7 +190,7 @@ describe('CrawlerLogic', () => {
           await nextTick();
 
           expect(http.post).toHaveBeenCalledWith(
-            '/api/app_search/engines/some-engine/crawler/crawl_requests'
+            '/internal/app_search/engines/some-engine/crawler/crawl_requests'
           );
           expect(CrawlerLogic.actions.getLatestCrawlRequests).toHaveBeenCalled();
         });
@@ -218,7 +218,7 @@ describe('CrawlerLogic', () => {
           await nextTick();
 
           expect(http.post).toHaveBeenCalledWith(
-            '/api/app_search/engines/some-engine/crawler/crawl_requests/cancel'
+            '/internal/app_search/engines/some-engine/crawler/crawl_requests/cancel'
           );
           expect(CrawlerLogic.actions.getLatestCrawlRequests).toHaveBeenCalled();
         });

diff --git a/...gins/enterprise_search/public/applications/app_search/components/crawler/crawler_logic.ts b/...gins/enterprise_search/public/applications/app_search/components/crawler/crawler_logic.ts
@@ -104,7 +104,7 @@ export const CrawlerLogic = kea<MakeLogicType<CrawlerValues, CrawlerActions>>({
       const { engineName } = EngineLogic.values;
 
       try {
-        const response = await http.get(`/api/app_search/engines/${engineName}/crawler`);
+        const response = await http.get(`/internal/app_search/engines/${engineName}/crawler`);
 
         const crawlerData = crawlerDataServerToClient(response);
 
@@ -118,7 +118,7 @@ export const CrawlerLogic = kea<MakeLogicType<CrawlerValues, CrawlerActions>>({
       const { engineName } = EngineLogic.values;
 
       try {
-        await http.post(`/api/app_search/engines/${engineName}/crawler/crawl_requests`);
+        await http.post(`/internal/app_search/engines/${engineName}/crawler/crawl_requests`);
         actions.getLatestCrawlRequests();
       } catch (e) {
         flashAPIErrors(e);
@@ -129,7 +129,7 @@ export const CrawlerLogic = kea<MakeLogicType<CrawlerValues, CrawlerActions>>({
       const { engineName } = EngineLogic.values;
 
       try {
-        await http.post(`/api/app_search/engines/${engineName}/crawler/crawl_requests/cancel`);
+        await http.post(`/internal/app_search/engines/${engineName}/crawler/crawl_requests/cancel`);
         actions.getLatestCrawlRequests();
       } catch (e) {
         flashAPIErrors(e);
@@ -152,7 +152,7 @@ export const CrawlerLogic = kea<MakeLogicType<CrawlerValues, CrawlerActions>>({
 
       try {
         const crawlRequestsFromServer: CrawlRequestFromServer[] = await http.get(
-          `/api/app_search/engines/${engineName}/crawler/crawl_requests`
+          `/internal/app_search/engines/${engineName}/crawler/crawl_requests`
         );
         const crawlRequests = crawlRequestsFromServer.map(crawlRequestServerToClient);
         actions.onReceiveCrawlRequests(crawlRequests);

diff --git a/.../enterprise_search/public/applications/app_search/components/crawler/crawler_overview.tsx b/.../enterprise_search/public/applications/app_search/components/crawler/crawler_overview.tsx
@@ -86,6 +86,7 @@ export const CrawlerOverview: React.FC = () => {
               </EuiLink>
             </p>
           </EuiText>
+          <EuiSpacer size="l" />
           <AddDomainForm />
           <EuiSpacer />
           <EuiFlexGroup justifyContent="flexEnd">

diff --git a/...e_search/public/applications/app_search/components/crawler/crawler_overview_logic.test.ts b/...e_search/public/applications/app_search/components/crawler/crawler_overview_logic.test.ts
@@ -67,7 +67,7 @@ describe('CrawlerOverviewLogic', () => {
         await nextTick();
 
         expect(http.delete).toHaveBeenCalledWith(
-          '/api/app_search/engines/some-engine/crawler/domains/1234',
+          '/internal/app_search/engines/some-engine/crawler/domains/1234',
           {
             query: { respond_with: 'crawler_details' },
           }

diff --git a/...rprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.ts b/...rprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.ts
@@ -32,7 +32,7 @@ export const CrawlerOverviewLogic = kea<MakeLogicType<{}, CrawlerOverviewActions
 
       try {
         const response = await http.delete(
-          `/api/app_search/engines/${engineName}/crawler/domains/${domain.id}`,
+          `/internal/app_search/engines/${engineName}/crawler/domains/${domain.id}`,
           {
             query: {
               respond_with: 'crawler_details',