[Reporting]: Move router + license checks to new platform by joelgriffith · Pull Request #66331 · elastic/kibana

joelgriffith · 2020-05-12T23:37:37Z

Moves our routes and relevant factories/classes to new platform idioms. Most of the fundamental pieces are in place, but there is still work needing to be done:

Update and fix tests.
Remove unused code/typedefs.
Smoke test the heck out of this.
Fix schema validation differences.

…gration

joelgriffith · 2020-05-12T23:39:21Z

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

    security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
    usageCollection: server.newPlatform.setup.plugins.usageCollection,
    __LEGACY,
+    licensing: {


Need to verify this is working properly as I'm not fully versed on how this works

joelgriffith · 2020-05-12T23:39:52Z

x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts

    exportTypeId: string,
    jobParams: JobParamsType,
-    user: string,
+    username: string,


Change here helped me tighten down types in downstream modules

…gration

tsullivan

just a few small nits :)

x-pack/legacy/plugins/reporting/server/lib/check_license.ts

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

…gration

pgayvallet · 2020-05-20T15:52:31Z

Ack: will review tomorrow.

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

…gration

joelgriffith · 2020-05-21T22:52:36Z

x-pack/legacy/plugins/reporting/common/constants.ts

  'application/pdf',
  CONTENT_TYPE_CSV,
  'image/png',
+  'text/plain',


This is needed now so we can pass long certain job-status messages (they were incorrectly being sent as application/json, and I think hapi was fixing that under-the-hood)

joelgriffith · 2020-05-21T22:53:36Z

x-pack/legacy/plugins/reporting/server/lib/iso_string_validate.ts

+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+


Needed since new config schema doesn't have an API for this

joelgriffith · 2020-05-21T22:54:43Z

Pushed up a larger delta for job-status tests, still more that needs to be done but the rest should be relatively quick since we have patterns in place for how to do this.

…ffith/kibana into chore/np-route-migration

…gration

…st updates

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

x-pack/legacy/plugins/reporting/server/routes/generation.test.ts

revert logger as a param

tsullivan · 2020-05-29T20:50:58Z

x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts

 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
  JobParamsPDF
