Merge branch '7.x' into backport/7.x/pr-65375

Author: elasticmachine

packages/kbn-dev-utils/src/precommit_hook/cli.ts

@@ -0,0 +1,50 @@
+/*
+ * 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 Path from 'path';
+import { chmod, writeFile } from 'fs';
+import { promisify } from 'util';
+
+import { run } from '../run';
+import { REPO_ROOT } from '../repo_root';
+import { SCRIPT_SOURCE } from './script_source';
+import { getGitDir } from './get_git_dir';
+
+const chmodAsync = promisify(chmod);
+const writeFileAsync = promisify(writeFile);
+
+run(
+  async ({ log }) => {
+    try {
+      const gitDir = await getGitDir();
+      const installPath = Path.resolve(REPO_ROOT, gitDir, 'hooks/pre-commit');
+
+      log.info(`Registering Kibana pre-commit git hook...`);
+      await writeFileAsync(installPath, SCRIPT_SOURCE);
+      await chmodAsync(installPath, 0o755);
+      log.success(`Kibana pre-commit git hook was installed successfully.`);
+    } catch (e) {
+      log.error(`Kibana pre-commit git hook was not installed as an error occur.`);
+      throw e;
+    }
+  },
+  {
+    description: 'Register git hooks in the local repo',
+  }
+);

src/dev/register_git_hook/index.js renamed to packages/kbn-dev-utils/src/precommit_hook/get_git_dir.ts

@@ -17,4 +17,16 @@
  * under the License.
  */
 
-export { registerPrecommitGitHook } from './register_git_hook';
+import execa from 'execa';
+
+import { REPO_ROOT } from '../repo_root';
+
+// Retrieves the correct location for the .git dir for
+// every git setup (including git worktree)
+export async function getGitDir() {
+  return (
+    await execa('git', ['rev-parse', '--git-common-dir'], {
+      cwd: REPO_ROOT,
+    })
+  ).stdout.trim();
+}

packages/kbn-dev-utils/src/precommit_hook/script_source.ts

