From 610542f92b6302c4aaae52da4760ea19e49d54e1 Mon Sep 17 00:00:00 2001 From: "Qingyang(Abby) Hu" Date: Thu, 20 Apr 2023 13:34:23 -0700 Subject: [PATCH 1/6] Add tooltip to help icon (#3626) (#3871) * Add tooltip to help icon Add tooltip to menu icon Signed-off-by: sabina.zaripova Co-authored-by: sayuree <52072402+sayuree@users.noreply.github.com> --- CHANGELOG.md | 1 + .../header/__snapshots__/header.test.tsx.snap | 18 ++++++++++++++++++ src/core/public/chrome/ui/header/header.tsx | 8 +++++++- .../chrome/ui/header/header_help_menu.tsx | 10 +++++++++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 602ce0e26cae..3b12b37df6c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -141,6 +141,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Temporary workaround for task-kill exceptions on Windows when it is passed a pid for a process that is already dead ([#2842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2842)) - [Build] Fixed "Last Access Time" not being set by `scanCopy` on Windows ([#2964](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2964)) - Update `leaflet-vega` and fix its usage ([#3005](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3005)) +- Add clarifying tooltips to header navigation ([#3573](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3573)) ### 🚞 Infrastructure diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 5ad89191b0c9..2d0f7f4a579d 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -4695,6 +4695,11 @@ exports[`Header renders 1`] = ` > + @@ -4742,11 +4747,22 @@ exports[`Header renders 1`] = ` > +
+ +
@@ -4862,11 +4878,13 @@ exports[`Header renders 1`] = ` >
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index 2946b4eaa130..3037f969e863 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -175,7 +175,13 @@ export function Header({ aria-controls={navId} ref={toggleCollapsibleNavRef} > - + diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx index d292564e6f4a..d73af4acbf01 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.tsx @@ -330,7 +330,15 @@ class HeaderHelpMenuUI extends Component { })} onClick={this.onMenuButtonClick} > - + + ); From 034e983bd23d31ff8731b6a9006ac251ea4953eb Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 24 Apr 2023 16:26:19 -0700 Subject: [PATCH 2/6] Update MAINTAINERS.md and CODEOWNERS (#3792) (#3894) Issue Resolve https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3426 Signed-off-by: Anan Zhuang (cherry picked from commit ccac24e4c3e4cfeba514ff378842c58b9445c0c6) Co-authored-by: Anan Zhuang --- .github/CODEOWNERS | 1 + MAINTAINERS.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000000..7899a0afa723 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 717903ef2915..ecb3f2928616 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -7,8 +7,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Maintainer | GitHub ID | Affiliation | | ------------------------- | --------------------------------------------------- | ----------- | | Anan Zhuang | [ananzh](https://github.com/ananzh) | Amazon | -| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon | -| Mihir Soni | [mihirsoni](https://github.com/mihirsoni) | Amazon | | Kawika (Rocky) Avilla | [kavilla](https://github.com/kavilla) | Amazon | | Sean Neumann | [seanneumann](https://github.com/seanneumann) | Amazon | | Miki Barahmand | [AMoo-Miki](https://github.com/AMoo-Miki) | Amazon | @@ -25,3 +23,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Maintainer | GitHub ID | Affiliation | | ------------- | --------------------------------------- | ----------- | | Tommy Markley | [tmarkley](https://github.com/tmarkley) | Amazon | +| Mihir Soni | [mihirsoni](https://github.com/mihirsoni) | Amazon | +| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon | From 3bd2fb12e2f1366dbd5656465032bbf27449140f Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:43:25 -0700 Subject: [PATCH 3/6] Docs (Jest): Update jest documentation links (#3931) (#3934) (cherry picked from commit a947240ea2bc28341c4d950e6c2badfc7ca365f9) Signed-off-by: Josh Romero Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .../README.md | 6 +++--- scripts/jest.js | 2 +- scripts/jest_integration.js | 2 +- src/dev/jest/junit_reporter.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/opensearch-eslint-config-opensearch-dashboards/README.md b/packages/opensearch-eslint-config-opensearch-dashboards/README.md index 4fb3f13c8f29..a2f60c437e57 100644 --- a/packages/opensearch-eslint-config-opensearch-dashboards/README.md +++ b/packages/opensearch-eslint-config-opensearch-dashboards/README.md @@ -4,7 +4,7 @@ The eslint config used by the opensearch dashboards team ## Usage -To use this eslint config, just install the peer dependencies and reference it +To use this eslint config, just install the peer dependencies and reference it in your `.eslintrc`: ```javascript @@ -17,8 +17,8 @@ in your `.eslintrc`: ## Optional jest config -If the project uses the [jest test runner](https://facebook.github.io/jest/), -the `@elastic/eslint-config-kibana/jest` config can be extended as well to use +If the project uses the [jest test runner](https://jestjs.io), +the `@elastic/eslint-config-kibana/jest` config can be extended as well to use `eslint-plugin-jest` and add settings specific to it: ```javascript diff --git a/scripts/jest.js b/scripts/jest.js index aad8dca306c1..0a3a5a510cac 100755 --- a/scripts/jest.js +++ b/scripts/jest.js @@ -40,7 +40,7 @@ // // node scripts/jest --coverage // -// See all cli options in https://facebook.github.io/jest/docs/cli.html +// See all cli options in https://jestjs.io/docs/cli var resolve = require('path').resolve; process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.js')); diff --git a/scripts/jest_integration.js b/scripts/jest_integration.js index d5c20b3501dd..78d9289fa1aa 100755 --- a/scripts/jest_integration.js +++ b/scripts/jest_integration.js @@ -40,7 +40,7 @@ // // node scripts/jest_integration --coverage // -// See all cli options in https://facebook.github.io/jest/docs/cli.html +// See all cli options in https://jestjs.io/docs/cli var resolve = require('path').resolve; process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.integration.js')); diff --git a/src/dev/jest/junit_reporter.js b/src/dev/jest/junit_reporter.js index 49bd0241a03f..e50951c38aa6 100644 --- a/src/dev/jest/junit_reporter.js +++ b/src/dev/jest/junit_reporter.js @@ -55,7 +55,7 @@ export default class JestJUnitReporter { /** * Called by jest when all tests complete * @param {Object} contexts - * @param {JestResults} results see https://facebook.github.io/jest/docs/en/configuration.html#testresultsprocessor-string + * @param {JestResults} results see https://jestjs.io/docs/configuration/#testresultsprocessor-string * @return {undefined} */ onRunComplete(contexts, results) { From 3dfd6993a2b2a812593d383f21a48c6742a968a8 Mon Sep 17 00:00:00 2001 From: Anan Zhuang Date: Tue, 9 May 2023 15:24:47 -0700 Subject: [PATCH 4/6] [CVE-2021-35065][1.x] Bump glob-parent from 6.0.0 to 6.0.2 (#3742) * [CVE-2021-35065][1.x] Bump glob-parent from 6.0.0 to 6.0.2 Issue Resolve https://github.com/opensearch-project/OpenSearch-Dashboards/issues/1103 Signed-off-by: Anan Zhuang * Update package.json Co-authored-by: Josh Romero Signed-off-by: Anan Zhuang --------- Signed-off-by: Anan Zhuang Co-authored-by: Josh Romero --- CHANGELOG.md | 1 + package.json | 2 +- yarn.lock | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b12b37df6c1..575b1fec595e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [CVE-2021-23382] Bump postcss from `8.2.10` to `8.2.13` ([#3739](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3739)) - [CVE-2021-3803] Bump nth-check from `1.0.2` to `2.0.1` ([#3729](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3729)) - [CVE-2022-25858] Bump terser from `4.8.0` to `4.8.1` ([#3726](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3726)) +- [CVE-2021-35065] Bump glob-parent from `6.0.0` to `6.0.2` ([#3742](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3742)) - [CVE-2022-25851] Bump jpeg-js from `0.4.1` to `0.4.4` ([#3741](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3741)) ### 📈 Features/Enhancements diff --git a/package.json b/package.json index 030b69c308de..1cc6962cdb40 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "**/flat": "^5.0.2", "**/follow-redirects": "^1.15.2", "**/front-matter": "^4.0.2", - "**/glob-parent": "^6.0.0", + "**/glob-parent": "^6.0.2", "**/hoist-non-react-statics": "^3.3.2", "**/immer": "^8.0.1", "**/istanbul-instrumenter-loader/schema-utils": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 14509b0f0e9c..1826c9577d09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10160,12 +10160,12 @@ glob-all@^3.2.1: glob "^7.1.2" yargs "^15.3.1" -glob-parent@^3.1.0, glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@^6.0.0, glob-parent@~5.1.0, glob-parent@~5.1.2: - version "6.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.0.tgz#f851b59b388e788f3a44d63fab50382b2859c33c" - integrity sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww== +glob-parent@^3.1.0, glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@~5.1.0, glob-parent@~5.1.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: - is-glob "^4.0.1" + is-glob "^4.0.3" glob-stream@^6.1.0: version "6.1.0" @@ -12188,6 +12188,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-glob@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + is-hexadecimal@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69" From 501ba8adf36f7de7f9481f6ab13efed9cf4b9abc Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Thu, 11 May 2023 14:47:06 -0700 Subject: [PATCH 5/6] [CCI] Replace `node` with `scripts/use_node` in functional tests (#3783) (#3970) * Replace node with scripts/use_node (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak * Update CHANGELOG.md (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak --------- Signed-off-by: Andrey Myssak Co-authored-by: Sergey Myssak Co-authored-by: Josh Romero (cherry picked from commit 8f890e98f1af903a10b07ccb48065a9c843da990) Co-authored-by: Andrey Myssak <40265277+andreymyssak@users.noreply.github.com> --- .../plugins/osd_tp_run_pipeline/package.json | 4 ++-- .../plugins/app_link_test/package.json | 4 ++-- .../plugins/core_app_status/package.json | 4 ++-- .../plugins/core_plugin_a/package.json | 4 ++-- .../plugins/core_plugin_appleave/package.json | 4 ++-- .../plugins/core_plugin_b/package.json | 4 ++-- .../plugins/core_plugin_chromeless/package.json | 4 ++-- .../core_plugin_route_timeouts/package.json | 4 ++-- .../core_plugin_static_assets/package.json | 4 ++-- .../plugins/core_provider_plugin/package.json | 4 ++-- .../plugins/data_search/package.json | 4 ++-- .../plugins/doc_views_links_plugin/package.json | 17 +++++++++++++++++ .../plugins/doc_views_plugin/package.json | 4 ++-- .../plugins/index_patterns/package.json | 4 ++-- .../plugins/management_test_plugin/package.json | 4 ++-- .../opensearch_client_plugin/package.json | 4 ++-- .../osd_sample_panel_action/package.json | 4 ++-- .../plugins/osd_top_nav/package.json | 4 ++-- .../osd_tp_custom_visualizations/package.json | 4 ++-- .../plugins/rendering_plugin/package.json | 4 ++-- .../plugins/ui_settings_plugin/package.json | 4 ++-- 21 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 test/plugin_functional/plugins/doc_views_links_plugin/package.json diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json index 442778a7b9df..01276017fc83 100644 --- a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/app_link_test/package.json b/test/plugin_functional/plugins/app_link_test/package.json index dd07b4de638c..c8be073d8c3c 100644 --- a/test/plugin_functional/plugins/app_link_test/package.json +++ b/test/plugin_functional/plugins/app_link_test/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_app_status/package.json b/test/plugin_functional/plugins/core_app_status/package.json index 524e33d8dfb2..95b0daea15c4 100644 --- a/test/plugin_functional/plugins/core_app_status/package.json +++ b/test/plugin_functional/plugins/core_app_status/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_a/package.json b/test/plugin_functional/plugins/core_plugin_a/package.json index b57d5783c77e..2f831305b1e1 100644 --- a/test/plugin_functional/plugins/core_plugin_a/package.json +++ b/test/plugin_functional/plugins/core_plugin_a/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_appleave/package.json b/test/plugin_functional/plugins/core_plugin_appleave/package.json index 5caa1a70f8d2..19a7cd5d3494 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/package.json +++ b/test/plugin_functional/plugins/core_plugin_appleave/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_b/package.json b/test/plugin_functional/plugins/core_plugin_b/package.json index d37ffd582e6d..12f9699d0a05 100644 --- a/test/plugin_functional/plugins/core_plugin_b/package.json +++ b/test/plugin_functional/plugins/core_plugin_b/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/package.json b/test/plugin_functional/plugins/core_plugin_chromeless/package.json index 0c444aaf80ca..3eb544b8d0c3 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/package.json +++ b/test/plugin_functional/plugins/core_plugin_chromeless/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json index 1b03b60ad387..d1991597424f 100644 --- a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json +++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/package.json b/test/plugin_functional/plugins/core_plugin_static_assets/package.json index e44a09af12cb..72b66daa5682 100644 --- a/test/plugin_functional/plugins/core_plugin_static_assets/package.json +++ b/test/plugin_functional/plugins/core_plugin_static_assets/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json index 778d9363e71d..7e1ebbf6a0da 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/package.json +++ b/test/plugin_functional/plugins/core_provider_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/data_search/package.json b/test/plugin_functional/plugins/data_search/package.json index 056a79f2139a..fd29f04b17df 100644 --- a/test/plugin_functional/plugins/data_search/package.json +++ b/test/plugin_functional/plugins/data_search/package.json @@ -6,8 +6,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/doc_views_links_plugin/package.json b/test/plugin_functional/plugins/doc_views_links_plugin/package.json new file mode 100644 index 000000000000..fdd7e77e30b8 --- /dev/null +++ b/test/plugin_functional/plugins/doc_views_links_plugin/package.json @@ -0,0 +1,17 @@ +{ + "name": "docViewLinksPlugin", + "version": "1.0.0", + "main": "target/test/plugin_functional/plugins/doc_views_links_plugin", + "opensearchDashboards": { + "version": "opensearchDashboards", + "templateVersion": "1.0.0" + }, + "license": "Apache-2.0", + "scripts": { + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" + }, + "devDependencies": { + "typescript": "4.0.2" + } +} diff --git a/test/plugin_functional/plugins/doc_views_plugin/package.json b/test/plugin_functional/plugins/doc_views_plugin/package.json index 67018cec9d95..27cc089d2398 100644 --- a/test/plugin_functional/plugins/doc_views_plugin/package.json +++ b/test/plugin_functional/plugins/doc_views_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/index_patterns/package.json b/test/plugin_functional/plugins/index_patterns/package.json index 3b88f3bf3932..b5d5bb239645 100644 --- a/test/plugin_functional/plugins/index_patterns/package.json +++ b/test/plugin_functional/plugins/index_patterns/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/management_test_plugin/package.json b/test/plugin_functional/plugins/management_test_plugin/package.json index b20971f403aa..ab3107b24b93 100644 --- a/test/plugin_functional/plugins/management_test_plugin/package.json +++ b/test/plugin_functional/plugins/management_test_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/opensearch_client_plugin/package.json b/test/plugin_functional/plugins/opensearch_client_plugin/package.json index 77d31a85f8f5..0770ca4334c7 100644 --- a/test/plugin_functional/plugins/opensearch_client_plugin/package.json +++ b/test/plugin_functional/plugins/opensearch_client_plugin/package.json @@ -6,8 +6,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json index afb904c8e2d7..a48ddedb1a8a 100644 --- a/test/plugin_functional/plugins/osd_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/osd_sample_panel_action/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/osd_top_nav/package.json b/test/plugin_functional/plugins/osd_top_nav/package.json index a1a244da27cd..bceb4a94defd 100644 --- a/test/plugin_functional/plugins/osd_top_nav/package.json +++ b/test/plugin_functional/plugins/osd_top_nav/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json index 7e49a188da55..2588ca7c5d09 100644 --- a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/rendering_plugin/package.json b/test/plugin_functional/plugins/rendering_plugin/package.json index 2548cfef508e..f9a3a284bc41 100644 --- a/test/plugin_functional/plugins/rendering_plugin/package.json +++ b/test/plugin_functional/plugins/rendering_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/ui_settings_plugin/package.json b/test/plugin_functional/plugins/ui_settings_plugin/package.json index db9bedec26d0..c290ee995d13 100644 --- a/test/plugin_functional/plugins/ui_settings_plugin/package.json +++ b/test/plugin_functional/plugins/ui_settings_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" From 364832d4a91cb0edc61d8eaebd8b324e640729ba Mon Sep 17 00:00:00 2001 From: Anan Zhuang Date: Thu, 11 May 2023 14:54:00 -0700 Subject: [PATCH 6/6] [CVE-2022-48285][1.x] Bump jszip from 3.7.1 to 3.10.1 (#3740) * [CVE-2022-48285][1.x] Bump jszip from 3.7.1 to 3.10.1 loadAsync in JSZip before 3.8.0 allows Directory Traversal via a crafted ZIP archive. This CVE requires to bump jszip to 3.8.0+. Signed-off-by: Anan Zhuang * remove unecessary resolution remove yarn.lock entry, clean and bootstrap Signed-off-by: Josh Romero --------- Signed-off-by: Anan Zhuang Signed-off-by: Josh Romero Co-authored-by: Josh Romero Co-authored-by: Sean Neumann <1413295+seanneumann@users.noreply.github.com> --- CHANGELOG.md | 1 + yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 575b1fec595e..5775e504a714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [CVE-2022-25858] Bump terser from `4.8.0` to `4.8.1` ([#3726](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3726)) - [CVE-2021-35065] Bump glob-parent from `6.0.0` to `6.0.2` ([#3742](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3742)) - [CVE-2022-25851] Bump jpeg-js from `0.4.1` to `0.4.4` ([#3741](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3741)) +- [CVE-2022-48285] Bump jszip from `3.7.1` to `3.10.1` ([#3740](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3740)) ### 📈 Features/Enhancements diff --git a/yarn.lock b/yarn.lock index 1826c9577d09..b0c10ce1b0b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13551,14 +13551,14 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.4.1: object.assign "^4.1.0" jszip@^3.2.2: - version "3.7.1" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9" - integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg== + version "3.10.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" + integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== dependencies: lie "~3.3.0" pako "~1.0.2" readable-stream "~2.3.6" - set-immediate-shim "~1.0.1" + setimmediate "^1.0.5" junk@^3.1.0: version "3.1.0" @@ -18968,7 +18968,7 @@ set-harmonic-interval@^1.0.1: resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g== -set-immediate-shim@^1.0.0, set-immediate-shim@~1.0.1: +set-immediate-shim@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= @@ -18983,10 +18983,10 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@^1.0.4: +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== setprototypeof@1.1.0: version "1.1.0"