Merge branch 'master' into bazel/timelion-grammar

elastic · Sep 13, 2021 · ea45aee · ea45aee
2 parents 0e622b5 + f9f9070
commit ea45aee
Show file tree

Hide file tree

Showing 40 changed files with 1,295 additions and 630 deletions.
diff --git a/package.json b/package.json
@@ -83,7 +83,6 @@
     "**/pdfkit/crypto-js": "4.0.0",
     "**/react-syntax-highlighter": "^15.3.1",
     "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
-    "**/request": "^2.88.2",
     "**/trim": "1.0.1",
     "**/typescript": "4.1.3",
     "**/underscore": "^1.13.1"
@@ -369,7 +368,6 @@
     "regenerator-runtime": "^0.13.3",
     "remark-parse": "^8.0.3",
     "remark-stringify": "^9.0.0",
-    "request": "^2.88.0",
     "require-in-the-middle": "^5.0.2",
     "reselect": "^4.0.0",
     "resize-observer-polyfill": "^1.5.0",
@@ -607,7 +605,6 @@
     "@types/recompose": "^0.30.6",
     "@types/reduce-reducers": "^1.0.0",
     "@types/redux-actions": "^2.6.1",
-    "@types/request": "^2.48.2",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
     "@types/selenium-webdriver": "^4.0.9",
     "@types/semver": "^7",

diff --git a/packages/kbn-ui-shared-deps/src/entry.js b/packages/kbn-ui-shared-deps/src/entry.js
@@ -56,3 +56,4 @@ export const KbnStd = require('@kbn/std');
 export const SaferLodashSet = require('@elastic/safer-lodash-set');
 export const RisonNode = require('rison-node');
 export const History = require('history');
+export const Classnames = require('classnames');
diff --git a/packages/kbn-ui-shared-deps/src/index.js b/packages/kbn-ui-shared-deps/src/index.js
@@ -101,6 +101,7 @@ exports.externals = {
   '@elastic/safer-lodash-set': '__kbnSharedDeps__.SaferLodashSet',
   'rison-node': '__kbnSharedDeps__.RisonNode',
   history: '__kbnSharedDeps__.History',
+  classnames: '__kbnSharedDeps__.Classnames',
 };
 
 /**

diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/migration_from_v1.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/migration_from_v1.test.ts
@@ -118,18 +118,23 @@ describe('migration v2', () => {
       .getTypeRegistry()
       .getAllTypes()
       .reduce((versionMap, type) => {
-        if (type.migrations) {
-          const migrationsMap =
-            typeof type.migrations === 'function' ? type.migrations() : type.migrations;
-          const highestVersion = Object.keys(migrationsMap).sort(Semver.compare).reverse()[0];
+        const { name, migrations, convertToMultiNamespaceTypeVersion } = type;
+        if (migrations || convertToMultiNamespaceTypeVersion) {
+          const migrationsMap = typeof migrations === 'function' ? migrations() : migrations;
+          const migrationsKeys = migrationsMap ? Object.keys(migrationsMap) : [];
+          if (convertToMultiNamespaceTypeVersion) {
+            // Setting this option registers a conversion migration that is reflected in the object's `migrationVersions` field
+            migrationsKeys.push(convertToMultiNamespaceTypeVersion);
+          }
+          const highestVersion = migrationsKeys.sort(Semver.compare).reverse()[0];
           return {
             ...versionMap,
-            [type.name]: highestVersion,
+            [name]: highestVersion,
           };
         } else {
           return {
             ...versionMap,
-            [type.name]: undefined,
+            [name]: undefined,
           };
         }
       }, {} as Record<string, string | undefined>);