From 8534faf7eeb090a59c3edb5f917cdb89ae7ff179 Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Thu, 28 Jan 2021 14:05:54 +0100
Subject: [PATCH] migrations v2: fix snapshot builds (#89541)

* migrations v2: fix snapshot builds

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

This reverts commit 8263d47d378315bdcad990620010c8452f3133d1.
---
 .../migrations/core/document_migrator.test.ts      | 14 --------------
 .../migrations/core/document_migrator.ts           |  3 +--
 .../migrations/kibana/kibana_migrator.test.ts      |  8 ++++++++
 .../migrations/kibana/kibana_migrator.ts           |  3 +--
 4 files changed, 10 insertions(+), 18 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
index 6ba652abda3d5..741f715ba6ebe 100644
--- 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
index e93586ec7ce4c..e4b89a949d3cf 100644
--- 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 };
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index 281d2ce8d03cf..dac93ff29b68f 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -31,6 +31,14 @@ const createRegistry = (types: Array<Partial<SavedObjectsType>>) => {
 };
 
 describe('KibanaMigrator', () => {
+  describe('constructor', () => {
+    it('coerces the current Kibana version if it has a hyphen', () => {
+      const options = mockOptions();
+      options.kibanaVersion = '3.2.1-SNAPSHOT';
+      const migrator = new KibanaMigrator(options);
+      expect(migrator.kibanaVersion).toEqual('3.2.1');
+    });
+  });
   describe('getActiveMappings', () => {
     it('returns full index mappings w/ core properties', () => {
       const options = mockOptions();
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
index c8bc4b2e14123..ecef84a6e297c 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -90,13 +90,12 @@ export class KibanaMigrator {
   }: KibanaMigratorOptions) {
     this.client = client;
     this.kibanaConfig = kibanaConfig;
-    this.kibanaVersion = kibanaVersion;
     this.savedObjectsConfig = savedObjectsConfig;
     this.typeRegistry = typeRegistry;
     this.serializer = new SavedObjectsSerializer(this.typeRegistry);
     this.mappingProperties = mergeTypes(this.typeRegistry.getAllTypes());
     this.log = logger;
-    this.kibanaVersion = kibanaVersion;
+    this.kibanaVersion = kibanaVersion.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);
     this.documentMigrator = new DocumentMigrator({
       kibanaVersion,
       typeRegistry,