Merge branch 'master' into 54012

elastic · Nov 23, 2020 · d0c9625 · d0c9625
2 parents 21a91aa + ea4ff59
commit d0c9625
Show file tree

Hide file tree

Showing 195 changed files with 2,006 additions and 1,032 deletions.
diff --git a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
@@ -127,9 +127,10 @@ export class BookEmbeddableFactoryDefinition
 
   private async unwrapMethod(savedObjectId: string): Promise<BookSavedObjectAttributes> {
     const { savedObjectsClient } = await this.getStartServices();
-    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<
-      BookSavedObjectAttributes
-    >(this.type, savedObjectId);
+    const savedObject: SimpleSavedObject<BookSavedObjectAttributes> = await savedObjectsClient.get<BookSavedObjectAttributes>(
+      this.type,
+      savedObjectId
+    );
     return { ...savedObject.attributes };
   }
 
@@ -163,9 +164,9 @@ export class BookEmbeddableFactoryDefinition
 
   private async getAttributeService() {
     if (!this.attributeService) {
-      this.attributeService = (await this.getStartServices()).getAttributeService<
-        BookSavedObjectAttributes
-      >(this.type, {
+      this.attributeService = (
+        await this.getStartServices()
+      ).getAttributeService<BookSavedObjectAttributes>(this.type, {
         saveMethod: this.saveMethod.bind(this),
         unwrapMethod: this.unwrapMethod.bind(this),
         checkForDuplicateTitle: this.checkForDuplicateTitleMethod.bind(this),

diff --git a/package.json b/package.json
@@ -92,6 +92,7 @@
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/minimist": "^1.2.5",
     "**/node-jose/node-forge": "^0.10.0",
+    "**/prismjs": "1.22.0",
     "**/request": "^2.88.2",
     "**/trim": "0.0.3",
     "**/typescript": "4.0.2"
@@ -510,7 +511,7 @@
     "@types/pdfmake": "^0.1.15",
     "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.4.0",
-    "@types/prettier": "^2.0.2",
+    "@types/prettier": "^2.1.5",
     "@types/pretty-ms": "^5.0.0",
     "@types/prop-types": "^15.7.3",
     "@types/proper-lockfile": "^3.0.1",
@@ -626,7 +627,7 @@
     "enzyme-adapter-utils": "^1.13.0",
     "enzyme-to-json": "^3.4.4",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-import-resolver-node": "0.3.2",
     "eslint-import-resolver-webpack": "0.11.1",
     "eslint-module-utils": "2.5.0",
@@ -762,7 +763,7 @@
     "postcss": "^7.0.32",
     "postcss-loader": "^3.0.0",
     "postcss-prefix-selector": "^1.7.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.2.0",
     "pretty-ms": "5.0.0",
     "proxyquire": "1.8.0",
     "querystring": "^0.2.0",

diff --git a/packages/kbn-test/src/functional_test_runner/lib/snapshots/decorate_snapshot_ui.ts b/packages/kbn-test/src/functional_test_runner/lib/snapshots/decorate_snapshot_ui.ts
@@ -196,6 +196,7 @@ function getSnapshotState(file: string, test: Test, updateSnapshots: boolean) {
     path.join(dirname + `/__snapshots__/` + filename.replace(path.extname(filename), '.snap')),
     {
       updateSnapshot: updateSnapshots ? 'all' : 'new',
+      // @ts-expect-error
       getPrettier: () => prettier,
       getBabelTraverse: () => babelTraverse,
     }

diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -57,7 +57,9 @@ let coreContext: CoreContext;
 const logger = loggingSystemMock.create();
 
 let mockClusterClientInstance: ReturnType<typeof elasticsearchClientMock.createCustomClusterClient>;
-let mockLegacyClusterClientInstance: ReturnType<typeof elasticsearchServiceMock.createLegacyCustomClusterClient>;
+let mockLegacyClusterClientInstance: ReturnType<
+  typeof elasticsearchServiceMock.createLegacyCustomClusterClient
+>;
 
 beforeEach(() => {
   env = Env.createDefault(REPO_ROOT, getEnvOptions());

diff --git a/src/core/server/saved_objects/migrations/mocks.ts b/src/core/server/saved_objects/migrations/mocks.ts
@@ -20,9 +20,7 @@
 import { SavedObjectMigrationContext } from './types';
 import { SavedObjectsMigrationLogger } from './core';
 
-export const createSavedObjectsMigrationLoggerMock = (): jest.Mocked<
-  SavedObjectsMigrationLogger
-> => {
+export const createSavedObjectsMigrationLoggerMock = (): jest.Mocked<SavedObjectsMigrationLogger> => {
   const mock = {
     debug: jest.fn(),
     info: jest.fn(),

diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -217,9 +217,8 @@ describe('SavedObjectsService', () => {
       await soService.setup(setupDeps);
       soService.start(createStartDeps());
       expect(migratorInstanceMock.runMigrations).toHaveBeenCalledTimes(0);
-      ((setupDeps.elasticsearch.esNodesCompatibility$ as any) as BehaviorSubject<
-        NodesVersionCompatibility
-      >).next({
+      ((setupDeps.elasticsearch
+        .esNodesCompatibility$ as any) as BehaviorSubject<NodesVersionCompatibility>).next({
         isCompatible: true,
         incompatibleNodes: [],
         warningNodes: [],

diff --git a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
@@ -66,9 +66,7 @@ describe('SavedObjectsRepository#createRepository', () => {
   });
 
   const migrator = mockKibanaMigrator.create({ types: typeRegistry.getAllTypes() });
-  const RepositoryConstructor = (SavedObjectsRepository as unknown) as jest.Mock<
-    SavedObjectsRepository
-  >;
+  const RepositoryConstructor = (SavedObjectsRepository as unknown) as jest.Mock<SavedObjectsRepository>;
 
   beforeEach(() => {
     RepositoryConstructor.mockClear();

diff --git a/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
@@ -368,20 +368,21 @@ export class LegacyCoreEditor implements CoreEditor {
 
     // disable standard context based autocompletion.
     // @ts-ignore
-    ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function (
-      require: any,
-      exports: any
-    ) {
-      exports.getCompletions = function (
-        innerEditor: any,
-        session: any,
-        pos: any,
-        prefix: any,
-        callback: any
-      ) {
-        callback(null, []);
-      };
-    });
+    ace.define(
+      'ace/autocomplete/text_completer',
+      ['require', 'exports', 'module'],
+      function (require: any, exports: any) {
+        exports.getCompletions = function (
+          innerEditor: any,
+          session: any,
+          pos: any,
+          prefix: any,
+          callback: any
+        ) {
+          callback(null, []);
+        };
+      }
+    );
 
     const langTools = ace.acequire('ace/ext/language_tools');
 

diff --git a/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js
@@ -84,90 +84,93 @@ describe('Integration', () => {
         changeListener: function () {},
       }; // mimic auto complete
 
-      senseEditor.autocomplete._test.getCompletions(senseEditor, null, cursor, '', function (
-        err,
-        terms
-      ) {
-        if (testToRun.assertThrows) {
-          done();
-          return;
-        }
+      senseEditor.autocomplete._test.getCompletions(
+        senseEditor,
+        null,
+        cursor,
+        '',
+        function (err, terms) {
+          if (testToRun.assertThrows) {
+            done();
+            return;
+          }
 
-        if (err) {
-          throw err;
-        }
+          if (err) {
+            throw err;
+          }
 
-        if (testToRun.no_context) {
-          expect(!terms || terms.length === 0).toBeTruthy();
-        } else {
-          expect(terms).not.toBeNull();
-          expect(terms.length).toBeGreaterThan(0);
-        }
+          if (testToRun.no_context) {
+            expect(!terms || terms.length === 0).toBeTruthy();
+          } else {
+            expect(terms).not.toBeNull();
+            expect(terms.length).toBeGreaterThan(0);
+          }
 
-        if (!terms || terms.length === 0) {
-          done();
-          return;
-        }
+          if (!terms || terms.length === 0) {
+            done();
+            return;
+          }
 
-        if (testToRun.autoCompleteSet) {
-          const expectedTerms = _.map(testToRun.autoCompleteSet, function (t) {
-            if (typeof t !== 'object') {
-              t = { name: t };
-            }
-            return t;
-          });
-          if (terms.length !== expectedTerms.length) {
-            expect(_.map(terms, 'name')).toEqual(_.map(expectedTerms, 'name'));
-          } else {
-            const filteredActualTerms = _.map(terms, function (actualTerm, i) {
-              const expectedTerm = expectedTerms[i];
-              const filteredTerm = {};
-              _.each(expectedTerm, function (v, p) {
-                filteredTerm[p] = actualTerm[p];
-              });
-              return filteredTerm;
+          if (testToRun.autoCompleteSet) {
+            const expectedTerms = _.map(testToRun.autoCompleteSet, function (t) {
+              if (typeof t !== 'object') {
+                t = { name: t };
+              }
+              return t;
             });
-            expect(filteredActualTerms).toEqual(expectedTerms);
+            if (terms.length !== expectedTerms.length) {
+              expect(_.map(terms, 'name')).toEqual(_.map(expectedTerms, 'name'));
+            } else {
+              const filteredActualTerms = _.map(terms, function (actualTerm, i) {
+                const expectedTerm = expectedTerms[i];
+                const filteredTerm = {};
+                _.each(expectedTerm, function (v, p) {
+                  filteredTerm[p] = actualTerm[p];
+                });
+                return filteredTerm;
+              });
+              expect(filteredActualTerms).toEqual(expectedTerms);
+            }
           }
-        }
 
-        const context = terms[0].context;
-        const {
-          cursor: { lineNumber, column },
-        } = testToRun;
-        senseEditor.autocomplete._test.addReplacementInfoToContext(
-          context,
-          { lineNumber, column },
-          terms[0].value
-        );
+          const context = terms[0].context;
+          const {
+            cursor: { lineNumber, column },
+          } = testToRun;
+          senseEditor.autocomplete._test.addReplacementInfoToContext(
+            context,
+            { lineNumber, column },
+            terms[0].value
+          );
 
-        function ac(prop, propTest) {
-          if (typeof testToRun[prop] !== 'undefined') {
-            if (propTest) {
-              propTest(context[prop], testToRun[prop], prop);
-            } else {
-              expect(context[prop]).toEqual(testToRun[prop]);
+          function ac(prop, propTest) {
+            if (typeof testToRun[prop] !== 'undefined') {
+              if (propTest) {
+                propTest(context[prop], testToRun[prop], prop);
+              } else {
+                expect(context[prop]).toEqual(testToRun[prop]);
+              }
             }
           }
-        }
 
-        function posCompare(actual, expected) {
-          expect(actual.lineNumber).toEqual(expected.lineNumber + lineOffset);
-          expect(actual.column).toEqual(expected.column);
-        }
+          function posCompare(actual, expected) {
+            expect(actual.lineNumber).toEqual(expected.lineNumber + lineOffset);
+            expect(actual.column).toEqual(expected.column);
+          }
 
-        function rangeCompare(actual, expected, name) {
-          posCompare(actual.start, expected.start, name + '.start');
-          posCompare(actual.end, expected.end, name + '.end');
-        }
+          function rangeCompare(actual, expected, name) {
+            posCompare(actual.start, expected.start, name + '.start');
+            posCompare(actual.end, expected.end, name + '.end');
+          }
 
-        ac('prefixToAdd');
-        ac('suffixToAdd');
-        ac('addTemplate');
-        ac('textBoxPosition', posCompare);
-        ac('rangeToReplace', rangeCompare);
-        done();
-      });
+          ac('prefixToAdd');
+          ac('suffixToAdd');
+          ac('addTemplate');
+          ac('textBoxPosition', posCompare);
+          ac('rangeToReplace', rangeCompare);
+          done();
+        }
+      );
     });
   }
 

diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -179,9 +179,7 @@ export class DashboardPlugin
     core: CoreSetup<StartDependencies, DashboardStart>,
     { share, uiActions, embeddable, home, urlForwarding, data, usageCollection }: SetupDependencies
   ): DashboardSetup {
-    this.dashboardFeatureFlagConfig = this.initializerContext.config.get<
-      DashboardFeatureFlagConfig
-    >();
+    this.dashboardFeatureFlagConfig = this.initializerContext.config.get<DashboardFeatureFlagConfig>();
     const expandPanelAction = new ExpandPanelAction();
     uiActions.registerAction(expandPanelAction);
     uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id);

diff --git a/src/plugins/data/common/search/aggs/param_types/agg.ts b/src/plugins/data/common/search/aggs/param_types/agg.ts
@@ -20,9 +20,9 @@
 import { AggConfig, IAggConfig, AggConfigSerialized } from '../agg_config';
 import { BaseParamType } from './base';
 
-export class AggParamType<TAggConfig extends IAggConfig = IAggConfig> extends BaseParamType<
-  TAggConfig
-> {
+export class AggParamType<
+  TAggConfig extends IAggConfig = IAggConfig
+> extends BaseParamType<TAggConfig> {
   makeAgg: (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig;
   allowedAggs: string[] = [];
 

diff --git a/src/plugins/data/common/search/search_source/legacy/call_client.ts b/src/plugins/data/common/search/search_source/legacy/call_client.ts
@@ -28,10 +28,9 @@ export function callClient(
   fetchHandlers: FetchHandlers
 ) {
   // Correlate the options with the request that they're associated with
-  const requestOptionEntries: Array<[
-    SearchRequest,
-    ISearchOptions
-  ]> = searchRequests.map((request, i) => [request, requestsOptions[i]]);
+  const requestOptionEntries: Array<
+    [SearchRequest, ISearchOptions]
+  > = searchRequests.map((request, i) => [request, requestsOptions[i]]);
   const requestOptionsMap = new Map<SearchRequest, ISearchOptions>(requestOptionEntries);
   const requestResponseMap = new Map<SearchRequest, Promise<SearchResponse<any>>>();
 

diff --git a/src/plugins/embeddable/common/mocks.ts b/src/plugins/embeddable/common/mocks.ts
@@ -19,9 +19,7 @@
 
 import { EmbeddablePersistableStateService } from './types';
 
-export const createEmbeddablePersistableStateServiceMock = (): jest.Mocked<
-  EmbeddablePersistableStateService
-> => {
+export const createEmbeddablePersistableStateServiceMock = (): jest.Mocked<EmbeddablePersistableStateService> => {
   return {
     inject: jest.fn((state, references) => state),
     extract: jest.fn((state) => ({ state, references: [] })),

diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -244,9 +244,10 @@ export abstract class Container<
 
   private createNewExplicitEmbeddableInput<
     TEmbeddableInput extends EmbeddableInput = EmbeddableInput,
-    TEmbeddable extends IEmbeddable<TEmbeddableInput, EmbeddableOutput> = IEmbeddable<
-      TEmbeddableInput
-    >
+    TEmbeddable extends IEmbeddable<
+      TEmbeddableInput,
+      EmbeddableOutput
+    > = IEmbeddable<TEmbeddableInput>
   >(
     id: string,
     factory: EmbeddableFactory<TEmbeddableInput, any, TEmbeddable>,