[1.3] Update qs, minimatch and yaml versions (#65)

* Revert "Add fix for CVE-2023-2251 (#60)" yaml@2.2.2 does not support node v10.24.1 This reverts commit e8bb51e. Signed-off-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> * Update qs version for CVE-2022-24999 Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> * Update minimatch version for CVE-2022-3517 Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> * Add github workflows (#35) * Add github workflows Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix env name Signed-off-by: Joshua Li <joshuali925@gmail.com> --------- Signed-off-by: Joshua Li <joshuali925@gmail.com> Signed-off-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> * Rerun CI without macos Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix workflow for windows test Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Revert "Fix workflow for windows test" This reverts commit 377e91b. Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update workflow Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Revert "Update workflow" This reverts commit 85e22c1. Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Retry CI Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Retry workflow Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix yaml syntax Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Rerun CI Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Try bash for test Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Rerun workflow Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix version Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix Path Signed-off-by: Rupal Mahajan <maharup@amazon.com> * fix path Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix node path issue Signed-off-by: Rupal Mahajan <maharup@amazon.com> --------- Signed-off-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Joshua Li <joshuali925@gmail.com> Co-authored-by: Ubuntu <ubuntu@ip-172-31-49-94.us-west-2.compute.internal> Co-authored-by: Joshua Li <joshuali925@gmail.com>
opensearch-project · May 1, 2023 · 7f11aa7 · 7f11aa7
1 parent 8856e45
commit 7f11aa7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/sql-workbench-test-build-workflow.yml b/.github/workflows/sql-workbench-test-build-workflow.yml
@@ -12,14 +12,14 @@ on:
 env:
   PLUGIN_NAME: dashboards-query-workbench
   OPENSEARCH_DASHBOARDS_VERSION: '1.3'
-  OPENSEARCH_PLUGIN_VERSION: 1.3.8.0
+  OPENSEARCH_PLUGIN_VERSION: 1.3.9.0
 
 jobs:
   tests:
     name: Run unit tests
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       # Enable longer filenames for windows
@@ -32,21 +32,20 @@ jobs:
           repository: opensearch-project/OpenSearch-Dashboards
           ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
           path: OpenSearch-Dashboards
-      - name: Get node and yarn versions
-        id: versions_step
-        run: |
-          echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
-          echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"
-      - name: Setup node
-        uses: actions/setup-node@v1
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ steps.versions_step.outputs.node_version }}
+          node-version-file: './OpenSearch-Dashboards/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
-      - name: Install correct yarn version for OpenSearch Dashboards
+      - name: Install Yarn
+        # Need to use bash to avoid having a windows/linux specific step
+        shell: bash
         run: |
-          npm uninstall -g yarn
-          echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
-          npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}
+          YARN_VERSION=$(node -p "require('./OpenSearch-Dashboards/package.json').engines.yarn")
+          echo "Installing yarn@$YARN_VERSION"
+          npm i -g yarn@$YARN_VERSION
+      - run: node -v
+      - run: yarn -v
       - name: Checkout workbench OpenSearch Dashboards plugin
         uses: actions/checkout@v2
         with:
@@ -76,4 +75,4 @@ jobs:
         uses: actions/upload-artifact@v1 # can't update to v3 because upload fails
         with:
           name: dashboards-query-workbench-${{ matrix.os }}
-          path: OpenSearch-Dashboards/plugins/dashboards-query-workbench/build
+          path: OpenSearch-Dashboards/plugins/dashboards-query-workbench/build
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "start": "plugin-helpers start",
     "test:server": "plugin-helpers test:server",
     "test:browser": "plugin-helpers test:browser",
-    "test:jest": "NODE_PATH=../../node_modules ../../node_modules/.bin/jest --config ./test/jest.config.js",
+    "test:jest": "../../node_modules/.bin/jest --config test/jest.config.js",
     "build": "yarn plugin_helpers build",
     "plugin_helpers": "node ../../scripts/plugin_helpers"
   },
@@ -57,7 +57,6 @@
     "**/@types/react-router-dom": "^4.3.1",
     "eslint-utils": "^2.0.0",
     "json-schema": "^0.4.0",
-    "**/@types/react": "16.3.14",
-    "yaml": "^2.2.2"
+    "**/@types/react": "16.3.14"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1886,9 +1886,9 @@ mimic-fn@^2.1.0:
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -2190,9 +2190,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
 querystring@0.2.0:
   version "0.2.0"
@@ -2869,10 +2869,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.2.tgz#ec551ef37326e6d42872dad1970300f8eb83a073"
-  integrity sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@20.x:
   version "20.2.9"