Merge branch 'enable-otel-k8-onboarding' of https://github.com/thomhe…

…ymann/kibana into enable-otel-k8-onboarding
elastic · Oct 16, 2024 · 1dc529b · 1dc529b
2 parents 32159c2 + 8dd379f
commit 1dc529b
Show file tree

Hide file tree

Showing 49 changed files with 335 additions and 101 deletions.
diff --git a/packages/kbn-esql-ast/src/parser/__tests__/columns.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/commands.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/from.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/function.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/inlinecast.test.ts b/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 (::)', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/literal.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/metrics.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/params.test.ts b/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';
 
 /**

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/rename.test.ts b/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', () => {
   /**

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/sort.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/__tests__/where.test.ts b/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', () => {

diff --git a/packages/kbn-esql-ast/src/parser/parser.ts b/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) => {

diff --git a/test/functional/apps/discover/group2_data_grid1/_data_grid_context.ts b/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'] });

diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
@@ -13,11 +13,11 @@ import { ConfigSchema } from '../config';
 import { encryptionKeyRotationServiceMock } from '../crypto/index.mock';
 
 export const routeDefinitionParamsMock = {
-  create: (config: Record<string, unknown> = {}) => ({
+  create: (config: Record<string, unknown> = {}, buildFlavor: BuildFlavor = 'traditional') => ({
     router: httpServiceMock.createRouter(),
     logger: loggingSystemMock.create().get(),
     config: ConfigSchema.validate(config) as ConfigType,
     encryptionKeyRotationService: encryptionKeyRotationServiceMock.create(),
-    buildFlavor: 'traditional' as BuildFlavor,
+    buildFlavor,
   }),
 };
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
@@ -44,6 +44,7 @@ describe('Key rotation routes', () => {
 
     it('correctly defines route.', () => {
       expect(routeConfig.options).toEqual({
+        access: 'public',
         tags: ['access:rotateEncryptionKey', 'oas-tag:saved objects'],
         summary: `Rotate a key for encrypted saved objects`,
         description: `If a saved object cannot be decrypted using the primary encryption key, Kibana attempts to decrypt it using the specified decryption-only keys. In most of the cases this overhead is negligible, but if you're dealing with a large number of saved objects and experiencing performance issues, you may want to rotate the encryption key.
@@ -83,6 +84,25 @@ describe('Key rotation routes', () => {
       );
     });
 
+    it('defines route as internal when build flavor is serverless', () => {
+      const routeParamsMock = routeDefinitionParamsMock.create(
+        { keyRotation: { decryptionOnlyKeys: ['b'.repeat(32)] } },
+        'serverless'
+      );
+      defineKeyRotationRoutes(routeParamsMock);
+      const [config] = routeParamsMock.router.post.mock.calls.find(
+        ([{ path }]) => path === '/api/encrypted_saved_objects/_rotate_key'
+      )!;
+
+      expect(config.options).toEqual({
+        access: 'internal',
+        tags: ['access:rotateEncryptionKey', 'oas-tag:saved objects'],
+        summary: `Rotate a key for encrypted saved objects`,
+        description: `If a saved object cannot be decrypted using the primary encryption key, Kibana attempts to decrypt it using the specified decryption-only keys. In most of the cases this overhead is negligible, but if you're dealing with a large number of saved objects and experiencing performance issues, you may want to rotate the encryption key.
+        NOTE: Bulk key rotation can consume a considerable amount of resources and hence only user with a superuser role can trigger it.`,
+      });
+    });
+
     it('returns 400 if decryption only keys are not specified.', async () => {
       const routeParamsMock = routeDefinitionParamsMock.create();
       defineKeyRotationRoutes(routeParamsMock);

diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
@@ -41,7 +41,7 @@ export function defineKeyRotationRoutes({
       },
       options: {
         tags: ['access:rotateEncryptionKey', 'oas-tag:saved objects'],
-        access: buildFlavor === 'serverless' ? 'internal' : undefined,
+        access: buildFlavor === 'serverless' ? 'internal' : 'public',
         summary: `Rotate a key for encrypted saved objects`,
         description: `If a saved object cannot be decrypted using the primary encryption key, Kibana attempts to decrypt it using the specified decryption-only keys. In most of the cases this overhead is negligible, but if you're dealing with a large number of saved objects and experiencing performance issues, you may want to rotate the encryption key.
         NOTE: Bulk key rotation can consume a considerable amount of resources and hence only user with a superuser role can trigger it.`,

diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -173,7 +173,7 @@ export const SearchBar: FC<SearchBarProps> = (opts) => {
           reportEvent.searchRequest();
         }
 
-        const rawParams = parseSearchParams(searchValue.toLowerCase());
+        const rawParams = parseSearchParams(searchValue.toLowerCase(), searchableTypes);
         let tagIds: string[] | undefined;
         if (taggingApi && rawParams.filters.tags) {
           tagIds = rawParams.filters.tags.map(