Address comments

github · May 5, 2021 · cd7eedd · cd7eedd
1 parent aa53f64
commit cd7eedd
Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/actions-util.test.js b/lib/actions-util.test.js
diff --git a/lib/actions-util.test.js.map b/lib/actions-util.test.js.map
diff --git a/lib/upload-lib.js.map b/lib/upload-lib.js.map
diff --git a/src/actions-util.test.ts b/src/actions-util.test.ts
@@ -112,6 +112,16 @@ test("computeAutomationID()", async (t) => {
     actualAutomationID,
     ".github/workflows/codeql-analysis.yml:analyze/number:/object:/"
   );
+
+  // check undefined environment
+  actualAutomationID = actionsutil.computeAutomationID(
+    ".github/workflows/codeql-analysis.yml:analyze",
+    undefined
+  );
+  t.deepEqual(
+    actualAutomationID,
+    ".github/workflows/codeql-analysis.yml:analyze/"
+  );
 });
 
 test("prepareEnvironment() when a local run", (t) => {

diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -433,13 +433,13 @@ export async function getAutomationID(): Promise<string> {
 }
 
 export function computeAutomationID(
-  analysis_key: string | undefined,
+  analysis_key: string,
   environment: string | undefined
 ): string {
   let automationID = `${analysis_key}/`;
 
   // the id has to be deterministic so we sort the fields
-  if (environment !== undefined && environment !== "null") {
+  if (environment) {
     const environmentObject = JSON.parse(environment);
     for (const entry of Object.entries(environmentObject).sort()) {
       if (typeof entry[1] === "string") {

diff --git a/src/upload-lib.ts b/src/upload-lib.ts
@@ -67,7 +67,7 @@ export function populateRunAutomationDetails(
 
 function getAutomationID(
   category: string | undefined,
-  analysis_key: string | undefined,
+  analysis_key: string,
   environment: string | undefined
 ): string {
   if (category !== undefined) {