Merge branch 'main' into ml-e5-disclaimer-flyout

packages/kbn-esql-ast/src/parser/__tests__/columns.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('Column Identifier Expressions', () => {
   it('can parse un-quoted identifiers', () => {

packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('commands', () => {
   describe('correctly formatted, basic usage', () => {

packages/kbn-esql-ast/src/parser/__tests__/from.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('FROM', () => {
   describe('correctly formatted', () => {

packages/kbn-esql-ast/src/parser/__tests__/function.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 import { Walker } from '../../walker';
 
 describe('function AST nodes', () => {

packages/kbn-esql-ast/src/parser/__tests__/inlinecast.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 import { ESQLFunction, ESQLInlineCast, ESQLSingleAstItem } from '../../types';
 
 describe('Inline cast (::)', () => {

packages/kbn-esql-ast/src/parser/__tests__/literal.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 import { ESQLLiteral } from '../../types';
 
 describe('literal expression', () => {

packages/kbn-esql-ast/src/parser/__tests__/metrics.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('METRICS', () => {
   describe('correctly formatted', () => {

packages/kbn-esql-ast/src/parser/__tests__/params.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 import { Walker } from '../../walker';
 
 /**

packages/kbn-esql-ast/src/parser/__tests__/rename.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('RENAME', () => {
   /**

packages/kbn-esql-ast/src/parser/__tests__/sort.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('SORT', () => {
   describe('correctly formatted', () => {

packages/kbn-esql-ast/src/parser/__tests__/where.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { getAstAndSyntaxErrors as parse } from '..';
+import { parse } from '..';
 
 describe('WHERE', () => {
   describe('correctly formatted', () => {

packages/kbn-esql-ast/src/parser/parser.ts

@@ -100,33 +100,66 @@ export interface ParseResult {
 }
 
 export const parse = (text: string | undefined, options: ParseOptions = {}): ParseResult => {
-  if (text == null) {
-    const commands: ESQLAstQueryExpression['commands'] = [];
-    return { ast: commands, root: Builder.expression.query(commands), errors: [], tokens: [] };
+  try {
+    if (text == null) {
+      const commands: ESQLAstQueryExpression['commands'] = [];
+      return { ast: commands, root: Builder.expression.query(commands), errors: [], tokens: [] };
+    }
+    const errorListener = new ESQLErrorListener();
+    const parseListener = new ESQLAstBuilderListener();
+    const { tokens, parser } = getParser(
+      CharStreams.fromString(text),
+      errorListener,
+      parseListener
+    );
+
+    parser[GRAMMAR_ROOT_RULE]();
+
+    const errors = errorListener.getErrors().filter((error) => {
+      return !SYNTAX_ERRORS_TO_IGNORE.includes(error.message);
+    });
+    const { ast: commands } = parseListener.getAst();
+    const root = Builder.expression.query(commands, {
+      location: {
+        min: 0,
+        max: text.length - 1,
+      },
+    });
+
+    if (options.withFormatting) {
+      const decorations = collectDecorations(tokens);
+      attachDecorations(root, tokens.tokens, decorations.lines);
+    }
+
+    return { root, ast: commands, errors, tokens: tokens.tokens };
+  } catch (error) {
+    /**
+     * Parsing should never fail, meaning this branch should never execute. But
+     * if it does fail, we want to log the error message for easier debugging.
+     */
+    // eslint-disable-next-line no-console
+    console.error(error);
+
+    const root = Builder.expression.query();
+
+    return {
+      root,
+      ast: root.commands,
+      errors: [
+        {
+          startLineNumber: 0,
+          endLineNumber: 0,
+          startColumn: 0,
+          endColumn: 0,
+          message:
+            'Parsing internal error: ' +
+            (!!error && typeof error === 'object' ? String(error.message) : String(error)),
+          severity: 'error',
+        },
+      ],
+      tokens: [],
+    };
   }
-  const errorListener = new ESQLErrorListener();
-  const parseListener = new ESQLAstBuilderListener();
-  const { tokens, parser } = getParser(CharStreams.fromString(text), errorListener, parseListener);
-
-  parser[GRAMMAR_ROOT_RULE]();
-
-  const errors = errorListener.getErrors().filter((error) => {
-    return !SYNTAX_ERRORS_TO_IGNORE.includes(error.message);
-  });
-  const { ast: commands } = parseListener.getAst();
-  const root = Builder.expression.query(commands, {
-    location: {
-      min: 0,
-      max: text.length - 1,
-    },
-  });
-
-  if (options.withFormatting) {
-    const decorations = collectDecorations(tokens);
-    attachDecorations(root, tokens.tokens, decorations.lines);
-  }
-
-  return { root, ast: commands, errors, tokens: tokens.tokens };
 };
 
 export const parseErrors = (text: string) => {

test/functional/apps/discover/group2_data_grid1/_data_grid_context.ts

@@ -40,7 +40,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');
   const security = getService('security');
 
-  describe('discover data grid context tests', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/196120
+  describe.skip('discover data grid context tests', () => {
     before(async () => {
       await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });

x-pack/packages/security/plugin_types_public/index.ts

@@ -24,3 +24,4 @@ export type {
 } from './src/roles';
 export { PrivilegesAPIClientPublicContract } from './src/privileges';
 export type { PrivilegesAPIClientGetAllArgs } from './src/privileges';
+export type { SecurityLicense } from './src/license';

x-pack/packages/security/plugin_types_public/src/license/index.ts

@@ -0,0 +1,10 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SecurityPluginSetup } from '../plugin';
+
+export type SecurityLicense = SecurityPluginSetup['license'];

x-pack/plugins/actions/common/routes/connector/apis/execute/index.ts

@@ -0,0 +1,21 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export {
+  executeConnectorRequestParamsSchema,
+  executeConnectorRequestBodySchema,
+} from './schemas/latest';
+export type { ExecuteConnectorRequestParams, ExecuteConnectorRequestBody } from './types/latest';
+
+export {
+  executeConnectorRequestParamsSchema as executeConnectorRequestParamsSchemaV1,
+  executeConnectorRequestBodySchema as executeConnectorRequestBodySchemaV1,
+} from './schemas/v1';
+export type {
+  ExecuteConnectorRequestParams as ExecuteConnectorRequestParamsV1,
+  ExecuteConnectorRequestBody as ExecuteConnectorRequestBodyV1,
+} from './types/v1';

x-pack/plugins/actions/common/routes/connector/apis/execute/schemas/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './v1';

x-pack/plugins/actions/common/routes/connector/apis/execute/schemas/v1.ts

@@ -0,0 +1,20 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+export const executeConnectorRequestParamsSchema = schema.object({
+  id: schema.string({
+    meta: {
+      description: 'An identifier for the connector.',
+    },
+  }),
+});
+
+export const executeConnectorRequestBodySchema = schema.object({
+  params: schema.recordOf(schema.string(), schema.any()),
+});

x-pack/plugins/actions/common/routes/connector/apis/execute/types/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './v1';

x-pack/plugins/actions/common/routes/connector/apis/execute/types/v1.ts

@@ -0,0 +1,12 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TypeOf } from '@kbn/config-schema';
+import { executeConnectorRequestParamsSchemaV1, executeConnectorRequestBodySchemaV1 } from '..';
+
+export type ExecuteConnectorRequestParams = TypeOf<typeof executeConnectorRequestParamsSchemaV1>;
+export type ExecuteConnectorRequestBody = TypeOf<typeof executeConnectorRequestBodySchemaV1>;

x-pack/plugins/actions/common/routes/connector/response/index.ts

@@ -6,21 +6,28 @@
  */
 
 // Latest
-export type { ConnectorResponse, AllConnectorsResponse } from './types/latest';
+export type {
+  ConnectorResponse,
+  AllConnectorsResponse,
+  ConnectorExecuteResponse,
+} from './types/latest';
 export {
   connectorResponseSchema,
   allConnectorsResponseSchema,
   connectorTypesResponseSchema,
+  connectorExecuteResponseSchema,
 } from './schemas/latest';
 
 // v1
 export type {
   ConnectorResponse as ConnectorResponseV1,
   AllConnectorsResponse as AllConnectorsResponseV1,
   ConnectorTypesResponse as ConnectorTypesResponseV1,
+  ConnectorExecuteResponse as ConnectorExecuteResponseV1,
 } from './types/v1';
 export {
   connectorResponseSchema as connectorResponseSchemaV1,
   allConnectorsResponseSchema as connectorWithExtraFindDataSchemaV1,
   connectorTypesResponseSchema as connectorTypesResponseSchemaV1,
+  connectorExecuteResponseSchema as connectorExecuteResponseSchemaV1,
 } from './schemas/v1';

x-pack/plugins/actions/common/routes/connector/response/schemas/latest.ts

@@ -8,3 +8,4 @@
 export { connectorResponseSchema } from './v1';
 export { allConnectorsResponseSchema } from './v1';
 export { connectorTypesResponseSchema } from './v1';
+export { connectorExecuteResponseSchema } from './v1';

x-pack/plugins/actions/common/routes/connector/response/schemas/v1.ts

@@ -98,3 +98,55 @@ export const connectorTypesResponseSchema = schema.object({
     meta: { description: 'Indicates whether the action is a system action.' },
   }),
 });
+
+export const connectorExecuteResponseSchema = schema.object({
+  connector_id: schema.string({
+    meta: {
+      description: 'The identifier for the connector.',
+    },
+  }),
+  status: schema.oneOf([schema.literal('ok'), schema.literal('error')], {
+    meta: {
+      description: 'The outcome of the connector execution.',
+    },
+  }),
+  message: schema.maybe(
+    schema.string({
+      meta: {
+        description: 'The connector execution error message.',
+      },
+    })
+  ),
+  service_message: schema.maybe(
+    schema.string({
+      meta: {
+        description: 'An error message that contains additional details.',
+      },
+    })
+  ),
+  data: schema.maybe(
+    schema.any({
+      meta: {
+        description: 'The connector execution data.',
+      },
+    })
+  ),
+  retry: schema.maybe(
+    schema.nullable(
+      schema.oneOf([schema.boolean(), schema.string()], {
+        meta: {
+          description:
+            'When the status is error, identifies whether the connector execution will retry .',
+        },
+      })
+    )
+  ),
+  errorSource: schema.maybe(
+    schema.oneOf([schema.literal('user'), schema.literal('framework')], {
+      meta: {
+        description:
+          'When the status is error, identifies whether the error is a framework error or a user error.',
+      },
+    })
+  ),
+});