Merge branch 'master' of github.com:elastic/kibana into add-logs-to-n…

…ode-details

* 'master' of github.com:elastic/kibana:
  Remove dependency of tests on strict SyntaxKind values (elastic#83440)
  [SecuritySolution] override timerange for prebuilt templates (elastic#82468)
  [Enterprise Search] Added a shouldShowActiveForSubroutes option (elastic#83338)
  [Lens] Make the dimension flyout panel stay close on outside click (elastic#83059)
  [Security Solution] Gracefully handle errors in detection rules install (elastic#83306)
  Fix advanced settings category sorting (elastic#83394)

packages/kbn-telemetry-tools/src/tools/__fixture__/all_extracted_collectors.ts

@@ -0,0 +1,37 @@
+/*
+ * 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 { parsedExternallyDefinedCollector } from './parsed_externally_defined_collector';
+import { parsedImportedSchemaCollector } from './parsed_imported_schema';
+import { parsedImportedUsageInterface } from './parsed_imported_usage_interface';
+import { parsedIndexedInterfaceWithNoMatchingSchema } from './parsed_indexed_interface_with_not_matching_schema';
+import { parsedNestedCollector } from './parsed_nested_collector';
+import { parsedSchemaDefinedWithSpreadsCollector } from './parsed_schema_defined_with_spreads_collector';
+import { parsedWorkingCollector } from './parsed_working_collector';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const allExtractedCollectors: ParsedUsageCollection[] = [
+  ...parsedExternallyDefinedCollector,
+  ...parsedImportedSchemaCollector,
+  ...parsedImportedUsageInterface,
+  parsedIndexedInterfaceWithNoMatchingSchema,
+  parsedNestedCollector,
+  parsedSchemaDefinedWithSpreadsCollector,
+  parsedWorkingCollector,
+];

packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts

@@ -36,16 +36,14 @@ export const parsedIndexedInterfaceWithNoMatchingSchema: ParsedUsageCollection =
     fetch: {
       typeName: 'Usage',
       typeDescriptor: {
-        '': {
-          '@@INDEX@@': {
-            count_1: {
-              kind: SyntaxKind.NumberKeyword,
-              type: 'NumberKeyword',
-            },
-            count_2: {
-              kind: SyntaxKind.NumberKeyword,
-              type: 'NumberKeyword',
-            },
+        '@@INDEX@@': {
+          count_1: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
+          },
+          count_2: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
           },
         },
       },

packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts

@@ -90,10 +90,10 @@ describe('checkCompatibleTypeDescriptor', () => {
     expect(incompatibles).toHaveLength(1);
     const { diff, message } = incompatibles[0];
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    expect(diff).toEqual({ '.@@INDEX@@.count_2.kind': 'number' });
+    expect(diff).toEqual({ '@@INDEX@@.count_2.kind': 'number' });
     expect(message).toHaveLength(1);
     expect(message).toEqual([
-      'incompatible Type key (Usage..@@INDEX@@.count_2): expected (undefined) got ("number").',
+      'incompatible Type key (Usage.@@INDEX@@.count_2): expected (undefined) got ("number").',
     ]);
   });
 

packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts

@@ -21,6 +21,7 @@ import * as ts from 'typescript';
 import * as path from 'path';
 import { extractCollectors, getProgramPaths } from './extract_collectors';
 import { parseTelemetryRC } from './config';
+import { allExtractedCollectors } from './__fixture__/all_extracted_collectors';
 
 describe('extractCollectors', () => {
   it('extracts collectors given rc file', async () => {
@@ -35,6 +36,6 @@ describe('extractCollectors', () => {
 
     const results = [...extractCollectors(programPaths, tsConfig)];
     expect(results).toHaveLength(8);
-    expect(results).toMatchSnapshot();
+    expect(results).toStrictEqual(allExtractedCollectors);
   });
 });