Merge remote-tracking branch 'upstream/master' into migrate/url-short…

…ener
elastic · Dec 4, 2019 · a01881f · a01881f
2 parents 7cd578b + 7ce0a37
commit a01881f
Show file tree

Hide file tree

Showing 121 changed files with 1,004 additions and 663 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -7,43 +7,45 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
   timeout(time: 120, unit: 'MINUTES') {
     timestamps {
       ansiColor('xterm') {
-        catchError {
-          parallel([
-            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
-            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
-            'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
-              'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
-              'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
-              'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
-              'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
-              'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
-              'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
-              'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
-              'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
-              'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
-              'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
-              'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
-              'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
-              'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
-              'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
-              // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
-            ]),
-            'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
-              'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
-              'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
-              'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
-              'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
-              'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
-              'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
-              'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
-              'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
-              'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
-              'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
-              'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
-              'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
-              // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
-            ]),
-          ])
+        githubPr.withDefaultPrComments {
+          catchError {
+            parallel([
+              'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
+              'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+              'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+                'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
+                'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
+                'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
+                'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
+                'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
+                'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
+                'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
+                'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
+                'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
+                'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
+                'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
+                'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
+                'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
+                'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
+                // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
+              ]),
+              'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
+                'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
+                'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
+                'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
+                'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
+                'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
+                'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
+                'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
+                'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
+                'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
+                'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
+                'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
+                'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
+                // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
+              ]),
+            ])
+          }
         }
         kibanaPipeline.sendMail()
       }

diff --git a/packages/kbn-test/src/failed_tests_reporter/__fixtures__/ftr_report.xml b/packages/kbn-test/src/failed_tests_reporter/__fixtures__/ftr_report.xml
@@ -41,5 +41,13 @@ Wait timed out after 10055ms
       </system-out>
       <skipped/>
     </testcase>
+    <testcase name="machine learning anomaly detection saved search  with lucene query job creation opens the advanced section" classname="Firefox XPack UI Functional Tests.x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job·ts" time="6.040">
+      <system-out><![CDATA[[00:21:57]         └-: machine learning...]]></system-out>
+      <failure><![CDATA[{ NoSuchSessionError: Tried to run command without establishing a connection
+    at Object.throwDecodedError (/dev/shm/workspace/kibana/node_modules/selenium-webdriver/lib/error.js:550:15)
+    at parseHttpResponse (/dev/shm/workspace/kibana/node_modules/selenium-webdriver/lib/http.js:563:13)
+    at Executor.execute (/dev/shm/workspace/kibana/node_modules/selenium-webdriver/lib/http.js:489:26)
+    at process._tickCallback (internal/process/next_tick.js:68:7) name: 'NoSuchSessionError', remoteStacktrace: '' }]]></failure>
+    </testcase>
   </testsuite>
 </testsuites>
