[2.4] Upgrade decode-uri-component and qs (#567)

* [1.x] Upgrade decode-uri-component (#558) (#560) * upgrade loader-utils for CVE-2022-37601 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update async for CVE-2021-43138 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix cross-fetch for CVE-2022-1365 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix for CVE-2022-37599, CVE-2022-37603 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update terser for CVE-2022-25858 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update minimatch for CVE-2022-3517 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update moment for CVE-2022-24785 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update jsdom for CVE-2021-20066 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update execa for GMS-2020-2 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update qs for CVE-2022-24999 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update moment for CVE-2022-31129 Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update decode-uri-component for CVE-2022-38900 Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Rupal Mahajan <maharup@amazon.com> (cherry picked from commit d3f36b5) Co-authored-by: Rupal Mahajan <maharup@amazon.com> * update qs 6.5.3 (#545) Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix dashboard reporting build Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix repo name for build Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Update windows & mac CI for reo name change Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: Rupal Mahajan <maharup@amazon.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
opensearch-project · Dec 6, 2022 · bc7e5db · bc7e5db
1 parent 3eb9a44
commit bc7e5db
Show file tree

Hide file tree

Showing 2 changed files with 2,076 additions and 52 deletions.
diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -119,12 +119,12 @@ jobs:
         with:
           repository: opensearch-project/Opensearch-Dashboards
           ref: ${{ env.OPENSEARCH_VERSION }}
-          path: dashboards-reports/OpenSearch-Dashboards
+          path: OpenSearch-Dashboards
 
       - name: Get node version
         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=node_version::$(node -p "(require('../OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
 
       - name: Setup Node
         uses: actions/setup-node@v1
@@ -134,11 +134,11 @@ jobs:
 
 
       - name: Move Dashboards Reports to Plugins Dir
-        run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+        run: mv dashboards-reports ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
 
       - name: Add Chromium Binary to Reporting for Testing
         run: |
-          cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+          cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
           curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip
           Expand-Archive -Path 'chromium-windows-x64.zip'
           Move-Item -Path "./chromium-windows-x64/.chromium" -Destination "./.chromium"
@@ -150,18 +150,18 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn osd bootstrap
+          command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn osd bootstrap
 
       - name: Test
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn test
+          command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn test
 
       - name: Build Artifact
         run: |
-          cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+          cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
           yarn build
 
           cd build
@@ -182,7 +182,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: dashboards-reports-windows-x64
-          path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip
+          path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip
 
   macos-build:
     runs-on: macos-latest
@@ -195,12 +195,12 @@ jobs:
         with:
           repository: opensearch-project/Opensearch-Dashboards
           ref: ${{ env.OPENSEARCH_VERSION }}
-          path: dashboards-reports/OpenSearch-Dashboards
+          path: OpenSearch-Dashboards
 
       - name: Get node version
         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=node_version::$(node -p "(require('../OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
 
       - name: Setup Node
         uses: actions/setup-node@v1
@@ -210,11 +210,11 @@ jobs:
 
 
       - name: Move Dashboards Reports to Plugins Dir
-        run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+        run: mv dashboards-reports ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
 
       - name: Add Chromium Binary to Reporting for Testing
         run: |
-          cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+          cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
           wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip 
           unzip chromium-macos-x64.zip
           rm chromium-macos-x64.zip
@@ -224,18 +224,18 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap
+          command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap
 
       - name: Test
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test
+          command: cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test
 
       - name: Build Artifact
         run: |
-          cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+          cd ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
           yarn build
 
           cd build
@@ -253,4 +253,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: dashboards-reports-macosx-x64
-          path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip
+          path: ../OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip