github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-27 18:51:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.17] Upgrades joi to 17.7.1 (#150953) (#151201)

Browse source 
# Backport

This will backport the following commits from `main` to `7.17`:
- [Upgrades joi to 17.7.1
(#150953)](https://github.com/elastic/kibana/pull/150953)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"jeramy.soucy@elastic.co"},"sourceCommit":{"committedDate":"2023-02-14T15:22:26Z","message":"Upgrades
joi to 17.7.1 (#150953)\n\nUpgrades joi to version
17.7.1","sha":"587816830afdb70f66ed058bb009f942c0bab3ea","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","backport:all-open","v8.7.0","v8.8.0"],"number":150953,"url":"https://github.com/elastic/kibana/pull/150953","mergeCommit":{"message":"Upgrades
joi to 17.7.1 (#150953)\n\nUpgrades joi to version
17.7.1","sha":"587816830afdb70f66ed058bb009f942c0bab3ea"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"8.7","label":"v8.7.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/151156","number":151156,"state":"MERGED","mergeCommit":{"sha":"1d1a9b612c04ff9daf5c356e1deabb57bd19cb21","message":"[8.7]
Upgrades joi to 17.7.1 (#150953) (#151156)\n\n# Backport\n\nThis will
backport the following commits from `main` to `8.7`:\n- [Upgrades joi to
17.7.1\n(#150953)](https://github.com/elastic/kibana/pull/150953)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"jeramy.soucy@elastic.co\"},\"sourceCommit\":{\"committedDate\":\"2023-02-14T15:22:26Z\",\"message\":\"Upgrades\njoi
to 17.7.1 (#150953)\\n\\nUpgrades joi to
version\n17.7.1\",\"sha\":\"587816830afdb70f66ed058bb009f942c0bab3ea\",\"branchLabelMapping\":{\"^v8.8.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"backport:all-open\",\"v8.7.0\",\"v8.8.0\"],\"number\":150953,\"url\":\"https://github.com/elastic/kibana/pull/150953\",\"mergeCommit\":{\"message\":\"Upgrades\njoi
to 17.7.1 (#150953)\\n\\nUpgrades joi to
version\n17.7.1\",\"sha\":\"587816830afdb70f66ed058bb009f942c0bab3ea\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.7\"],\"targetPullRequestStates\":[{\"branch\":\"8.7\",\"label\":\"v8.7.0\",\"labelRegex\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"},{\"branch\":\"main\",\"label\":\"v8.8.0\",\"labelRegex\":\"^v8.8.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/150953\",\"number\":150953,\"mergeCommit\":{\"message\":\"Upgrades\njoi
to 17.7.1 (#150953)\\n\\nUpgrades joi to
version\n17.7.1\",\"sha\":\"587816830afdb70f66ed058bb009f942c0bab3ea\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy
<jeramy.soucy@elastic.co>"}},{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/150953","number":150953,"mergeCommit":{"message":"Upgrades
joi to 17.7.1 (#150953)\n\nUpgrades joi to version
17.7.1","sha":"587816830afdb70f66ed058bb009f942c0bab3ea"}}]}]
BACKPORT-->
This commit is contained in:
Jeramy Soucy 2023-02-14 19:29:47 -05:00 • committed by GitHub
parent b4ec2a9f42
commit 11b38f52fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -259,7 +259,7 @@
"io-ts": "^2.0.5",
"ipaddr.js": "2.0.0",
"isbinaryfile": "4.0.2",
"joi": "^17.4.0",
"joi": "^17.7.1",
"jquery": "^3.5.0",
"js-levenshtein": "^1.1.6",
"js-search": "^1.4.3",

8
packages/kbn-config-schema/types/joi.d.ts vendored
View file

@ -24,14 +24,6 @@ declare module 'joi' {
entries(key: AnySchema, value: AnySchema): this;
}
interface ErrorReport {
// missing from the typedef
// see https://github.com/sideway/joi/blob/master/lib/errors.js
local?: Record<string, any>;
toString(): string;
}
export type JoiRoot = Joi.Root & {
bytes: () => BytesSchema;
duration: () => AnySchema;

28
yarn.lock
View file

@ -3998,17 +3998,17 @@
dependencies:
any-observable "^0.3.0"
"@sideway/address@^4.1.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.0.tgz#0b301ada10ac4e0e3fa525c90615e0b61a72b78d"
integrity sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==
"@sideway/address@^4.1.3":
version "4.1.4"
resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
dependencies:
"@hapi/hoek" "^9.0.0"
"@sideway/formula@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
"@sideway/formula@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
"@sideway/pinpoint@^2.0.0":
version "2.0.0"
@ -17966,15 +17966,15 @@ jju@~1.4.0:
resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
joi@^17.3.0, joi@^17.4.0:
version "17.4.0"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20"
integrity sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==
joi@^17.3.0, joi@^17.7.1:
version "17.7.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.1.tgz#854fc85c7fa3cfc47c91124d30bffdbb58e06cec"
integrity sha512-teoLhIvWE298R6AeJywcjR4sX2hHjB3/xJX4qPjg+gTg+c0mzUDsziYlqPmLomq9gVsfaMcgPaGc7VxtD/9StA==
dependencies:
"@hapi/hoek" "^9.0.0"
"@hapi/topo" "^5.0.0"
"@sideway/address" "^4.1.0"
"@sideway/formula" "^3.0.0"
"@sideway/address" "^4.1.3"
"@sideway/formula" "^3.0.1"
"@sideway/pinpoint" "^2.0.0"
jpeg-js@0.0.4: