Revert "Fix sharing saved objects phase 2 CI (#89056)"

This reverts commit 8263d47.
elastic · Jan 28, 2021 · 951d29a · 951d29a
1 parent 1693754
commit 951d29a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
@@ -206,20 +206,6 @@ describe('DocumentMigrator', () => {
       );
     });
 
-    it('coerces the current Kibana version if it has a hyphen', () => {
-      const validDefinition = {
-        kibanaVersion: '3.2.0-SNAPSHOT',
-        typeRegistry: createRegistry({
-          name: 'foo',
-          convertToMultiNamespaceTypeVersion: '3.2.0',
-          namespaceType: 'multiple',
-        }),
-        minimumConvertVersion: '0.0.0',
-        log: mockLogger,
-      };
-      expect(() => new DocumentMigrator(validDefinition)).not.toThrowError();
-    });
-
     it('validates convertToMultiNamespaceTypeVersion is not used on a patch version', () => {
       const invalidDefinition = {
         kibanaVersion: '3.2.3',

diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.ts b/src/core/server/saved_objects/migrations/core/document_migrator.ts
@@ -159,11 +159,10 @@ export class DocumentMigrator implements VersionedTransformer {
    */
   constructor({
     typeRegistry,
-    kibanaVersion: rawKibanaVersion,
+    kibanaVersion,
     minimumConvertVersion = DEFAULT_MINIMUM_CONVERT_VERSION,
     log,
   }: DocumentMigratorOptions) {
-    const kibanaVersion = rawKibanaVersion.split('-')[0]; // coerce a semver-like string (x.y.z-SNAPSHOT) or prerelease version (x.y.z-alpha) to a regular semver (x.y.z)
     validateMigrationDefinition(typeRegistry, kibanaVersion, minimumConvertVersion);
 
     this.documentMigratorOptions = { typeRegistry, kibanaVersion, log };