[7.x] Backport code commits

package.json

@@ -207,7 +207,8 @@
     "react-color": "^2.13.8",
     "react-dom": "^16.8.0",
     "react-grid-layout": "^0.16.2",
-    "react-markdown": "^3.1.4",
+    "react-input-range": "^1.3.0",
+    "react-markdown": "^3.4.1",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.3.1",
     "react-sizeme": "^2.3.6",
@@ -272,6 +273,7 @@
     "@types/bluebird": "^3.1.1",
     "@types/boom": "^7.2.0",
     "@types/chance": "^1.0.0",
+    "@types/cheerio": "^0.22.10",
     "@types/chromedriver": "^2.38.0",
     "@types/classnames": "^2.2.3",
     "@types/d3": "^3.5.41",
@@ -284,7 +286,7 @@
     "@types/execa": "^0.9.0",
     "@types/fetch-mock": "7.2.1",
     "@types/getopts": "^2.0.1",
-    "@types/glob": "^5.0.35",
+    "@types/glob": "^7.1.1",
     "@types/globby": "^8.0.0",
     "@types/graphql": "^0.13.1",
     "@types/hapi": "^17.0.18",
@@ -320,7 +322,7 @@
     "@types/rimraf": "^2.0.2",
     "@types/selenium-webdriver": "^3.0.15",
     "@types/semver": "^5.5.0",
-    "@types/sinon": "^5.0.1",
+    "@types/sinon": "^7.0.0",
     "@types/strip-ansi": "^3.0.0",
     "@types/styled-components": "^3.0.1",
     "@types/supertest": "^2.0.5",
@@ -398,7 +400,7 @@
     "multistream": "^2.1.1",
     "murmurhash3js": "3.0.1",
     "mutation-observer": "^1.0.3",
-    "nock": "8.0.0",
+    "nock": "10.0.4",
     "node-sass": "^4.9.4",
     "normalize-path": "^3.0.0",
     "pixelmatch": "4.0.2",
@@ -412,7 +414,7 @@
     "sass-lint": "^1.12.1",
     "selenium-webdriver": "^4.0.0-alpha.1",
     "simple-git": "1.37.0",
-    "sinon": "^5.0.7",
+    "sinon": "^7.2.2",
     "strip-ansi": "^3.0.1",
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",

packages/kbn-ui-framework/package.json

@@ -65,7 +65,7 @@
     "redux": "3.7.2",
     "redux-thunk": "2.2.0",
     "sass-loader": "^7.1.0",
-    "sinon": "^5.0.7",
+    "sinon": "^7.2.2",
     "style-loader": "^0.23.1",
     "webpack": "^4.23.1",
     "webpack-dev-server": "^3.1.10",

src/cli/cluster/cluster_manager.js

@@ -181,6 +181,7 @@ export default class ClusterManager {
         /[\\\/](\..*|node_modules|bower_components|public|__[a-z0-9_]+__|coverage)[\\\/]/,
         /\.test\.js$/,
         ...extraIgnores,
+        'plugins/java_languageserver'
       ],
     });
 

src/cli_plugin/install/zip.js

@@ -132,7 +132,7 @@ export function extractArchive(archive, targetDir, extractPath) {
                 return reject(err);
               }
 
-              readStream.pipe(createWriteStream(fileName));
+              readStream.pipe(createWriteStream(fileName, { mode: entry.externalFileAttributes >>> 16 }));
               readStream.on('end', function () {
                 zipfile.readEntry();
               });

src/cli_plugin/install/zip.test.js

@@ -21,6 +21,7 @@ import rimraf from 'rimraf';
 import path from 'path';
 import os from 'os';
 import glob from 'glob';
+import fs from 'fs';
 import { analyzeArchive, extractArchive, _isDirectory } from './zip';
 
 describe('kibana cli', function () {
@@ -72,6 +73,28 @@ describe('kibana cli', function () {
       });
     });
 
