diff cleanup 1

elastic · Jun 2, 2020 · 1ba7ddd · 1ba7ddd
1 parent 2934c79
commit 1ba7ddd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/x-pack/plugins/reporting/server/config/create_config.test.ts b/x-pack/plugins/reporting/server/config/create_config.test.ts
@@ -6,9 +6,9 @@
 
 import * as Rx from 'rxjs';
 import { CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { ReportingConfigType } from './schema';
-import { createConfig$ } from './create_config';
 import { LevelLogger } from '../lib';
+import { createConfig$ } from './create_config';
+import { ReportingConfigType } from './schema';
 
 interface KibanaServer {
   host?: string;

diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -15,7 +15,7 @@ import { getDefaultChromiumSandboxDisabled } from './default_chromium_sandbox_di
 import { ReportingConfigType } from './schema';
 
 /*
- * Set up computed config defaults
+ * Set up dynamic config defaults
  * - xpack.capture.browser.chromium.disableSandbox
  * - xpack.kibanaServer
  * - xpack.reporting.encryptionKey

diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
@@ -21,7 +21,7 @@ export class ReportingPlugin
   implements Plugin<ReportingSetup, ReportingStart, ReportingSetupDeps, ReportingStartDeps> {
   private readonly initializerContext: PluginInitializerContext<ReportingConfigType>;
   private logger: LevelLogger;
-  private reportingCore: ReportingCore | null = null;
+  private reportingCore?: ReportingCore;
   private config$: Observable<ReportingConfigType>;
 
   constructor(context: PluginInitializerContext<ReportingConfigType>) {

diff --git a/x-pack/plugins/reporting/server/routes/generation.test.ts b/x-pack/plugins/reporting/server/routes/generation.test.ts
@@ -51,7 +51,9 @@ describe('POST /api/reporting/generate', () => {
     ({ server, httpSetup } = await setupServer());
     const mockDeps = ({
       elasticsearch: {
-        adminClient: { callAsInternalUser: jest.fn() },
+        legacy: {
+          client: { callAsInternalUser: jest.fn() },
+        },
       },
       security: {
         authc: {

diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
@@ -6,11 +6,11 @@
 
 import { Page } from 'puppeteer';
 import * as Rx from 'rxjs';
+import { HeadlessChromiumDriver, HeadlessChromiumDriverFactory } from '../browsers';
+import { createDriverFactory } from '../browsers/chromium';
 import * as contexts from '../export_types/common/lib/screenshots/constants';
-import { HeadlessChromiumDriver, HeadlessChromiumDriverFactory } from '../../server/browsers';
-import { createDriverFactory } from '../../server/browsers/chromium';
-import { LevelLogger } from '../../server/lib';
-import { CaptureConfig, ElementsPositionAndAttribute } from '../../server/types';
+import { LevelLogger } from '../lib';
+import { CaptureConfig, ElementsPositionAndAttribute } from '../types';
 
 interface CreateMockBrowserDriverFactoryOpts {
   evaluate: jest.Mock<Promise<any>, any[]>;

diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CaptureConfig } from '../../server/types';
 import { createLayout, LayoutInstance, LayoutTypes } from '../export_types/common/layouts';
+import { CaptureConfig } from '../types';
 
 export const createMockLayoutInstance = (captureConfig: CaptureConfig) => {
   const mockLayout = createLayout(captureConfig, {