From d76bb2ae8406606637bc99500227fbda1a73bf30 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Wed, 16 Jun 2021 08:54:10 -0400
Subject: [PATCH] Sec audit update

Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
 dist/index.js     | 14 +++++++-------
 package-lock.json | 12 +++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 2d04887..1b13a76 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2978,16 +2978,16 @@ function run() {
                 core.setFailed('Please provide jdkversion if jdksource is github-hosted installed or AdoptOpenJKD/install-jdk installed.');
             }
             if (vendorTestRepos !== '') {
-              vendorTestParams = `--vendor_repos ${vendorTestRepos}`;
+                vendorTestParams = `--vendor_repos ${vendorTestRepos}`;
             }
             if (vendorTestBranches !== '') {
-              vendorTestParams += ` --vendor_branches ${vendorTestBranches}`;
+                vendorTestParams += ` --vendor_branches ${vendorTestBranches}`;
             }
             if (vendorTestDirs !== '') {
-              vendorTestParams += ` --vendor_dirs ${vendorTestDirs}`;
+                vendorTestParams += ` --vendor_dirs ${vendorTestDirs}`;
             }
             if (vendorTestShas !== '') {
-              vendorTestParams += ` --vendor_shas ${vendorTestShas}`;
+                vendorTestParams += ` --vendor_shas ${vendorTestShas}`;
             }
             yield runaqa.runaqaTest(version, jdksource, buildList, target, customTarget, openjdktestRepo, openj9Repo, tkgRepo, vendorTestParams);
         }
@@ -3403,13 +3403,13 @@ function runaqaTest(version, jdksource, buildList, target, customTarget, openjdk
         //Get Dependencies, using /*zip*/dependents.zip to avoid loop every available files
         let dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/test.getDependency/lastSuccessfulBuild/artifact//*zip*/dependents.zip');
         // Test.dependency only has one level of archive directory, none of actions toolkit support mv files by regex. Using 7zip discards the directory directly
-        yield exec.exec(`7z e ${dependents} -o${process.env.GITHUB_WORKSPACE}/openjdk-tests/TKG/lib`);
+        yield exec.exec(`7z e ${dependents} -o${process.env.GITHUB_WORKSPACE}/aqa-tests/TKG/lib`);
         if (buildList.includes('system')) {
             dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/systemtest.getDependency/lastSuccessfulBuild/artifact/*zip*/dependents.zip');
             // System.dependency has different levels of archive structures archive/systemtest_prereqs/*.*
             // None of io.mv, io.cp and exec.exec can mv directories as expected (mv archive/ ./). Move subfolder systemtest_prereqs instead.
-            const dependentPath = yield tc.extractZip(dependents, `${process.env.GITHUB_WORKSPACE}/openjdk-tests`);
-            yield io.mv(`${dependentPath}/archive/systemtest_prereqs`, `${process.env.GITHUB_WORKSPACE}/openjdk-tests`);
+            const dependentPath = yield tc.extractZip(dependents, `${process.env.GITHUB_WORKSPACE}/`);
+            yield io.mv(`${dependentPath}/archive/systemtest_prereqs`, `${process.env.GITHUB_WORKSPACE}/aqa-tests`);
             yield io.rmRF(`${dependentPath}/archive`);
         }
         const options = {};
diff --git a/package-lock.json b/package-lock.json
index ee4686a..b5c5d0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1165,6 +1165,12 @@
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
           "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
           "dev": true
+        },
+        "ws": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
+          "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+          "dev": true
         }
       }
     },
@@ -9785,9 +9791,9 @@
       }
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "dev": true
     },
     "xml-name-validator": {