[Reporting] Switch Serverside Config Wrapper to NP #62500

tsullivan · 2020-04-03T19:03:37Z

Summary

Followup of: #62086
Replaces: #61696

#62086 shimmed the server code with a module that abstracts reading config settings in Reporting. This PR switches the internals of the shim to source the config from NP instead of legacy.

Checklist

Delete any items that are not applicable to this PR.

Unit or functional tests were updated or added to match the most common scenarios
Updated docs to reflect latest log messages

For maintainers

This was checked for breaking API changes and was labeled appropriately

tsullivan · 2020-04-04T05:06:24Z

x-pack/legacy/plugins/reporting/server/plugin.ts

@@ -12,8 +12,6 @@ import { createQueueFactory, enqueueJobFactory, LevelLogger, runValidations } fr
 import { setFieldFormats } from './services';
 import { ReportingSetup, ReportingSetupDeps, ReportingStart, ReportingStartDeps } from './types';
 import { registerReportingUsageCollector } from './usage';
-// @ts-ignore no module definition
-import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';


ts-ignore was hiding this dead code

tsullivan · 2020-04-06T18:34:57Z

x-pack/legacy/plugins/reporting/server/config/index.ts

@@ -204,11 +78,12 @@ export const buildConfig = (
  };

  // spreading arguments as an array allows the return type to be known by the compiler
-  reportingConfig = addConfigDefaults(server, core, reportingConfig);


Config defaults are now being applied in NP code in createConfig$

tsullivan · 2020-04-06T18:37:38Z

@elasticmachine merge upstream

tsullivan · 2020-04-06T19:06:42Z

x-pack/plugins/reporting/server/plugin.ts