diff --git a/packages/kbn-test/src/failed_tests_reporter/get_failures.ts b/packages/kbn-test/src/failed_tests_reporter/get_failures.ts
@@ -91,7 +91,8 @@ const getFailureText = (failure: NonNullable<TestCase['failure']>) => {
 
 const isLikelyIrrelevant = ({ name, failure }: TestFailure) => {
   if (
-    failure.includes('NoSuchSessionError: This driver instance does not have a valid session ID')
+    failure.includes('NoSuchSessionError: This driver instance does not have a valid session ID') ||
+    failure.includes('NoSuchSessionError: Tried to run command without establishing a connection')
   ) {
     return true;
   }

diff --git a/src/dev/jest/babel_transform.js b/src/dev/jest/babel_transform.js
@@ -25,6 +25,7 @@ module.exports = babelJest.createTransformer({
       '@babel/preset-env': {
         // disable built-in filtering, which is more performant but strips the import of `regenerator-runtime` required by EUI
         useBuiltIns: false,
+        corejs: false
       }
     }]
   ],

diff --git a/src/legacy/server/config/__tests__/deprecation_warnings.js b/src/legacy/server/config/__tests__/deprecation_warnings.js
@@ -26,7 +26,7 @@ const SETUP_NODE_ENV = require.resolve('../../../../setup_node_env');
 const SECOND = 1000;
 
 describe('config/deprecation warnings', function () {
-  this.timeout(15 * SECOND);
+  this.timeout(65 * SECOND);
 
   let stdio = '';
   let proc = null;
@@ -53,7 +53,7 @@ describe('config/deprecation warnings', function () {
 
     // Either time out in 60 seconds, or resolve once the line is in our buffer
     return Promise.race([
-      new Promise((resolve) => setTimeout(resolve, 60000)),
+      new Promise((resolve) => setTimeout(resolve, 60 * SECOND)),
       new Promise((resolve, reject) => {
         proc.stdout.on('data', (chunk) => {
           stdio += chunk.toString('utf8');

diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.ts b/src/legacy/ui/public/courier/fetch/get_search_params.ts
@@ -40,11 +40,11 @@ export function getSearchParams(config: IUiSettingsClient, esShardTimeout: numbe
   };
 }
 
-export function getIgnoreThrottled(config: IUiSettingsClient) {
+function getIgnoreThrottled(config: IUiSettingsClient) {
   return !config.get('search:includeFrozen');
 }
 
-export function getMaxConcurrentShardRequests(config: IUiSettingsClient) {
+function getMaxConcurrentShardRequests(config: IUiSettingsClient) {
   const maxConcurrentShardRequests = config.get('courier:maxConcurrentShardRequests');
   return maxConcurrentShardRequests > 0 ? maxConcurrentShardRequests : undefined;
 }

diff --git a/src/legacy/ui/public/courier/index.ts b/src/legacy/ui/public/courier/index.ts
@@ -17,8 +17,31 @@
  * under the License.
  */
 
-export * from './fetch';
-export * from './search_source';
-export * from './search_strategy';
-export * from './utils/courier_inspector_utils';
-export * from './types';
+export { SearchSource } from './search_source';
+
+// TODO: Exporting this mock outside of jest tests causes errors because
+// jest is undefined. Need to refactor the mock to be consistent with
+// other NP-style mocks.
+// export { searchSourceMock } from './search_source/mocks';
+
+export {
+  addSearchStrategy, // used externally by Rollups
+  getSearchErrorType, // used externally by Rollups
+  hasSearchStategyForIndexPattern, // used externally by Discover
+  isDefaultTypeIndexPattern, // used externally by Discover
+  SearchError, // used externally by Visualizations & Rollups
+} from './search_strategy';
+
+export {
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+} from './utils/courier_inspector_utils';
+
+// types
+export { SearchSourceContract } from './search_source';
+
+export {
+  EsQuerySortValue, // used externally by Discover
+  FetchOptions, // used externally by AggTypes
+  SortDirection, // used externally by Discover
+} from './types';
diff --git a/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts b/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts
@@ -28,7 +28,7 @@ import { i18n } from '@kbn/i18n';
 import { SearchResponse } from 'elasticsearch';
 import { SearchSourceContract, RequestInspectorStats } from '../types';
 
-function getRequestInspectorStats(searchSource: SearchSourceContract) {
+export function getRequestInspectorStats(searchSource: SearchSourceContract) {
   const stats: RequestInspectorStats = {};
   const index = searchSource.getField('index');
 
@@ -56,7 +56,8 @@ function getRequestInspectorStats(searchSource: SearchSourceContract) {
 
   return stats;
 }
-function getResponseInspectorStats(
+
+export function getResponseInspectorStats(
   searchSource: SearchSourceContract,
   resp: SearchResponse<unknown>
 ) {
@@ -121,5 +122,3 @@ function getResponseInspectorStats(
 
   return stats;
 }
-
-export { getRequestInspectorStats, getResponseInspectorStats };
diff --git a/src/plugins/embeddable/public/lib/actions/apply_filter_action.test.ts b/src/plugins/embeddable/public/lib/actions/apply_filter_action.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { createFilterAction } from './apply_filter_action';
-import { expectError } from '../../tests/helpers';
+import { expectErrorAsync } from '../../tests/helpers';
 
 test('has APPLY_FILTER_ACTION type and id', () => {
   const action = createFilterAction();
@@ -95,12 +95,13 @@ describe('execute()', () => {
   describe('when no filters are given', () => {
     test('throws an error', async () => {
       const action = createFilterAction();
-      const error = expectError(() =>
+      const error = await expectErrorAsync(() =>
         action.execute({
           embeddable: getEmbeddable(),
         } as any)
       );
       expect(error).toBeInstanceOf(Error);
+      expect(error.message).toBe('Applying a filter requires a filter and embeddable as context');
     });
 
     test('updates filter input on success', async () => {

diff --git a/src/plugins/embeddable/public/tests/helpers.ts b/src/plugins/embeddable/public/tests/helpers.ts
@@ -17,11 +17,27 @@
  * under the License.
  */
 
-export const expectError = (fn: (...args: any) => any) => {
+export const expectErrorAsync = (fn: (...args: unknown[]) => Promise<unknown>): Promise<Error> => {
+  return fn()
+    .then(() => {
+      throw new Error('Expected an error throw.');
+    })
+    .catch(error => {
+      if (error.message === 'Expected an error throw.') {
+        throw error;
+      }
+      return error;
+    });
+};
+
+export const expectError = (fn: (...args: any) => any): Error => {
   try {
     fn();
     throw new Error('Expected an error throw.');
   } catch (error) {
+    if (error.message === 'Expected an error throw.') {
+      throw error;
+    }
     return error;
   }
 };

diff --git a/tasks/test.js b/tasks/test.js
@@ -71,7 +71,7 @@ module.exports = function (grunt) {
         !grunt.option('quick') && 'run:typeCheck',
         !grunt.option('quick') && 'run:i18nCheck',
         'run:checkFileCasing',
-        'licenses',
+        'run:licenses',
         'test:quick',
       ])
     );

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -57,7 +57,6 @@ export default function ({ getService, getPageObjects }) {
     it('should save and load with special characters', async function () {
       const vizNamewithSpecialChars = vizName1 + '/?&=%';
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizNamewithSpecialChars);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
     });
 
     it('should save and load with non-ascii characters', async function () {
@@ -67,7 +66,6 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
@@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should be able to save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });
@@ -126,7 +126,7 @@ export default function ({ getService, getPageObjects }) {
       // check that it works after a save and reload
       const SAVE_NAME = 'viz w/ percents';
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(SAVE_NAME);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(SAVE_NAME);
       await PageObjects.visualize.waitForVisualization();
 

diff --git a/test/functional/apps/visualize/_data_table_nontimeindex.js b/test/functional/apps/visualize/_data_table_nontimeindex.js
@@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should be able to save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
@@ -47,7 +47,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
@@ -140,7 +140,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should be able to save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
@@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });
@@ -156,7 +156,7 @@ export default function ({ getService, getPageObjects }) {
 
       it('should correctly save disabled agg', async () => {
         await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-        await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
         await PageObjects.visualize.loadSavedVisualization(vizName1);
         await PageObjects.visualize.waitForRenderingCount();
 

diff --git a/test/functional/apps/visualize/_tag_cloud.js b/test/functional/apps/visualize/_tag_cloud.js
@@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -52,7 +52,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
@@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }) {
 
     it('should save and load', async function () {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
-      await PageObjects.visualize.waitForVisualizationSavedToastGone();
+
       await PageObjects.visualize.loadSavedVisualization(vizName1);
       await PageObjects.visualize.waitForVisualization();
     });

diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
@@ -409,6 +409,14 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
       });
       return response.status !== 200;
     }
+    async waitForSaveModalToClose() {
+      log.debug('Waiting for save modal to close');
+      await retry.try(async () => {
+        if (await testSubjects.exists('savedObjectSaveModal')) {
+          throw new Error('save modal still open');
+        }
+      });
+    }
   }
 
   return new CommonPage();