From 166906fc8165065ebb7935e50d6323a96e16141d Mon Sep 17 00:00:00 2001 From: Andrey Myssak Date: Tue, 4 Apr 2023 22:24:43 +0600 Subject: [PATCH 1/2] Replace node with scripts/use_node (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak --- .../plugins/osd_tp_run_pipeline/package.json | 4 ++-- test/plugin_functional/plugins/app_link_test/package.json | 4 ++-- test/plugin_functional/plugins/core_app_status/package.json | 4 ++-- test/plugin_functional/plugins/core_plugin_a/package.json | 4 ++-- .../plugins/core_plugin_appleave/package.json | 4 ++-- test/plugin_functional/plugins/core_plugin_b/package.json | 4 ++-- .../plugins/core_plugin_chromeless/package.json | 4 ++-- .../plugins/core_plugin_route_timeouts/package.json | 4 ++-- .../plugins/core_plugin_static_assets/package.json | 4 ++-- .../plugins/core_provider_plugin/package.json | 4 ++-- test/plugin_functional/plugins/data_search/package.json | 4 ++-- .../plugins/doc_views_links_plugin/package.json | 4 ++-- test/plugin_functional/plugins/doc_views_plugin/package.json | 4 ++-- test/plugin_functional/plugins/index_patterns/package.json | 4 ++-- .../plugins/management_test_plugin/package.json | 4 ++-- .../plugins/opensearch_client_plugin/package.json | 4 ++-- .../plugins/osd_sample_panel_action/package.json | 4 ++-- test/plugin_functional/plugins/osd_top_nav/package.json | 4 ++-- .../plugins/osd_tp_custom_visualizations/package.json | 4 ++-- test/plugin_functional/plugins/rendering_plugin/package.json | 4 ++-- .../plugin_functional/plugins/ui_settings_plugin/package.json | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) 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 45476309224d..a0ff828390c6 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": "npm:@opensearch-project/oui@1.0.0", 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 index 7cc258622ae8..fdd7e77e30b8 100644 --- a/test/plugin_functional/plugins/doc_views_links_plugin/package.json +++ b/test/plugin_functional/plugins/doc_views_links_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/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 34ebf31d78f6..5c5237717ac3 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": "npm:@opensearch-project/oui@1.0.0", 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 18961a35fda4..23be4ebf14d2 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": "npm:@opensearch-project/oui@1.0.0", 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 4c87c16d7c2a046dc1d2a5bbb81de2d964376c4f Mon Sep 17 00:00:00 2001 From: Andrey Myssak Date: Tue, 4 Apr 2023 22:42:34 +0600 Subject: [PATCH 2/2] Update CHANGELOG.md (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3628963e9b5..5d7d3749446e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Use mirrors to download Node.js binaries to escape sporadic 404 errors ([#3619](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3619)) - [Multiple DataSource] Refactor dev tool console to use opensearch-js client to send requests ([#3544](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3544)) - [Data] Add geo shape filter field ([#3605](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3605)) +- [Tests] Use `scripts/use_node` instead of `node` in functional test plugins ([#3783](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3783)) ### 🐛 Bug Fixes