Merge remote-tracking branch 'upstream/master' into 57394

elastic · Feb 18, 2020 · b65bb04 · b65bb04
2 parents d61b58c + 60f7081
commit b65bb04
Show file tree

Hide file tree

Showing 133 changed files with 4,236 additions and 3,243 deletions.
diff --git a/.ci/end2end.groovy b/.ci/end2end.groovy
@@ -25,7 +25,7 @@ pipeline {
     durabilityHint('PERFORMANCE_OPTIMIZED')
   }
   triggers {
-    issueCommentTrigger('(?i).*jenkins\\W+run\\W+(?:the\\W+)?e2e(?:\\W+please)?.*')
+    issueCommentTrigger('(?i)(retest|.*jenkins\\W+run\\W+(?:the\\W+)?e2e?.*)')
   }
   parameters {
     booleanParam(name: 'FORCE', defaultValue: false, description: 'Whether to force the run.')
@@ -60,8 +60,14 @@ pipeline {
         }
       }
       steps {
+        notifyStatus('Starting services', 'PENDING')
         dir("${APM_ITS}"){
-          sh './scripts/compose.py start master --no-kibana --no-xpack-secure'
+          sh './scripts/compose.py start master --no-kibana'
+        }
+      }
+      post {
+        unsuccessful {
+          notifyStatus('Environmental issue', 'FAILURE')
         }
       }
     }
@@ -77,10 +83,16 @@ pipeline {
         JENKINS_NODE_COOKIE = 'dontKillMe'
       }
       steps {
+        notifyStatus('Preparing kibana', 'PENDING')
         dir("${BASE_DIR}"){
           sh script: "${CYPRESS_DIR}/ci/prepare-kibana.sh"
         }
       }
+      post {
+        unsuccessful {
+          notifyStatus('Kibana warm up failed', 'FAILURE')
+        }
+      }
     }
     stage('Smoke Tests'){
       options { skipDefaultCheckout() }
@@ -91,6 +103,7 @@ pipeline {
         }
       }
       steps{
+        notifyStatus('Running smoke tests', 'PENDING')
         dir("${BASE_DIR}"){
           sh '''
             jobs -l
@@ -112,6 +125,12 @@ pipeline {
             archiveArtifacts(allowEmptyArchive: false, artifacts: 'apm-its.log')
           }
         }
+        unsuccessful {
+          notifyStatus('Test failures', 'FAILURE')
+        }
+        success {
+          notifyStatus('Tests passed', 'SUCCESS')
+        }
       }
     }
   }
@@ -123,3 +142,7 @@ pipeline {
     }
   }
 }
+
+def notifyStatus(String description, String status) {
+  withGithubNotify.notify('end2end-for-apm-ui', description, status, getBlueoceanDisplayURL())
+}
diff --git a/renovate.json5 b/renovate.json5
@@ -913,6 +913,14 @@
           '@types/tslib',
         ],
       },
+      {
+        groupSlug: 'use-resize-observer',
+        groupName: 'use-resize-observer related packages',
+        packageNames: [
+          'use-resize-observer',
+          '@types/use-resize-observer',
+        ],
+      },
       {
         groupSlug: 'uuid',
         groupName: 'uuid related packages',

diff --git a/src/core/server/http/test_utils.ts b/src/core/server/http/test_utils.ts
@@ -55,13 +55,14 @@ const defaultContext: CoreContext = {
   configService,
 };
 
+export const createCoreContext = (overrides: Partial<CoreContext> = {}): CoreContext => ({
+  ...defaultContext,
+  ...overrides,
+});
+
 /**
  * Creates a concrete HttpServer with a mocked context.
  */
 export const createHttpServer = (overrides: Partial<CoreContext> = {}): HttpService => {
-  const context = {
-    ...defaultContext,
-    ...overrides,
-  };
-  return new HttpService(context);
+  return new HttpService(createCoreContext(overrides));
 };
diff --git a/src/core/server/legacy/legacy_service.mock.ts b/src/core/server/legacy/legacy_service.mock.ts
@@ -29,6 +29,7 @@ const createDiscoverPluginsMock = (): LegacyServiceDiscoverPlugins => ({
     savedObjectMappings: [],
     savedObjectMigrations: {},
     savedObjectValidations: {},
+    savedObjectsManagement: {},
   },
   navLinks: [],
   pluginExtendedConfig: {

diff --git a/src/core/server/legacy/plugins/get_nav_links.test.ts b/src/core/server/legacy/plugins/get_nav_links.test.ts
@@ -35,6 +35,7 @@ const createLegacyExports = ({
   savedObjectSchemas: {},
   savedObjectMigrations: {},
   savedObjectValidations: {},
+  savedObjectsManagement: {},
 });
 
 const createPluginSpecs = (...ids: string[]): LegacyPluginSpec[] =>

diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
@@ -25,6 +25,7 @@ import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.
 import { httpServiceMock } from './http/http_service.mock';
 import { contextServiceMock } from './context/context_service.mock';
 import { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
+import { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
 import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 import { SharedGlobalConfig } from './plugins';
 import { InternalCoreSetup, InternalCoreStart } from './internal_types';
@@ -36,7 +37,6 @@ export { configServiceMock } from './config/config_service.mock';
 export { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
 export { httpServiceMock } from './http/http_service.mock';
 export { loggingServiceMock } from './logging/logging_service.mock';
-export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
 export { savedObjectsRepositoryMock } from './saved_objects/service/lib/repository.mock';
 export { typeRegistryMock as savedObjectsTypeRegistryMock } from './saved_objects/saved_objects_type_registry.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
@@ -168,10 +168,31 @@ function createInternalCoreStartMock() {
   return startDeps;
 }
 
+function createCoreRequestHandlerContextMock() {
+  return {
+    rendering: {
+      render: jest.fn(),
+    },
+    savedObjects: {
+      client: savedObjectsClientMock.create(),
+    },
+    elasticsearch: {
+      adminClient: elasticsearchServiceMock.createScopedClusterClient(),
+      dataClient: elasticsearchServiceMock.createScopedClusterClient(),
+    },
+    uiSettings: {
+      client: uiSettingsServiceMock.createClient(),
+    },
+  };
+}
+
 export const coreMock = {
   createSetup: createCoreSetupMock,
   createStart: createCoreStartMock,
   createInternalSetup: createInternalCoreSetupMock,
   createInternalStart: createInternalCoreStartMock,
   createPluginInitializerContext: pluginInitializerContextMock,
+  createRequestHandlerContext: createCoreRequestHandlerContextMock,
 };
+
+export { savedObjectsClientMock };
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
@@ -492,7 +492,6 @@ describe('getSortedObjectsForExport()', () => {
     const exportStream = await getSortedObjectsForExport({
       exportSizeLimit: 10000,
       savedObjectsClient,
-      types: ['index-pattern', 'search'],
       objects: [
         {
           type: 'index-pattern',
@@ -591,7 +590,6 @@ describe('getSortedObjectsForExport()', () => {
     const exportStream = await getSortedObjectsForExport({
       exportSizeLimit: 10000,
       savedObjectsClient,
-      types: ['index-pattern', 'search'],
       objects: [
         {
           type: 'search',
@@ -672,7 +670,6 @@ describe('getSortedObjectsForExport()', () => {
     const exportOpts = {
       exportSizeLimit: 1,
       savedObjectsClient,
-      types: ['index-pattern', 'search'],
       objects: [
         {
           type: 'index-pattern',

diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
@@ -84,6 +84,9 @@ async function fetchObjectsToExport({
   savedObjectsClient: SavedObjectsClientContract;
   namespace?: string;
 }) {
+  if ((types?.length ?? 0) > 0 && (objects?.length ?? 0) > 0) {
+    throw Boom.badRequest(`Can't specify both "types" and "objects" properties when exporting`);
+  }
   if (objects && objects.length > 0) {
     if (objects.length > exportSizeLimit) {
       throw Boom.badRequest(`Can't export more than ${exportSizeLimit} objects`);

diff --git a/src/core/server/saved_objects/index.ts b/src/core/server/saved_objects/index.ts
@@ -68,5 +68,5 @@ export { SavedObjectMigrationMap, SavedObjectMigrationFn } from './migrations';
 
 export { SavedObjectsType } from './types';
 
-export { config } from './saved_objects_config';
+export { savedObjectsConfig, savedObjectsMigrationConfig } from './saved_objects_config';
 export { SavedObjectTypeRegistry, ISavedObjectTypeRegistry } from './saved_objects_type_registry';
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -30,14 +30,14 @@ import { docValidator, PropertyValidators } from '../../validation';
 import { buildActiveMappings, CallCluster, IndexMigrator } from '../core';
 import { DocumentMigrator, VersionedTransformer } from '../core/document_migrator';
 import { createIndexMap } from '../core/build_index_map';
-import { SavedObjectsConfigType } from '../../saved_objects_config';
+import { SavedObjectsMigrationConfigType } from '../../saved_objects_config';
 import { ISavedObjectTypeRegistry } from '../../saved_objects_type_registry';
 import { SavedObjectsType } from '../../types';
 
 export interface KibanaMigratorOptions {
   callCluster: CallCluster;
   typeRegistry: ISavedObjectTypeRegistry;
-  savedObjectsConfig: SavedObjectsConfigType;
+  savedObjectsConfig: SavedObjectsMigrationConfigType;
   kibanaConfig: KibanaConfigType;
   kibanaVersion: string;
   logger: Logger;
@@ -51,7 +51,7 @@ export type IKibanaMigrator = Pick<KibanaMigrator, keyof KibanaMigrator>;
  */
 export class KibanaMigrator {
   private readonly callCluster: CallCluster;
-  private readonly savedObjectsConfig: SavedObjectsConfigType;
+  private readonly savedObjectsConfig: SavedObjectsMigrationConfigType;
   private readonly documentMigrator: VersionedTransformer;
   private readonly kibanaConfig: KibanaConfigType;
   private readonly log: Logger;

diff --git a/src/core/server/saved_objects/routes/bulk_create.ts b/src/core/server/saved_objects/routes/bulk_create.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { IRouter } from '../../http';
+
+export const registerBulkCreateRoute = (router: IRouter) => {
+  router.post(
+    {
+      path: '/_bulk_create',
+      validate: {
+        query: schema.object({
+          overwrite: schema.boolean({ defaultValue: false }),
+        }),
+        body: schema.arrayOf(
+          schema.object({
+            type: schema.string(),
+            id: schema.maybe(schema.string()),
+            attributes: schema.recordOf(schema.string(), schema.any()),
+            version: schema.maybe(schema.string()),
+            migrationVersion: schema.maybe(schema.recordOf(schema.string(), schema.string())),
+            references: schema.maybe(
+              schema.arrayOf(
+                schema.object({
+                  name: schema.string(),
+                  type: schema.string(),
+                  id: schema.string(),
+                })
+              )
+            ),
+          })
+        ),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const { overwrite } = req.query;
+      const result = await context.core.savedObjects.client.bulkCreate(req.body, { overwrite });
+      return res.ok({ body: result });
+    })
+  );
+};
diff --git a/...gacy/server/saved_objects/routes/index.ts → ...e/server/saved_objects/routes/bulk_get.ts b/...gacy/server/saved_objects/routes/index.ts → ...e/server/saved_objects/routes/bulk_get.ts
@@ -17,15 +17,26 @@
  * under the License.
  */
 
-export { createBulkCreateRoute } from './bulk_create';
-export { createBulkGetRoute } from './bulk_get';
-export { createCreateRoute } from './create';
-export { createDeleteRoute } from './delete';
-export { createFindRoute } from './find';
-export { createGetRoute } from './get';
-export { createImportRoute } from './import';
-export { createLogLegacyImportRoute } from './log_legacy_import';
-export { createResolveImportErrorsRoute } from './resolve_import_errors';
-export { createUpdateRoute } from './update';
-export { createBulkUpdateRoute } from './bulk_update';
-export { createExportRoute } from './export';
+import { schema } from '@kbn/config-schema';
+import { IRouter } from '../../http';
+
+export const registerBulkGetRoute = (router: IRouter) => {
+  router.post(
+    {
+      path: '/_bulk_get',
+      validate: {
+        body: schema.arrayOf(
+          schema.object({
+            type: schema.string(),
+            id: schema.string(),
+            fields: schema.maybe(schema.arrayOf(schema.string())),
+          })
+        ),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const result = await context.core.savedObjects.client.bulkGet(req.body);
+      return res.ok({ body: result });
+    })
+  );
+};
diff --git a/src/core/server/saved_objects/routes/bulk_update.ts b/src/core/server/saved_objects/routes/bulk_update.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { IRouter } from '../../http';
+
+export const registerBulkUpdateRoute = (router: IRouter) => {
+  router.put(
+    {
+      path: '/_bulk_update',
+      validate: {
+        body: schema.arrayOf(
+          schema.object({
+            type: schema.string(),
+            id: schema.string(),
+            attributes: schema.recordOf(schema.string(), schema.any()),
+            version: schema.maybe(schema.string()),
+            references: schema.maybe(
+              schema.arrayOf(
+                schema.object({
+                  name: schema.string(),
+                  type: schema.string(),
+                  id: schema.string(),
+                })
+              )
+            ),
+          })
+        ),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const savedObject = await context.core.savedObjects.client.bulkUpdate(req.body);
+      return res.ok({ body: savedObject });
+    })
+  );
+};