+    describe('checkFilePermission', () => {
+      it('verify consistency of modes of files', async () => {
+        const archivePath = path.resolve(repliesPath, 'test_plugin.zip');
+
+        await extractArchive(archivePath, tempPath, 'kibana/libs');
+        const files = await glob.sync('**/*', { cwd: tempPath });
+
+        const expected = [
+          'executable',
+          'unexecutable'
+        ];
+        expect(files.sort()).toEqual(expected.sort());
+
+        const executableMode = '0' + (fs.statSync(path.resolve(tempPath, 'executable')).mode & parseInt('777', 8)).toString(8);
+        const unExecutableMode = '0' + (fs.statSync(path.resolve(tempPath, 'unexecutable')).mode & parseInt('777', 8)).toString(8);
+
+        expect(executableMode).toEqual('0755');
+        expect(unExecutableMode).toEqual('0644');
+
+      });
+    });
+
     it('handles a corrupt zip archive', async () => {
       try {
         await extractArchive(path.resolve(repliesPath, 'corrupt.zip'));

src/dev/build/build_distributables.js

@@ -44,6 +44,7 @@ import {
   ExtractNodeBuildsTask,
   InstallDependenciesTask,
   OptimizeBuildTask,
+  PatchNativeModulesTask,
   RemovePackageJsonDepsTask,
   RemoveWorkspacesTask,
   TranspileBabelTask,
@@ -131,6 +132,7 @@ export async function buildDistributables(options) {
    * directories and perform platform-specific steps
    */
   await run(CreateArchivesSourcesTask);
+  await run(PatchNativeModulesTask);
   await run(CleanExtraBinScriptsTask);
   await run(CleanExtraBrowsersTask);
   await run(CleanNodeBuildsTask);

src/dev/build/tasks/index.js

@@ -37,4 +37,5 @@ export * from './typecheck_typescript_task';
 export * from './transpile_scss_task';
 export * from './verify_env_task';
 export * from './write_sha_sums_task';
+export * from './patch_native_modules_task';
 export * from './path_length_task';

src/dev/build/tasks/patch_native_modules_task.js

@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { scanCopy, untar, deleteAll } from '../lib';
+import { createWriteStream } from 'fs';
+import { binaryInfo } from '../../../../x-pack/plugins/code/tasks/nodegit_info';
+import wreck from 'wreck';
+import mkdirp from 'mkdirp';
+import { dirname, join, basename } from 'path';
+import { createPromiseFromStreams } from '../../../legacy/utils/streams';
+
+async function download(url, destination, log) {
+  const response = await wreck.request('GET', url);
+
+  if (response.statusCode !== 200) {
+    throw new Error(
+      `Unexpected status code ${response.statusCode} when downloading ${url}`
+    );
+  }
+  mkdirp.sync(dirname(destination));
+  await createPromiseFromStreams([
+    response,
+    createWriteStream(destination)
+  ]);
+  log.debug('Downloaded ', url);
+}
+
+async function downloadAndExtractTarball(url, dest, log, retry) {
+  try {
+    await download(url, dest, log);
+    const extractDir = join(dirname(dest), basename(dest, '.tar.gz'));
+    await untar(dest, extractDir, {
+      strip: 1
+    });
+    return extractDir;
+  } catch (e) {
+    if (retry > 0) {
+      await downloadAndExtractTarball(url, dest, log, retry - 1);
+    } else {
+      throw e;
+    }
+  }
+}
+
+async function patchNodeGit(config, log, build, platform) {
+  const plat = platform.isWindows() ? 'win32' : platform.getName();
+  const arch = platform.getNodeArch().split('-')[1];
+  const { downloadUrl, packageName } = binaryInfo(plat, arch);
+
+  const downloadPath = build.resolvePathForPlatform(platform, '.nodegit_binaries', packageName);
+  const extractDir = await downloadAndExtractTarball(downloadUrl, downloadPath, log, 3);
+
+  const destination = build.resolvePathForPlatform(platform, 'node_modules/nodegit/build/Release');
+  log.debug('Replacing nodegit binaries from ', extractDir);
+  await deleteAll([destination], log);
+  await scanCopy({
+    source: extractDir,
+    destination: destination,
+    time: new Date(),
+  });
+  await deleteAll([extractDir, downloadPath], log);
+}
+
+
+
+export const PatchNativeModulesTask = {
+  description: 'Patching platform-specific native modules directories',
+  async run(config, log, build) {
+    await Promise.all(config.getTargetPlatforms().map(async platform => {
+      if (!build.isOss()) {
+        await patchNodeGit(config, log, build, platform);
+      }
+    }));
+  }
+};

src/legacy/ui/public/chrome/api/breadcrumbs.ts

@@ -72,6 +72,13 @@ function createBreadcrumbsApi(chrome: { [key: string]: any }) {
       filter(fn: (breadcrumb: Breadcrumb, i: number, all: Breadcrumb[]) => boolean) {
         newPlatformChrome.setBreadcrumbs(currentBreadcrumbs.filter(fn));
       },
+
+      /**
+       * Remove last element of the breadcrumb
+       */
+      pop() {
+        newPlatformChrome.setBreadcrumbs(currentBreadcrumbs.slice(0, -1));
+      },
     },
   };
 }

x-pack/index.js

@@ -18,6 +18,7 @@ import { dashboardMode } from './plugins/dashboard_mode';
 import { logstash } from './plugins/logstash';
 import { beats } from './plugins/beats_management';
 import { apm } from './plugins/apm';
+import { code } from './plugins/code';
 import { maps } from './plugins/maps';
 import { licenseManagement } from './plugins/license_management';
 import { cloud } from './plugins/cloud';
@@ -55,6 +56,7 @@ module.exports = function (kibana) {
     logstash(kibana),
     beats(kibana),
     apm(kibana),
+    code(kibana),
     maps(kibana),
     canvas(kibana),
     licenseManagement(kibana),