@@ -0,0 +1,117 @@
+/*
+ * 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 os from 'os';
+
+import normalizePath from 'normalize-path';
+
+const HOME_DIR = normalizePath(os.homedir());
+
+export const SCRIPT_SOURCE = `#!/usr/bin/env bash
+#
+# ** THIS IS AN AUTO-GENERATED FILE **
+# ** PLEASE DO NOT CHANGE IT MANUALLY **
+#
+# GENERATED BY \`node scripts/register_git_hook\`
+# IF YOU WANNA CHANGE SOMETHING IN THIS SCRIPT
+# PLEASE RE-RUN 'yarn kbn bootstrap' or 'node scripts/register_git_hook'
+
+# pre-commit script takes zero arguments: https://git-scm.com/docs/githooks#_pre_commit
+
+set -euo pipefail
+
+# Make it possible to terminate pre commit hook
+# using ctrl-c so nothing else would happen or be
+# sent to the output.
+#
+# The correct exit code on that situation
+# according the linux documentation project is 130
+# https://www.tldp.org/LDP/abs/html/exitcodes.html
+trap "exit 130" INT
+
+has_node() {
+  command -v node >/dev/null 2>&1
+}
+
+has_nvm() {
+  command -v nvm >/dev/null 2>&1
+}
+
+try_load_node_from_nvm_paths () {
+  # If nvm is not loaded, load it
+  has_node || {
+    NVM_SH="${HOME_DIR}/.nvm/nvm.sh"
+
+    if [ "${process.platform}" == "darwin" ] && [ -s "$(brew --prefix nvm)/nvm.sh" ]; then
+      NVM_SH="$(brew --prefix nvm)/nvm.sh"
+    fi
+
+    export NVM_DIR="${HOME_DIR}/.nvm"
+
+    [ -s "$NVM_SH" ] && \. "$NVM_SH"
+
+    # If nvm has been loaded correctly, use project .nvmrc
+    has_nvm && nvm use
+  }
+}
+
+extend_user_path() {
+  if [ "${process.platform}" == "win32" ]; then
+    export PATH="$PATH:/c/Program Files/nodejs"
+  else
+    export PATH="$PATH:/usr/local/bin:/usr/local"
+    try_load_node_from_nvm_paths
+  fi
+}
+
+# Extend path with common path locations for node
+# in order to make the hook working on git GUI apps
+extend_user_path
+
+# Check if we have node js bin in path
+has_node || {
+  echo "Can't found node bin in the PATH. Please update the PATH to proceed."
+  echo "If your PATH already has the node bin, maybe you are using some git GUI app."
+  echo "Can't found node bin in the PATH. Please update the PATH to proceed."
+  echo "If your PATH already has the node bin, maybe you are using some git GUI app not launched from the shell."
+  echo "In order to proceed, you need to config the PATH used by the application that are launching your git GUI app."
+  echo "If you are running macOS, you can do that using:"
+  echo "'sudo launchctl config user path /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'"
+
+  exit 1
+}
+
+execute_precommit_hook() {
+  node scripts/precommit_hook || return 1
+
+  PRECOMMIT_FILE="./.git/hooks/pre-commit.local"
+  if [ -x "\${PRECOMMIT_FILE}" ]; then
+    echo "Executing local precommit hook found in \${PRECOMMIT_FILE}"
+    "$PRECOMMIT_FILE" || return 1
+  fi
+}
+
+execute_precommit_hook || {
+  echo "Pre-commit hook failed (add --no-verify to bypass)";
+  echo '  For eslint failures you can try running \`node scripts/precommit_hook --fix\`';
+  exit 1;
+}
+
+exit 0
+`;

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -135,9 +135,9 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
       // or which have require() statements that should be ignored because the file is
       // already bundled with all its necessary depedencies
       noParse: [
-        /[\///]node_modules[\///]elasticsearch-browser[\///]/,
-        /[\///]node_modules[\///]lodash[\///]index\.js$/,
-        /[\///]node_modules[\///]vega-lib[\///]build[\///]vega\.js$/,
+        /[\/\\]node_modules[\/\\]elasticsearch-browser[\/\\]/,
+        /[\/\\]node_modules[\/\\]lodash[\/\\]index\.js$/,
+        /[\/\\]node_modules[\/\\]vega-lib[\/\\]build[\/\\]vega\.js$/,
       ],
 
       rules: [

scripts/register_git_hook.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env');
-require('../src/dev/run_register_git_hook');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
+require('@kbn/dev-utils/target/precommit_hook/cli');

src/core/server/saved_objects/service/lib/repository.test.js

@@ -23,6 +23,7 @@ import { SavedObjectsErrorHelpers } from './errors';
 import { SavedObjectsSerializer } from '../../serialization';
 import { encodeHitVersion } from '../../version';
 import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
+import { DocumentMigrator } from '../../migrations/core/document_migrator';
 
 jest.mock('./search_dsl/search_dsl', () => ({ getSearchDsl: jest.fn() }));
 
@@ -115,6 +116,7 @@ describe('SavedObjectsRepository', () => {
   const createType = type => ({
     name: type,
     mappings: { properties: mappings.properties[type].properties },
+    migrations: { '1.1.1': doc => doc },
   });
 
   const registry = new SavedObjectTypeRegistry();
@@ -144,6 +146,13 @@ describe('SavedObjectsRepository', () => {
     namespaceType: 'agnostic',
   });
 
+  const documentMigrator = new DocumentMigrator({
+    typeRegistry: registry,
+    kibanaVersion: '2.0.0',
+    log: {},
+    validateDoc: jest.fn(),
+  });
+
   const getMockGetResponse = ({ type, id, references, namespace }) => ({
     // NOTE: Elasticsearch returns more fields (_index, _type) but the SavedObjectsRepository method ignores these
     found: true,
@@ -207,7 +216,7 @@ describe('SavedObjectsRepository', () => {
   beforeEach(() => {
     callAdminCluster = jest.fn();
     migrator = {
-      migrateDocument: jest.fn(doc => doc),
+      migrateDocument: jest.fn().mockImplementation(documentMigrator.migrate),
       runMigrations: async () => ({ status: 'skipped' }),
     };
 
@@ -424,9 +433,17 @@ describe('SavedObjectsRepository', () => {
 
     const getMockBulkCreateResponse = (objects, namespace) => {
       return {
-        items: objects.map(({ type, id }) => ({
+        items: objects.map(({ type, id, attributes, references, migrationVersion }) => ({
           create: {
             _id: `${namespace ? `${namespace}:` : ''}${type}:${id}`,
+            _source: {
+              [type]: attributes,
+              type,
+              namespace,
+              references,
+              ...mockTimestampFields,
+              migrationVersion: migrationVersion || { [type]: '1.1.1' },
+            },
             ...mockVersionProps,
           },
         })),
@@ -474,7 +491,7 @@ describe('SavedObjectsRepository', () => {
 
     const expectSuccessResult = obj => ({
       ...obj,
-      migrationVersion: undefined,
+      migrationVersion: { [obj.type]: '1.1.1' },
       version: mockVersion,
       ...mockTimestampFields,
     });
@@ -619,13 +636,16 @@ describe('SavedObjectsRepository', () => {
       };
 
       const bulkCreateError = async (obj, esError, expectedError) => {
-        const objects = [obj1, obj, obj2];
-        const response = getMockBulkCreateResponse(objects);
+        let response;
         if (esError) {
+          response = getMockBulkCreateResponse([obj1, obj, obj2]);
           response.items[1].create = { error: esError };
+        } else {
+          response = getMockBulkCreateResponse([obj1, obj2]);
         }
         callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
 
+        const objects = [obj1, obj, obj2];
         const result = await savedObjectsRepository.bulkCreate(objects);
         expectClusterCalls('bulk');
         const objCall = esError ? expectObjArgs(obj) : [];
@@ -781,14 +801,40 @@ describe('SavedObjectsRepository', () => {
           id: 'three',
         };
         const objects = [obj1, obj, obj2];
-        const response = getMockBulkCreateResponse(objects);
+        const response = getMockBulkCreateResponse([obj1, obj2]);
         callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
         const result = await savedObjectsRepository.bulkCreate(objects);
         expect(callAdminCluster).toHaveBeenCalledTimes(1);
         expect(result).toEqual({
           saved_objects: [expectSuccessResult(obj1), expectError(obj), expectSuccessResult(obj2)],
         });
       });
+
+      it(`a deserialized saved object`, async () => {
+        // Test for fix to https://github.com/elastic/kibana/issues/65088 where
+        // we returned raw ID's when an object without an id was created.
+        const namespace = 'myspace';
+        const response = getMockBulkCreateResponse([obj1, obj2], namespace);
+        callAdminCluster.mockResolvedValueOnce(response); // this._writeToCluster('bulk', ...)
+
+        // Bulk create one object with id unspecified, and one with id specified
+        const result = await savedObjectsRepository.bulkCreate([{ ...obj1, id: undefined }, obj2], {
+          namespace,
+        });
+
+        // Assert that both raw docs from the ES response are deserialized
+        expect(serializer.rawToSavedObject).toHaveBeenNthCalledWith(1, {
+          ...response.items[0].create,
+          _id: expect.stringMatching(/^myspace:config:[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/),
+        });
+        expect(serializer.rawToSavedObject).toHaveBeenNthCalledWith(2, response.items[1].create);
+
+        // Assert that ID's are deserialized to remove the type and namespace
+        expect(result.saved_objects[0].id).toEqual(
+          expect.stringMatching(/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/)
+        );
+        expect(result.saved_objects[1].id).toEqual(obj2.id);
+      });
     });
   });
 
@@ -1604,6 +1650,7 @@ describe('SavedObjectsRepository', () => {
           version: mockVersion,
           attributes,
           references,
+          migrationVersion: { [type]: '1.1.1' },
         });
       });
     });