From 2db8334b573128c48c226a1d2bdcc7ff9086687f Mon Sep 17 00:00:00 2001
From: Josh Romero <rmerqg@amazon.com>
Date: Wed, 28 Jun 2023 11:09:59 -0700
Subject: [PATCH] Revert "[CCI] Replace `node` with `scripts/use_node` in
 functional tests (#3783) (#3970)"

This reverts commit 501ba8adf36f7de7f9481f6ab13efed9cf4b9abc.
---
 .../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, 40 insertions(+), 57 deletions(-)
 delete 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 01276017fc83..442778a7b9df 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 c8be073d8c3c..dd07b4de638c 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 95b0daea15c4..524e33d8dfb2 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 2f831305b1e1..b57d5783c77e 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 19a7cd5d3494..5caa1a70f8d2 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 12f9699d0a05..d37ffd582e6d 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 3eb544b8d0c3..0c444aaf80ca 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 d1991597424f..1b03b60ad387 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 72b66daa5682..e44a09af12cb 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 7e1ebbf6a0da..778d9363e71d 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 fd29f04b17df..056a79f2139a 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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
deleted file mode 100644
index fdd7e77e30b8..000000000000
--- a/test/plugin_functional/plugins/doc_views_links_plugin/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "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 27cc089d2398..67018cec9d95 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 b5d5bb239645..3b88f3bf3932 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 ab3107b24b93..b20971f403aa 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 0770ca4334c7..77d31a85f8f5 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 a48ddedb1a8a..afb904c8e2d7 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 bceb4a94defd..a1a244da27cd 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 2588ca7c5d09..7e49a188da55 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 f9a3a284bc41..2548cfef508e 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "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 c290ee995d13..db9bedec26d0 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": "../../../../scripts/use_node ../../../../scripts/osd.js",
-    "build": "../../../../scripts/use_node ../../scripts/remove.js './target' && tsc"
+    "osd": "node ../../../../scripts/osd.js",
+    "build": "node ../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"