->> = function createJobFactoryFn(reporting: ReportingCore) {
+>> = function createJobFactoryFn(reporting) {


Thank you for cleaning up this inferrable types!

tsullivan · 2020-05-29T20:51:20Z

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


-  constructor(private logger: LevelLogger, private config: ReportingConfig) {}
-
-  legacySetup(


joelgriffith · 2020-05-29T20:52:44Z

Once this is green, my plan is to:

Merge it (duh)
Get the backport PR started.
Fix any backport PR conflicts... might be a few.
Start on the folder migration, remove any TS/Lint issues and do a final PR.

tsullivan

LGTM

Thank you SO much for the work you have put into this, @joelgriffith. This PR a major, major improvement.

Approved elsewhere, not sure why GH is having this block merge

kibanamachine · 2020-05-29T22:24:30Z

💚 Build Succeeded

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

History

💚 Build #50616 succeeded 27040a9
💚 Build #50488 succeeded 0aca67c
💔 Build #50469 failed f7d1134
💔 Build #50465 failed 2a5f9a0
💔 Build #50375 failed 01fc733

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

joelgriffith · 2020-05-30T04:08:21Z

Backport [7.9]: #67818

…) (#67818) * [Reporting]: Move router + license checks to new platform (#66331) * WIP: Move routes to new API, license and other checks inbound * Move license checks over to np licensing observable * Fix license checks + remove older modules * Fixing check_license tests, move to TS/Jest * Fix licensing setup for mocks * Move job.test.ts over to np * WIP: move user checks to higher-order func * Move more handler logic over to Response factory vs Boom * Major refactor to consolidate types, remove facades, and udpate helpers * Fix validation for dates in immediate exports * Linter fix on check license test * Fix job generation tests * Move deps => setupDeps * fix api test * fix jobs test * authorized_user_pre_routing and tests * Fixing duplicate identifiers * Fix licensing implementation changes * WIP: Moving license over to async/observables * Fix disabled-security case * finish auth_user_pre_routing cleanup - no more license check * WIP: Fixing final api tests * Trying to get schema differences in alignment * Reverting back to previous generation handler * Fix final API tests * Final API test fixes, few more hardening tests and better error messages * Simplify lower-level module implementation (core only interface) + test updates * Push some core logic into plugin * Move some core logic up to plugin * Marking private setupDeps + downstream fixes * revert logger as a param Co-authored-by: Timothy Sullivan <tsullivan@elastic.co> # Conflicts: # x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts # x-pack/legacy/plugins/reporting/server/routes/generation.ts * Add back in legacy /viz /search and /dashboard routes * Add back in and fix compatibility shim/tests

Joel Griffith added 4 commits May 8, 2020 13:33

WIP: Move routes to new API, license and other checks inbound

004dd70

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

938e14a

…gration

Move license checks over to np licensing observable

500b933

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

b9cc20c

…gration

joelgriffith added zDeprecated Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:NP Migration v7.9.0 labels May 12, 2020

joelgriffith commented May 12, 2020

View reviewed changes

Joel Griffith added 2 commits May 14, 2020 15:26

Fix license checks + remove older modules

4feb02f

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

02394d5

…gration

joelgriffith requested review from pgayvallet and tsullivan May 14, 2020 22:32

tsullivan requested changes May 18, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/lib/check_license.ts Outdated Show resolved Hide resolved

x-pack/legacy/plugins/reporting/server/lib/check_license.ts Outdated Show resolved Hide resolved

x-pack/legacy/plugins/reporting/server/lib/check_license.ts Show resolved Hide resolved

tsullivan reviewed May 18, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/types.d.ts Outdated Show resolved Hide resolved

Joel Griffith added 5 commits May 19, 2020 09:54

Fixing check_license tests, move to TS/Jest

2b18fe2

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

dfd62f3

…gration

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

ac361a8

…gration

Fix licensing setup for mocks

7fab2c6

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

48c88f8

…gration

tsullivan reviewed May 20, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/types.ts Show resolved Hide resolved

Joel Griffith added 3 commits May 20, 2020 14:44

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

15ece89

…gration

Move job.test.ts over to np

d58fc14

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

6e1667e

…gration

joelgriffith commented May 21, 2020

View reviewed changes

Joel Griffith added 8 commits May 28, 2020 15:03

WIP: Fixing final api tests

874222f

Trying to get schema differences in alignment

dce4083

Merge branch 'chore/np-route-migration' of https://github.com/joelgri…

76904b7

…ffith/kibana into chore/np-route-migration

Reverting back to previous generation handler

2a5f9a0

Fix final API tests

f7d1134

Final API test fixes, few more hardening tests and better error messages

0aca67c

Merge remote-tracking branch 'upstream/master' into chore/np-route-mi…

7554127

…gration

Simplify lower-level module implementation (core only interface) + te…

27040a9

…st updates

tsullivan reviewed May 29, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/core.ts Show resolved Hide resolved

tsullivan reviewed May 29, 2020

View reviewed changes

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

tsullivan reviewed May 29, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/core.ts Show resolved Hide resolved

tsullivan reviewed May 29, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/routes/generation.test.ts Outdated Show resolved Hide resolved

tsullivan reviewed May 29, 2020

View reviewed changes

x-pack/legacy/plugins/reporting/server/routes/generation.test.ts Outdated Show resolved Hide resolved

Joel Griffith and others added 5 commits May 29, 2020 12:52

Push some core logic into plugin

8ad57ff

Move some core logic up to plugin

4f12c8a

Marking private setupDeps + downstream fixes

3ab8095

revert logger as a param

1cf1546

Merge pull request #3 from tsullivan/chore/np-route-migration

fcf9f58

revert logger as a param

tsullivan reviewed May 29, 2020

View reviewed changes

tsullivan approved these changes May 29, 2020

View reviewed changes

joelgriffith merged commit 3990287 into elastic:master May 29, 2020

joelgriffith mentioned this pull request May 30, 2020

[7.x] [Reporting]: Move router + license checks to new platform (#66331) #67818

Merged

This was referenced Jul 21, 2020

[Reporting] Use server basepath when creating reporting jobs #72684

Closed

[Reporting] Use server basepath when creating reporting jobs #72722

Merged


		constructor(private logger: LevelLogger, private config: ReportingConfig) {}

		legacySetup(

Conversation

joelgriffith commented May 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joelgriffith May 12, 2020

Choose a reason for hiding this comment

Uh oh!

joelgriffith May 12, 2020

Choose a reason for hiding this comment

Uh oh!

tsullivan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pgayvallet commented May 20, 2020

Uh oh!

Uh oh!

joelgriffith May 21, 2020

Choose a reason for hiding this comment

Uh oh!

joelgriffith May 21, 2020

Choose a reason for hiding this comment

Uh oh!

joelgriffith commented May 21, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tsullivan May 29, 2020

Choose a reason for hiding this comment

Uh oh!

tsullivan May 29, 2020

Choose a reason for hiding this comment

Uh oh!

joelgriffith commented May 29, 2020

Uh oh!

tsullivan left a comment

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented May 29, 2020

💚 Build Succeeded

History

Uh oh!

joelgriffith commented May 30, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

joelgriffith commented May 12, 2020 •

edited

Loading