Upgrade to hapi version 20 by watson · Pull Request #85406 · elastic/kibana

watson · 2020-12-09T12:57:06Z

This PR upgrades from hapi v18 to v20 (and related packages).

Upgraded modules

Module	Old version	New version	Risk	Changelog	Breaking Changes
`@hapi/hapi`	18.4.1	20.0.3	❤️	Changelog	hapijs/hapi#4017 hapijs/hapi#4138
`@hapi/boom`	7.4.11	9.1.1	💛	Changelog	hapijs/boom#251 hapijs/boom#252 hapijs/boom#253 hapijs/boom#262
`@hapi/cookie`	10.1.2	11.0.2	💚	Changelog	hapijs/cookie#227
`@hapi/good-squeeze`	5.2.1	6.0.0	💚		hapijs/good-squeeze#39
`@hapi/h2o2`	8.3.2	9.0.2	💛	Changelog	hapijs/h2o2#110 hapijs/h2o2#111 hapijs/h2o2#112 hapijs/h2o2#113
`@hapi/hoek`	8.5.1	9.1.0	❤️	Changelog	hapijs/hoek#343 hapijs/hoek#347
`@hapi/inert`	5.2.2	6.0.3	💛	Changelog	hapijs/inert#137 hapijs/inert#138 hapijs/inert#139 hapijs/inert#140
`@hapi/podium`	3.4.3	4.1.1	💚	Changelog	hapijs/podium#57
`@hapi/statehood`	6.1.2	7.0.3	💚	Changelog	hapijs/statehood#66 hapijs/statehood#67
`@hapi/vision`	5.4.0	6.0.1	💛	Changelog	hapijs/vision#190 hapijs/vision#191 hapijs/vision#192
`@hapi/wreck`	15.1.0	17.1.0	💚	Changelog	hapijs/wreck#262 hapijs/wreck#263 hapijs/wreck#270

We're still using our own fork of @hapi/good (@elastic/good) and joi hasn't been upgraded to the newest version.

Remaining todo's before review

Address TODOs in code
Make sure all tests pass

src/core/server/http/http_server.ts

src/core/server/http/lifecycle/on_pre_response.ts

src/core/server/http/http_server.test.ts

src/core/server/http/router/response_adapter.ts

Hapi handles `{ validate: undefined }` differently from `{}` for route options. Having the `validate` key set to `undefined` on the `options` object resulted in the following error Cannot use 'in' operator to search for 'headers' in undefined This was because the key names were iterated over and their value expected to be an object.

elasticmachine · 2020-12-15T20:12:15Z

Pinging @elastic/ingest-management (Team:Ingest Management)

elasticmachine · 2020-12-15T20:12:15Z

Pinging @elastic/apm-ui (Team:apm)

jfsiii

👍 for Fleet changes

smith

APM changes look good.

flash1293

Kibana app changes LGTM, type changes only. Didn't test locally

darnautov

ML and Transform changes LGTM

legrego

I think we can remove this patch now that Hapi supports SameSite=None natively:

kibana/src/core/server/http/cookie_session_storage.ts

Lines 162 to 177 in 7002250

    
           // A hack to support SameSite: 'None'. 
        
           // Remove it after update Hapi to v19 that supports SameSite: 'None' out of the box. 
        
           if (cookieOptions.sameSite === 'None') { 
        
             log.debug('Patching Statehood.prepareValue'); 
        
             const originalPrepareValue = Statehood.prepareValue; 
        
             Statehood.prepareValue = function kibanaStatehoodPrepareValueWrapper( 
        
               name: string, 
        
               value: unknown, 
        
               options: any 
        
             ) { 
        
               if (name === cookieOptions.name) { 
        
                 options.isSameSite = cookieOptions.sameSite; 
        
               } 
        
               return originalPrepareValue(name, value, options); 
        
             }; 
        
           }

legrego · 2020-12-18T01:56:10Z

