Merge branch 'master' into nls/api-moves

.github/workflows/backport.yml

@@ -9,9 +9,14 @@ on:
 jobs:
   backport:
     name: Backport PR
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'auto-backport')
+    if: |
+      github.event.pull_request.merged == true
+      && contains(github.event.pull_request.labels.*.name, 'auto-backport')
+      && (
+        (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
+        || (github.event.action == 'closed')
+      )
     runs-on: ubuntu-latest
-
     steps:
       - name: 'Get backport config'
         run: |

docs/dev-tools/searchprofiler/getting-started.asciidoc

@@ -2,7 +2,7 @@
 [[profiler-getting-started]]
 === Getting Started
 
-The {searchprofiler} is automatically enabled in {kib}. Open the main menu, click *Dev Tools*, then click *Search Profiler*
+The {searchprofiler} is automatically enabled in {kib}. Open the main menu, click *Dev Tools*, then click *{searchprofiler}*
 to get started.
 
 {searchprofiler} displays the names of the indices searched, the shards in each index,

docs/developer/plugin-list.asciidoc

@@ -318,10 +318,6 @@ Failure to have auth enabled in Kibana will make for a broken UI. UI-based error
 |The cloud plugin adds cloud specific features to Kibana.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/code[code]
-|WARNING: Missing README.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/console_extensions/README.md[consoleExtensions]
 |This plugin provides autocomplete definitions of licensed APIs to the OSS Console plugin.
 

docs/user/dev-tools.asciidoc

@@ -15,7 +15,7 @@ a| <<console-kibana, Console>>
 | Interact with the REST API of Elasticsearch, including sending requests
 and viewing API documentation.
 
-a| <<xpack-profiler, Search&nbsp;Profiler>>
+a| <<xpack-profiler, {searchprofiler}>>
 
 | Inspect and analyze your search queries.
 

packages/kbn-pm/dist/index.js

@@ -48147,13 +48147,13 @@ async function installBazelTools(repoRootPath) {
   const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
   const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
 
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Test if bazelisk is already installed in the correct version
+  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Check if we need to remove bazelisk from yarn
 
-  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available
+  await tryRemoveBazeliskFromYarnGlobal(); // Test if bazelisk is already installed in the correct version
 
-  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Check if we need to remove bazelisk from yarn
+  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available
 
-  await tryRemoveBazeliskFromYarnGlobal(); // Install bazelisk if not installed
+  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed
 
   if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
     _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`);

packages/kbn-pm/src/utils/bazel/install_tools.ts

@@ -83,15 +83,15 @@ export async function installBazelTools(repoRootPath: string) {
   // Check what globals are installed
   log.debug(`[bazel_tools] verify if bazelisk is installed`);
 
+  // Check if we need to remove bazelisk from yarn
+  await tryRemoveBazeliskFromYarnGlobal();
+
   // Test if bazelisk is already installed in the correct version
   const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion);
 
   // Test if bazel bin is available
   const isBazelBinAlreadyAvailable = await isBazelBinAvailable();
 
-  // Check if we need to remove bazelisk from yarn
-  await tryRemoveBazeliskFromYarnGlobal();
-
   // Install bazelisk if not installed
   if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
     log.info(`[bazel_tools] installing Bazel tools`);

scripts/build_ts_refs.js

@@ -7,4 +7,4 @@
  */
 
 require('../src/setup_node_env');
-require('../src/dev/typescript/build_refs').runBuildRefs();
+require('../src/dev/typescript').runBuildRefsCli();

src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/kibana.json

@@ -0,0 +1,6 @@
+{
+  "id": "codeCoverageTestPlugin",
+  "version": "kibana",
+  "server": true,
+  "ui": false
+}

src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/index.ts

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Plugin } from './plugin';
+
+export function plugin() {
+  return new Plugin();
+}

src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { CoreSetup } from 'kibana/server';
+
+export class Plugin {
+  constructor() {}
+
+  public setup(core: CoreSetup) {}
+
+  public start() {
+    // called after all plugins are set up
+  }
+
+  public stop() {
+    // called when plugin is torn down during Kibana's shutdown sequence
+  }
+}

src/dev/code_coverage/ingest_coverage/integration_tests/mocks/CODEOWNERS

@@ -3,4 +3,4 @@
 # For more info, see https://help.github.com/articles/about-codeowners/
 
 # App
-/x-pack/plugins/code/ @elastic/kibana-tre
+/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin @elastic/kibana-tre

src/dev/code_coverage/ingest_coverage/integration_tests/team_assignment.test.js

@@ -39,11 +39,8 @@ describe('Team Assignment', () => {
       const { stdout } = await execa('grep', ['tre', teamAssignmentsPath], { cwd: ROOT_DIR });
       const lines = stdout.split('\n').filter((line) => !line.includes('/target'));
       expect(lines).toEqual([
-        'x-pack/plugins/code/jest.config.js kibana-tre',
-        'x-pack/plugins/code/server/config.ts kibana-tre',
-        'x-pack/plugins/code/server/index.ts kibana-tre',
-        'x-pack/plugins/code/server/plugin.test.ts kibana-tre',
-        'x-pack/plugins/code/server/plugin.ts kibana-tre',
+        'src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/index.ts kibana-tre',
+        'src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts kibana-tre',
       ]);
     });
   });

src/dev/typescript/build_ts_refs.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import execa from 'execa';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
+
+export const REF_CONFIG_PATHS = [Path.resolve(REPO_ROOT, 'tsconfig.refs.json')];
+
+export async function buildAllTsRefs(log: ToolingLog) {
+  for (const path of REF_CONFIG_PATHS) {
+    const relative = Path.relative(REPO_ROOT, path);
+    log.debug(`Building TypeScript projects refs for ${relative}...`);
+    await execa(require.resolve('typescript/bin/tsc'), ['-b', relative, '--pretty'], {
+      cwd: REPO_ROOT,
+    });
+  }
+}

src/dev/typescript/build_ts_refs_cli.ts

@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { run } from '@kbn/dev-utils';
+import del from 'del';
+
+import { buildAllTsRefs, REF_CONFIG_PATHS } from './build_ts_refs';
+import { getOutputsDeep } from './ts_configfile';
+import { concurrentMap } from './concurrent_map';
+
+export async function runBuildRefsCli() {
+  run(
+    async ({ log, flags }) => {
+      if (flags.clean) {
+        const outDirs = getOutputsDeep(REF_CONFIG_PATHS);
+        log.info('deleting', outDirs.length, 'ts output directories');
+        await concurrentMap(100, outDirs, (outDir) => del(outDir));
+      }
+
+      await buildAllTsRefs(log);
+    },
+    {
+      description: 'Build TypeScript projects',
+      flags: {
+        boolean: ['clean'],
+      },
+      log: {
+        defaultLevel: 'debug',
+      },
+    }
+  );
+}

src/dev/typescript/concurrent_map.ts

@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as Rx from 'rxjs';
+import { mergeMap, toArray, map } from 'rxjs/operators';
+import { lastValueFrom } from '@kbn/std';
+
+export async function concurrentMap<T, T2>(
+  concurrency: number,
+  arr: T[],
+  fn: (item: T, i: number) => Promise<T2>
+): Promise<T2[]> {
+  return await lastValueFrom(
+    Rx.from(arr).pipe(
+      // execute items in parallel based on concurrency
+      mergeMap(async (item, index) => ({ index, result: await fn(item, index) }), concurrency),
+      // collect the results into an array
+      toArray(),
+      // sort items back into order and return array of just results
+      map((list) => list.sort((a, b) => a.index - b.index).map(({ result }) => result))
+    )
+  );
+}

src/dev/typescript/index.ts

@@ -11,3 +11,4 @@ export { filterProjectsByFlag } from './projects';
 export { getTsProjectForAbsolutePath } from './get_ts_project_for_absolute_path';
 export { execInProjects } from './exec_in_projects';
 export { runTypeCheckCli } from './run_type_check_cli';
+export * from './build_ts_refs_cli';

src/dev/typescript/project.ts

@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { readFileSync } from 'fs';
 import { basename, dirname, relative, resolve } from 'path';
 
 import { IMinimatch, Minimatch } from 'minimatch';
-import { parseConfigFileTextToJson } from 'typescript';
-
 import { REPO_ROOT } from '@kbn/utils';
 
+import { parseTsConfig } from './ts_configfile';
+
 function makeMatchers(directory: string, patterns: string[]) {
   return patterns.map(
     (pattern) =>
@@ -23,16 +22,6 @@ function makeMatchers(directory: string, patterns: string[]) {
   );
 }
 
-function parseTsConfig(path: string) {
-  const { error, config } = parseConfigFileTextToJson(path, readFileSync(path, 'utf8'));
-
-  if (error) {
-    throw error;
-  }
-
-  return config;
-}
-
 function testMatchers(matchers: IMinimatch[], path: string) {
   return matchers.some((matcher) => matcher.match(path));
 }

src/dev/typescript/run_type_check_cli.ts

@@ -13,7 +13,7 @@ import getopts from 'getopts';
 
 import { execInProjects } from './exec_in_projects';
 import { filterProjectsByFlag } from './projects';
-import { buildAllRefs } from './build_refs';
+import { buildAllTsRefs } from './build_ts_refs';
 
 export async function runTypeCheckCli() {
   const extraFlags: string[] = [];
@@ -69,7 +69,7 @@ export async function runTypeCheckCli() {
     process.exit();
   }
 
-  await buildAllRefs(log);
+  await buildAllTsRefs(log);
 
   const tscArgs = [
     // composite project cannot be used with --noEmit