Merge branch 'master' into pr/jportner/80945

Fixed merge conflicts from #88594.
elastic · Jan 19, 2021 · 9ebec6c · 9ebec6c
2 parents 7796bc1 + f5c73a9
commit 9ebec6c
Show file tree

Hide file tree

Showing 95 changed files with 554 additions and 317 deletions.
diff --git a/.teamcity/src/builds/PullRequestCi.kt b/.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"

diff --git a/.teamcity/src/builds/test/QuickTests.kt b/.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 {

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectmigrationmap.md b/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
 }

diff --git a/.../core/server/kibana-plugin-core-server.savedobjectsservicesetup.registertype.md b/.../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,
   },
 };
 

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectstype.md
@@ -45,7 +45,7 @@ Note: a migration function can be optionally specified for the same version. |
 |  [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. |
 
diff --git a/...evelopment/core/server/kibana-plugin-core-server.savedobjectstype.migrations.md b/...evelopment/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);
 ```