Merge

.teamcity/src/builds/PullRequestCi.kt

@@ -3,6 +3,7 @@ package builds
 import builds.default.DefaultSavedObjectFieldMetrics
 import dependsOn
 import getProjectBranch
+import isReportingEnabled
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
 import vcs.Kibana
@@ -63,6 +64,7 @@ object PullRequestCi : BuildType({
 
   features {
     commitStatusPublisher {
+      enabled = isReportingEnabled()
       vcsRootExtId = "${Kibana.id}"
       publisher = github {
         githubUrl = "https://api.github.com"

.teamcity/src/builds/test/QuickTests.kt

@@ -13,7 +13,7 @@ object QuickTests : BuildType({
 
   val testScripts = mapOf(
     "Test Hardening" to ".ci/teamcity/checks/test_hardening.sh",
-    "Test Projects" to ".ci/teamcity/tests/test_projects.sh",
+    "Test Projects" to ".ci/teamcity/tests/test_projects.sh"
   )
 
   steps {

docs/development/core/server/kibana-plugin-core-server.savedobjectmigrationmap.md

@@ -18,7 +18,7 @@ export interface SavedObjectMigrationMap
 
 
 ```typescript
-const migrations: SavedObjectMigrationMap = {
+const migrationsMap: SavedObjectMigrationMap = {
   '1.0.0': migrateToV1,
   '2.1.0': migrateToV21
 }

docs/development/core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md

@@ -38,7 +38,7 @@ export const myType: SavedObjectsType = {
   },
   migrations: {
     '2.0.0': migrations.migrateToV2,
-    '2.1.0': migrations.migrateToV2_1
+    '2.1.0': migrations.migrateToV2_1,
   },
 };
 

docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md

@@ -23,7 +23,7 @@ This is only internal for now, and will only be public when we expose the regist
 |  [indexPattern](./kibana-plugin-core-server.savedobjectstype.indexpattern.md) | <code>string</code> | If defined, the type instances will be stored in the given index instead of the default one. |
 |  [management](./kibana-plugin-core-server.savedobjectstype.management.md) | <code>SavedObjectsTypeManagementDefinition</code> | An optional [saved objects management section](./kibana-plugin-core-server.savedobjectstypemanagementdefinition.md) definition for the type. |
 |  [mappings](./kibana-plugin-core-server.savedobjectstype.mappings.md) | <code>SavedObjectsTypeMappingDefinition</code> | The [mapping definition](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) for the type. |
-|  [migrations](./kibana-plugin-core-server.savedobjectstype.migrations.md) | <code>SavedObjectMigrationMap</code> | An optional map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used to migrate the type. |
+|  [migrations](./kibana-plugin-core-server.savedobjectstype.migrations.md) | <code>SavedObjectMigrationMap &#124; (() =&gt; SavedObjectMigrationMap)</code> | An optional map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) or a function returning a map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used to migrate the type. |
 |  [name](./kibana-plugin-core-server.savedobjectstype.name.md) | <code>string</code> | The name of the type, which is also used as the internal id. |
 |  [namespaceType](./kibana-plugin-core-server.savedobjectstype.namespacetype.md) | <code>SavedObjectsNamespaceType</code> | The [namespace type](./kibana-plugin-core-server.savedobjectsnamespacetype.md) for the type. |
 

docs/development/core/server/kibana-plugin-core-server.savedobjectstype.migrations.md

@@ -4,10 +4,10 @@
 
 ## SavedObjectsType.migrations property
 
-An optional map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used to migrate the type.
+An optional map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) or a function returning a map of [migrations](./kibana-plugin-core-server.savedobjectmigrationfn.md) to be used to migrate the type.
 
 <b>Signature:</b>
 
 ```typescript
-migrations?: SavedObjectMigrationMap;
+migrations?: SavedObjectMigrationMap | (() => SavedObjectMigrationMap);
 ```

package.json

@@ -165,7 +165,7 @@
     "apollo-server-core": "^1.3.6",
     "apollo-server-errors": "^2.0.2",
     "apollo-server-hapi": "^1.3.6",
-    "archiver": "^3.1.1",
+    "archiver": "^5.2.0",
     "axios": "^0.21.1",
     "bluebird": "3.5.5",
     "brace": "0.11.1",
@@ -406,7 +406,7 @@
     "@types/accept": "3.1.1",
     "@types/angular": "^1.6.56",
     "@types/angular-mocks": "^1.7.0",
-    "@types/archiver": "^3.1.0",
+    "@types/archiver": "^5.1.0",
     "@types/babel__core": "^7.1.10",
     "@types/base64-js": "^1.2.5",
     "@types/bluebird": "^3.1.1",

src/core/server/saved_objects/migrations/core/document_migrator.test.ts

@@ -52,50 +52,84 @@ describe('DocumentMigrator', () => {
     };
   }
 
-  it('validates individual migration definitions', () => {
-    const invalidDefinition = {
-      kibanaVersion: '3.2.3',
-      typeRegistry: createRegistry({
-        name: 'foo',
-        migrations: _.noop as any,
-      }),
-      log: mockLogger,
-    };
-    expect(() => new DocumentMigrator(invalidDefinition)).toThrow(
-      /Migration for type foo should be an object/i
-    );
+  const createDefinition = (migrations: any) => ({
+    kibanaVersion: '3.2.3',
+    typeRegistry: createRegistry({
+      name: 'foo',
+      migrations: migrations as any,
+    }),
+    log: mockLogger,
   });
 
-  it('validates individual migration semvers', () => {
-    const invalidDefinition = {
-      kibanaVersion: '3.2.3',
-      typeRegistry: createRegistry({
-        name: 'foo',
-        migrations: {
-          bar: (doc) => doc,
-        },
-      }),
-      log: mockLogger,
-    };
-    expect(() => new DocumentMigrator(invalidDefinition)).toThrow(
-      /Expected all properties to be semvers/i
+  it('validates migration definition', () => {
+    expect(() => new DocumentMigrator(createDefinition(() => {}))).not.toThrow();
+    expect(() => new DocumentMigrator(createDefinition({}))).not.toThrow();
+    expect(() => new DocumentMigrator(createDefinition(123))).toThrow(
+      /Migration for type foo should be an object or a function/i
     );
   });
 
-  it('validates the migration function', () => {
-    const invalidDefinition = {
-      kibanaVersion: '3.2.3',
+  describe('#prepareMigrations', () => {
+    it('validates individual migration definitions', () => {
+      const invalidMigrator = new DocumentMigrator(createDefinition(() => 123));
+      const voidMigrator = new DocumentMigrator(createDefinition(() => {}));
+      const emptyObjectMigrator = new DocumentMigrator(createDefinition(() => ({})));
+
+      expect(invalidMigrator.prepareMigrations).toThrow(
+        /Migrations map for type foo should be an object/i
+      );
+      expect(voidMigrator.prepareMigrations).not.toThrow();
+      expect(emptyObjectMigrator.prepareMigrations).not.toThrow();
+    });
+
+    it('validates individual migration semvers', () => {
+      const withInvalidVersion = {
+        bar: (doc: any) => doc,
+        '1.2.3': (doc: any) => doc,
+      };
+      const migrationFn = new DocumentMigrator(createDefinition(() => withInvalidVersion));
+      const migrationObj = new DocumentMigrator(createDefinition(withInvalidVersion));
+
+      expect(migrationFn.prepareMigrations).toThrow(/Expected all properties to be semvers/i);
+      expect(migrationObj.prepareMigrations).toThrow(/Expected all properties to be semvers/i);
+    });
+
+    it('validates the migration function', () => {
+      const invalidVersionFunction = { '1.2.3': 23 as any };
+      const migrationFn = new DocumentMigrator(createDefinition(() => invalidVersionFunction));
+      const migrationObj = new DocumentMigrator(createDefinition(invalidVersionFunction));
+
+      expect(migrationFn.prepareMigrations).toThrow(/expected a function, but got 23/i);
+      expect(migrationObj.prepareMigrations).toThrow(/expected a function, but got 23/i);
+    });
+    it('validates definitions with migrations: Function | Objects', () => {
+      const validMigrationMap = { '1.2.3': () => {} };
+      const migrationFn = new DocumentMigrator(createDefinition(() => validMigrationMap));
+      const migrationObj = new DocumentMigrator(createDefinition(validMigrationMap));
+      expect(migrationFn.prepareMigrations).not.toThrow();
+      expect(migrationObj.prepareMigrations).not.toThrow();
+    });
+  });
+
+  it('throws if #prepareMigrations is not called before #migrate is called', () => {
+    const migrator = new DocumentMigrator({
+      ...testOpts(),
       typeRegistry: createRegistry({
-        name: 'foo',
+        name: 'user',
         migrations: {
-          '1.2.3': 23 as any,
+          '1.2.3': setAttr('attributes.name', 'Chris'),
         },
       }),
-      log: mockLogger,
-    };
-    expect(() => new DocumentMigrator(invalidDefinition)).toThrow(
-      /expected a function, but got 23/i
-    );
+    });
+
+    expect(() =>
+      migrator.migrate({
+        id: 'me',
+        type: 'user',
+        attributes: { name: 'Christopher' },
+        migrationVersion: {},
+      })
+    ).toThrow(/Migrations are not ready. Make sure prepareMigrations is called first./i);
   });
 
   it('migrates type and attributes', () => {
@@ -108,6 +142,8 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
+
     const actual = migrator.migrate({
       id: 'me',
       type: 'user',
@@ -141,6 +177,7 @@ describe('DocumentMigrator', () => {
       attributes: {},
       migrationVersion: {},
     };
+    migrator.prepareMigrations();
     const migratedDoc = migrator.migrate(originalDoc);
     expect(_.get(originalDoc, 'attributes.name')).toBeUndefined();
     expect(_.get(migratedDoc, 'attributes.name')).toBe('Mike');
@@ -156,6 +193,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'me',
       type: 'user',
@@ -196,6 +234,7 @@ describe('DocumentMigrator', () => {
         }
       ),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'me',
       type: 'user',
@@ -233,6 +272,7 @@ describe('DocumentMigrator', () => {
         }
       ),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'me',
       type: 'user',
@@ -263,6 +303,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'dog',
@@ -282,6 +323,7 @@ describe('DocumentMigrator', () => {
       ...testOpts(),
       kibanaVersion: '8.0.1',
     });
+    migrator.prepareMigrations();
     expect(() =>
       migrator.migrate({
         id: 'smelly',
@@ -304,6 +346,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     expect(() =>
       migrator.migrate({
         id: 'fleabag',
@@ -329,6 +372,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'dog',
@@ -361,6 +405,7 @@ describe('DocumentMigrator', () => {
         }
       ),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'dog',
@@ -396,6 +441,7 @@ describe('DocumentMigrator', () => {
         }
       ),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'foo',
@@ -430,6 +476,7 @@ describe('DocumentMigrator', () => {
         }
       ),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'dog',
@@ -454,6 +501,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
 
     expect(() =>
       migrator.migrate({
@@ -477,6 +525,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     expect(() =>
       migrator.migrate({
         id: 'smelly',
@@ -506,6 +555,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'cat',
@@ -530,6 +580,7 @@ describe('DocumentMigrator', () => {
         },
       }),
     });
+    migrator.prepareMigrations();
     const actual = migrator.migrate({
       id: 'smelly',
       type: 'cat',
@@ -565,6 +616,7 @@ describe('DocumentMigrator', () => {
       migrationVersion: {},
     };
     try {
+      migrator.prepareMigrations();
       migrator.migrate(_.cloneDeep(failedDoc));
       expect('Did not throw').toEqual('But it should have!');
     } catch (error) {
@@ -597,13 +649,14 @@ describe('DocumentMigrator', () => {
       attributes: {},
       migrationVersion: {},
     };
+    migrator.prepareMigrations();
     migrator.migrate(doc);
     expect(loggingSystemMock.collect(mockLoggerFactory).info[0][0]).toEqual(logTestMsg);
     expect(loggingSystemMock.collect(mockLoggerFactory).warn[1][0]).toEqual(logTestMsg);
   });
 
   test('extracts the latest migration version info', () => {
-    const { migrationVersion } = new DocumentMigrator({
+    const migrator = new DocumentMigrator({
       ...testOpts(),
       typeRegistry: createRegistry(
         {
@@ -624,7 +677,8 @@ describe('DocumentMigrator', () => {
       ),
     });
 
-    expect(migrationVersion).toEqual({
+    migrator.prepareMigrations();
+    expect(migrator.migrationVersion).toEqual({
       aaa: '10.4.0',
       bbb: '3.2.3',
     });