package.json

    "url": "https://github.com/elastic/kibana.git"
  },
  "resolutions": {
-    "**/@hapi/iron": "^5.1.4",


mshustov · 2020-12-18T08:06:48Z

I think we can remove this patch now that Hapi supports SameSite=None natively:

@legrego I'm going to take care of it as soon as the PR is merged

This fixes a TypeScript error which means we can get rid of a few ts-expect-error comments.

legrego

LGTM on green CI!

kibanamachine · 2020-12-18T12:47:18Z

💚 Build Succeeded

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

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`enterpriseSearch`	1.7MB	1.7MB	-211.0B

Distributable file count

id	before	after	diff
`default`	47287	47885	+598
`oss`	27863	27701	-162

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`upgradeAssistant`	60.1KB	59.9KB	-211.0B

History

💔 Build #95347 failed 9be257bc82448c28f4796b166e8b2d2572843a5f
💚 Build #95091 succeeded f90a66c
💚 Build #94669 succeeded ff8489f
💚 Build #94392 succeeded 29b4192b62aa84d8914e1aea008e706d0adeb0ed
💚 Build #94003 succeeded f7bd546c073452f463abb1e87f214ac92fe2bb6d

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

rylnd

Security Solution changes LGTM!

* master: (48 commits) Fix request with disabled aggregation (elastic#85696) [Security Solution][Detections][Threshold Rules] Threshold Rule Bug Fixes (elastic#84918) Removed a possibility to define two different names for Alert types on API and UI level. (elastic#86236) Bump Node.js from version 14.15.2 to 14.15.3 (elastic#86593) [index patterns] Fleep app - Keep saved object field list until field caps provides fields (elastic#85370) [Security Solutions] fix timeline tabs + layout (elastic#86581) Upgrade to hapi version 20 (elastic#85406) App Services: Remove remaining uiActions, expressions, data, embeddable circular dependencies. (elastic#82791) Rename chartLibrary setting to legacyChartsLibrary (elastic#86529) [CI] TeamCity updates (elastic#85843) [Maps] Use Json for mvt-tests (elastic#86492) [Rollup Jobs] Added autofocus to cron editor (elastic#86324) [Monitoring][Alerting] CCR read exceptions alert (elastic#85908) [CI] Bump memory for main CI workers (elastic#86541) Explicitly set Elasticsearch heap size during CI and local development (elastic#86513) [App Search] Updates to results on the documents view (elastic#86181) [Discover] Change default sort handling (elastic#85561) [App Search] Convert DocumentCreationModal to DocumentCreationFlyout (elastic#86508) [App Search] Sample Engines should have access to the Crawler (elastic#86502) Fixed duplication of create new modal (elastic#86489) ...

Support for this was lost in elastic#85406. Fixes elastic#86716

Support for this was lost in #85406. Fixes #86716

watson added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.11.0 labels Dec 9, 2020

watson self-assigned this Dec 9, 2020

watson added v7.12.0 and removed v7.11.0 labels Dec 9, 2020

watson mentioned this pull request Dec 10, 2020

Upgrade Hapi to v20 #82805

Closed

watson force-pushed the bump-hapi branch 2 times, most recently from 77f5e05 to b25262f Compare December 10, 2020 16:33

watson commented Dec 10, 2020

View reviewed changes

src/core/server/http/http_server.ts Outdated Show resolved Hide resolved

watson commented Dec 10, 2020

View reviewed changes

src/core/server/http/http_server.ts Outdated Show resolved Hide resolved

watson commented Dec 10, 2020

View reviewed changes

src/core/server/http/lifecycle/on_pre_response.ts Outdated Show resolved Hide resolved

watson force-pushed the bump-hapi branch from d7466a4 to 49f0180 Compare December 10, 2020 18:01

watson commented Dec 10, 2020

View reviewed changes

src/core/server/http/http_server.test.ts Outdated Show resolved Hide resolved

TinaHeiligers requested a review from mshustov December 10, 2020 20:36

watson force-pushed the bump-hapi branch from 49f0180 to f7bd546 Compare December 14, 2020 13:45

watson commented Dec 14, 2020

View reviewed changes

src/core/server/http/router/response_adapter.ts Outdated Show resolved Hide resolved

watson force-pushed the bump-hapi branch from f7bd546 to 29b4192 Compare December 15, 2020 10:40

watson added 12 commits December 15, 2020 20:41

Bump all hapi packages to the newest version

5e05b2e

[@hapi/boom] Implement breaking changes

3d4dae4

[typescript][@hapi/boom] Allow output.payload.attributes to exist

fa77490

[typescript][@hapi/boom] No need to cast output.headers to 'any' anymore

00cc63e

[test][typescript][@hapi/boom] Update Boom mock with new properties

80b4832

[typescript][@hapi/boom] Cast output.headers to key/value object

a89563b

Revert workaround for hapi pre v20 bug

6348063

[hapi] temp fix for payload.multipart breaking change

448040d

[test] fix http_server tests

284f1cc

Output of 'node scripts/check_published_api_changes --accept'

b1ed8e7

Address TODOs

ff8489f

jfsiii approved these changes Dec 15, 2020

View reviewed changes

smith approved these changes Dec 15, 2020

View reviewed changes

mshustov approved these changes Dec 16, 2020

View reviewed changes

mshustov mentioned this pull request Dec 16, 2020

Change default value of multipart request body parsing #86085

Closed

flash1293 approved these changes Dec 16, 2020

View reviewed changes

darnautov approved these changes Dec 17, 2020

View reviewed changes

Merge branch 'master' into bump-hapi

f90a66c

legrego self-requested a review December 18, 2020 01:54

legrego reviewed Dec 18, 2020

View reviewed changes

package.json

"url": "https://github.com/elastic/kibana.git"

},

"resolutions": {

"**/@hapi/iron": "^5.1.4",

Copy link
Copy Markdown

Member

legrego Dec 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

watson added 2 commits December 18, 2020 10:26

Merge branch 'master' into bump-hapi

31b9a26

Bump @hapi/boom to v9.1.1

d77b079

This fixes a TypeScript error which means we can get rid of a few ts-expect-error comments.

watson force-pushed the bump-hapi branch from 9be257b to d77b079 Compare December 18, 2020 10:30

legrego approved these changes Dec 18, 2020

View reviewed changes

rylnd approved these changes Dec 18, 2020

View reviewed changes

michaelolo24 approved these changes Dec 18, 2020

View reviewed changes

watson merged commit e8b21bc into elastic:master Dec 19, 2020

watson deleted the bump-hapi branch December 19, 2020 12:10

watson mentioned this pull request Dec 19, 2020

[7.x] Upgrade to hapi version 20 (#85406) #86592

Merged

watson added a commit that referenced this pull request Dec 20, 2020

Upgrade to hapi version 20 (#85406) (#86592)

777c80d

graphaelli mentioned this pull request Dec 21, 2020

kibana docker container won't start #86716

Closed

watson added a commit to watson/kibana that referenced this pull request Dec 22, 2020

Re-add support for configuring server.host: "0"

1059d80

Support for this was lost in elastic#85406. Fixes elastic#86716

watson mentioned this pull request Dec 22, 2020

Re-add support for configuring server.host: "0" #86806

Merged

watson added a commit that referenced this pull request Dec 22, 2020

Re-add support for configuring server.host: "0" (#86806)

97858d6

Support for this was lost in #85406. Fixes #86716

watson added a commit that referenced this pull request Dec 22, 2020

Re-add support for configuring server.host: "0" (#86806) (#86830)

d43c7d7

Support for this was lost in #85406. Fixes #86716

watson mentioned this pull request Jan 4, 2021

Upgrade @hapi/hoek to revert hack introduced in hapi v20 upgrade #87113

Merged

	// A hack to support SameSite: 'None'.
	// Remove it after update Hapi to v19 that supports SameSite: 'None' out of the box.
	if (cookieOptions.sameSite === 'None') {
	log.debug('Patching Statehood.prepareValue');
	const originalPrepareValue = Statehood.prepareValue;
	Statehood.prepareValue = function kibanaStatehoodPrepareValueWrapper(
	name: string,
	value: unknown,
	options: any
	) {
	if (name === cookieOptions.name) {
	options.isSameSite = cookieOptions.sameSite;
	}
	return originalPrepareValue(name, value, options);
	};
	}

Conversation

watson commented Dec 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Upgraded modules

Remaining todo's before review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

elasticmachine commented Dec 15, 2020

Uh oh!

elasticmachine commented Dec 15, 2020

Uh oh!

jfsiii left a comment

Choose a reason for hiding this comment

Uh oh!

smith left a comment

Choose a reason for hiding this comment

Uh oh!

flash1293 left a comment

Choose a reason for hiding this comment

Uh oh!

darnautov left a comment

Choose a reason for hiding this comment

Uh oh!

legrego left a comment

Choose a reason for hiding this comment

Uh oh!

legrego Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

mshustov commented Dec 18, 2020

Uh oh!

legrego left a comment

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Dec 18, 2020

💚 Build Succeeded

Metrics [docs]

Async chunks

Distributable file count

Page load bundle

History

Uh oh!

rylnd left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

watson commented Dec 9, 2020 •

edited

Loading