+  public async setup(core: CoreSetup): Promise<PluginsSetup> {
+    return {
+      __legacy: {
+        config$: createConfig$(core, this.initializerContext, this.log).pipe(first()),


For now, the only role of the Reporting server-side plugin in NP is to expose the config in the plugin contract.

x-pack/legacy/plugins/reporting/server/config/index.ts

joelgriffith

LGTM!

tsullivan · 2020-04-06T23:01:48Z

@elasticmachine merge upstream

tsullivan · 2020-04-10T22:51:36Z

x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/args.ts

@@ -10,7 +10,7 @@ type ViewportConfig = CaptureConfig['viewport'];
 type BrowserConfig = CaptureConfig['browser']['chromium'];

 interface LaunchArgs {
-  userDataDir: BrowserConfig['userDataDir'];
+  userDataDir: string;


this was a bug with pre-existing type defs

tsullivan · 2020-04-10T22:52:19Z

x-pack/legacy/plugins/reporting/server/config/index.ts

-
-interface BrowserConfig {
-  inspect: boolean;
-  userDataDir: string;


userDataDir is actually not in the reporting plugin config

tsullivan · 2020-04-10T22:53:13Z

x-pack/legacy/plugins/reporting/server/types.d.ts

@@ -11,7 +11,7 @@ import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import { ReportingPluginSpecOptions } from '../types';
-import { ReportingConfig, ReportingConfigType } from './core';
+import { ReportingConfigType } from './core';


cleaned up unused import

tsullivan · 2020-04-13T16:46:13Z

@elasticmachine merge upstream

poffdeluxe

Few small questions on the PR but otherwise lgtm

x-pack/plugins/reporting/server/config/create_config.ts

x-pack/plugins/reporting/server/config/schema.ts

tsullivan · 2020-04-15T20:01:21Z

@elasticmachine merge upstream

kibanamachine · 2020-04-15T21:44:54Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: cc92486

History

💚 Build #40444 succeeded 8916d73
💚 Build #40310 succeeded 8c19295
💚 Build #40299 succeeded a0e045b
💚 Build #40282 succeeded 611e2aa
💚 Build #40275 succeeded e262dec

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* New config * fix translations json * add csv.useByteOrderMarkEncoding to schema * imports cleanup * restore "get default chromium sandbox disabled" functionality * integrate getDefaultChromiumSandboxDisabled * fix tests * --wip-- [skip ci] * add more schema tests * diff prettiness * trash legacy files that moved to NP * create_config tests * Hoist create_config * better disableSandbox tests * fix ts * fix export * fix bad code * make comments better * fix i18n * comment * automatically setting... logs * replace log_configuration * fix lint * This is f2 * improve startup log about sandbox info * update docs with log reference * revert log removal Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* New config * fix translations json * add csv.useByteOrderMarkEncoding to schema * imports cleanup * restore "get default chromium sandbox disabled" functionality * integrate getDefaultChromiumSandboxDisabled * fix tests * --wip-- [skip ci] * add more schema tests * diff prettiness * trash legacy files that moved to NP * create_config tests * Hoist create_config * better disableSandbox tests * fix ts * fix export * fix bad code * make comments better * fix i18n * comment * automatically setting... logs * replace log_configuration * fix lint * This is f2 * improve startup log about sandbox info * update docs with log reference * revert log removal Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* master: (56 commits) [i18n] Update CODEOWNERS (elastic#63354) add platform team definition of done (elastic#59993) [SIEM] move away from Joi for importing/exporting timeline (elastic#62125) Fix discover preserve url (elastic#63580) [alerting] Adds an alertServices mock and uses it in siem, monitoring and uptime (elastic#63489) Closes elastic#63109 for Service Map by resetting edges styles for the selected node (elastic#63655) MIgrated index_header to react (elastic#63490) Index pattern management UI -> TypeScript and New Platform Ready (indexed_fields_table) (elastic#63364) [SIEM] [Cases] Insert timeline and reporters/tags in table bug fixes (elastic#63642) [Reporting] Make usable default element positions (elastic#63191) [Reporting] Switch Serverside Config Wrapper to NP (elastic#62500) [Reporting] Add "warning" status as an alternate type of completed job (elastic#63498) Split action types into own page (elastic#63516) [Lens] Only show copy on save for previously saved docs (elastic#63535) Update README.md (elastic#63622) Bugfix clear saved query crashes kibana on Discover in some cases (elastic#63554) Add uptime CODEOWNER entries. (elastic#63616) [ML] Extract apiDoc params from the schema definitions (elastic#62933) Fix alerting documentation encryption key requirement (elastic#63512) Fix CODEOWNERS and sass lint paths (elastic#63552) ...

tsullivan added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:NP Migration v7.8.0 labels Apr 3, 2020

This was referenced Apr 3, 2020

[Reporting/New Platform Migration] Use a new config service on server-side (re-do) #61696

Closed

[Reporting] New Platform Migration #53898

Closed

tsullivan force-pushed the reporting/server-config-np-switch branch 2 times, most recently from a189e82 to 62022cf Compare April 4, 2020 05:03

tsullivan commented Apr 4, 2020

View reviewed changes

tsullivan force-pushed the reporting/server-config-np-switch branch 7 times, most recently from ed4ea89 to b887cec Compare April 4, 2020 14:33

New config

886f976

tsullivan force-pushed the reporting/server-config-np-switch branch from b887cec to 886f976 Compare April 5, 2020 04:15

tsullivan marked this pull request as ready for review April 6, 2020 18:33

tsullivan commented Apr 6, 2020

View reviewed changes

Merge branch 'master' into reporting/server-config-np-switch

2073311

tsullivan commented Apr 6, 2020

View reviewed changes

tsullivan requested review from joelgriffith and a team April 6, 2020 19:07

joelgriffith reviewed Apr 6, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/config/index.ts Outdated Show resolved Hide resolved

joelgriffith approved these changes Apr 6, 2020

View reviewed changes

fix translations json

669a82d

Merge branch 'master' into reporting/server-config-np-switch

cd44aa1

tsullivan commented Apr 10, 2020

View reviewed changes

tsullivan added 3 commits April 10, 2020 15:55

fix bad code

619bcb4

make comments better

1339af9

fix i18n

e262dec

tsullivan requested a review from joelgriffith April 10, 2020 23:23

tsullivan added 8 commits April 10, 2020 16:34

comment

ccbcc02

automatically setting... logs

7b1f8ec

replace log_configuration

84eccad

fix lint

c7cefe9

This is f2

611e2aa

improve startup log about sandbox info

e728526

update docs with log reference

a0e045b

revert log removal

8c19295

Merge branch 'master' into reporting/server-config-np-switch

8916d73

tsullivan requested a review from poffdeluxe April 13, 2020 16:53

poffdeluxe approved these changes Apr 15, 2020

View reviewed changes

x-pack/plugins/reporting/server/config/create_config.ts Show resolved Hide resolved

x-pack/plugins/reporting/server/config/schema.ts Show resolved Hide resolved

x-pack/plugins/reporting/server/config/schema.ts Show resolved Hide resolved

Merge branch 'master' into reporting/server-config-np-switch

cc92486

tsullivan mentioned this pull request Apr 15, 2020

[Reporting] Config flag to escape formula CSV values #63645

Merged

1 task

joelgriffith approved these changes Apr 15, 2020

View reviewed changes

tsullivan merged commit f4c81b4 into elastic:master Apr 15, 2020

tsullivan deleted the reporting/server-config-np-switch branch April 15, 2020 21:52

tsullivan mentioned this pull request Apr 15, 2020

[7.x] [Reporting] Switch Serverside Config Wrapper to NP (#62500) #63648

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Reporting] Switch Serverside Config Wrapper to NP #62500

[Reporting] Switch Serverside Config Wrapper to NP #62500

tsullivan commented Apr 3, 2020 •

edited

Loading

tsullivan Apr 4, 2020

tsullivan Apr 6, 2020

tsullivan commented Apr 6, 2020

tsullivan Apr 6, 2020

joelgriffith left a comment

tsullivan commented Apr 6, 2020

tsullivan Apr 10, 2020

tsullivan Apr 10, 2020

tsullivan Apr 10, 2020

tsullivan commented Apr 13, 2020

poffdeluxe left a comment

tsullivan commented Apr 15, 2020

kibanamachine commented Apr 15, 2020

[Reporting] Switch Serverside Config Wrapper to NP #62500

[Reporting] Switch Serverside Config Wrapper to NP #62500

Conversation

tsullivan commented Apr 3, 2020 • edited Loading

Summary

Checklist

For maintainers

tsullivan Apr 4, 2020

Choose a reason for hiding this comment

tsullivan Apr 6, 2020

Choose a reason for hiding this comment

tsullivan commented Apr 6, 2020

tsullivan Apr 6, 2020

Choose a reason for hiding this comment

joelgriffith left a comment

Choose a reason for hiding this comment

tsullivan commented Apr 6, 2020

tsullivan Apr 10, 2020

Choose a reason for hiding this comment

tsullivan Apr 10, 2020

Choose a reason for hiding this comment

tsullivan Apr 10, 2020

Choose a reason for hiding this comment

tsullivan commented Apr 13, 2020

poffdeluxe left a comment

Choose a reason for hiding this comment

tsullivan commented Apr 15, 2020

kibanamachine commented Apr 15, 2020

💚 Build Succeeded

History

tsullivan commented Apr 3, 2020 •

edited

Loading