np config!

elastic · Jan 24, 2020 · 33fa8d4 · 33fa8d4
1 parent 943e450
commit 33fa8d4
Show file tree

Hide file tree

Showing 46 changed files with 383 additions and 500 deletions.
diff --git a/x-pack/legacy/plugins/reporting/common/constants.ts b/x-pack/legacy/plugins/reporting/common/constants.ts
@@ -9,7 +9,7 @@ export const PLUGIN_ID = 'reporting';
 export const BROWSER_TYPE = 'chromium';
 
 export const JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY =
-  'xpack.reporting.jobCompletionNotifications';
+  'xpack.reporting.jobCompletionNotifications'; // for public - outdated?
 
 export const API_BASE_URL = '/api/reporting'; // "Generation URL" from share menu
 export const API_BASE_URL_V1 = '/api/reporting/v1'; //

diff --git a/x-pack/legacy/plugins/reporting/config.ts b/x-pack/legacy/plugins/reporting/config.ts
diff --git a/.../legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts b/.../legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
@@ -17,7 +17,7 @@ beforeEach(() => {
 describe('conditions', () => {
   test(`uses hostname from reporting config if set`, async () => {
     const settings: any = {
-      'xpack.reporting.kibanaServer.hostname': 'custom-hostname',
+      'kibanaServer.hostname': 'custom-hostname',
     };
 
     mockServer = createMockServer({ settings });
@@ -34,7 +34,7 @@ describe('conditions', () => {
     });
 
     expect(conditionalHeaders.conditions.hostname).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.hostname')
+      mockServer.config().get('kibanaServer.hostname')
     );
   });
 
@@ -55,7 +55,7 @@ describe('conditions', () => {
 
   test(`uses port from reporting config if set`, async () => {
     const settings = {
-      'xpack.reporting.kibanaServer.port': 443,
+      'kibanaServer.port': 443,
     };
 
     mockServer = createMockServer({ settings });
@@ -72,7 +72,7 @@ describe('conditions', () => {
     });
 
     expect(conditionalHeaders.conditions.port).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.port')
+      mockServer.config().get('kibanaServer.port')
     );
   });
 
@@ -110,7 +110,7 @@ describe('conditions', () => {
 
   test(`uses protocol from reporting config if set`, async () => {
     const settings = {
-      'xpack.reporting.kibanaServer.protocol': 'https',
+      'kibanaServer.protocol': 'https',
     };
 
     mockServer = createMockServer({ settings });
@@ -127,7 +127,7 @@ describe('conditions', () => {
     });
 
     expect(conditionalHeaders.conditions.protocol).toEqual(
-      mockServer.config().get('xpack.reporting.kibanaServer.protocol')
+      mockServer.config().get('kibanaServer.protocol')
     );
   });
 
@@ -211,9 +211,9 @@ describe('config formatting', () => {
     expect(conditionalHeaders.conditions.hostname).toEqual('cool-hostname');
   });
 
-  test(`lowercases xpack.reporting.kibanaServer.hostname`, async () => {
+  test(`lowercases kibanaServer.hostname`, async () => {
     mockServer = createMockServer({
-      settings: { 'xpack.reporting.kibanaServer.hostname': 'GREAT-HOSTNAME' },
+      settings: { 'kibanaServer.hostname': 'GREAT-HOSTNAME' },
     });
     const conditionalHeaders = await getConditionalHeaders({
       job: {

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -15,12 +15,14 @@ export const getConditionalHeaders = <JobDocPayloadType>({
   filteredHeaders: Record<string, string>;
 }) => {
   const config = server.config();
+  const kbnConfig = server.kbnConfig();
+  // TODO: set defaults in Reporting config setup instead of handle conditions here
   const [hostname, port, basePath, protocol] = [
-    config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
-    config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
-    config.get('server.basePath'),
-    config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
-  ] as [string, number, string, string];
+    config.get('kibanaServer.hostname') || kbnConfig.get('server.host'),
+    config.get('kibanaServer.port') || kbnConfig.get('server.port'),
+    kbnConfig.get('server.basePath'),
+    config.get('kibanaServer.protocol') || kbnConfig.get('server.protocol'),
+  ];
 
   const conditionalHeaders: ConditionalHeaders = {
     headers: filteredHeaders,

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -31,12 +31,14 @@ export function getFullUrls<JobDocPayloadType>({
   job: JobDocPayloadPDF | JobDocPayloadPNG;
 }) {
   const config = server.config();
+  const kbnConfig = server.kbnConfig();
 
+  // TODO: set defaults in Reporting config setup instead of handle conditions here
   const getAbsoluteUrl = getAbsoluteUrlFactory({
-    defaultBasePath: config.get('server.basePath'),
-    protocol: config.get('xpack.reporting.kibanaServer.protocol') || server.info.protocol,
-    hostname: config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
-    port: config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
+    defaultBasePath: kbnConfig.get('server.basePath'),
+    protocol: config.get('kibanaServer.protocol') || kbnConfig.get('server.protocol'),
+    hostname: config.get('kibanaServer.hostname') || kbnConfig.get('server.host'),
+    port: config.get('kibanaServer.port') || kbnConfig.get('server.port'),
   });
 
   // PDF and PNG job params put in the url differently

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
@@ -22,7 +22,7 @@ export class PrintLayout extends Layout {
 
   constructor(server: ServerFacade) {
     super(LayoutTypes.PRINT);
-    this.captureConfig = server.config().get('xpack.reporting.capture');
+    this.captureConfig = server.config().get('capture');
   }
 
   public getCssOverridesPath() {

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
@@ -24,7 +24,7 @@ export function screenshotsObservableFactory(
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
   const config = server.config();
-  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+  const captureConfig: CaptureConfig = config.get('capture');
 
   return function screenshotsObservable({
     logger,