From 6419f994ffdd5bc3c1fd64ae1c36427dd6316997 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Tue, 13 Jun 2023 20:41:00 +0100
Subject: [PATCH] Handle case where `workingDir` is `undefined`

---
 lib/resolve-environment.js     | 5 ++++-
 lib/resolve-environment.js.map | 2 +-
 src/resolve-environment.ts     | 9 ++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/resolve-environment.js b/lib/resolve-environment.js
index 62597b3cb..e9c008e3d 100644
--- a/lib/resolve-environment.js
+++ b/lib/resolve-environment.js
@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runResolveBuildEnvironment = void 0;
 const codeql_1 = require("./codeql");
 async function runResolveBuildEnvironment(cmd, logger, workingDir, language) {
-    logger.startGroup(`Attempting to resolve build environment for ${language} in ${workingDir}`);
+    logger.startGroup(`Attempting to resolve build environment for ${language}`);
+    if (workingDir !== undefined) {
+        logger.info(`Using ${workingDir} as the working directory.`);
+    }
     const codeql = await (0, codeql_1.getCodeQL)(cmd);
     const result = await codeql.resolveBuildEnvironment(workingDir, language);
     logger.endGroup();
diff --git a/lib/resolve-environment.js.map b/lib/resolve-environment.js.map
index baafca99d..b616be3fc 100644
--- a/lib/resolve-environment.js.map
+++ b/lib/resolve-environment.js.map
@@ -1 +1 @@
-{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAI9B,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,QAAkB;IAElB,MAAM,CAAC,UAAU,CACf,+CAA+C,QAAQ,OAAO,UAAU,EAAE,CAC3E,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,gEAaC"}
\ No newline at end of file
+{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAI9B,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,QAAkB;IAElB,MAAM,CAAC,UAAU,CAAC,+CAA+C,QAAQ,EAAE,CAAC,CAAC;IAE7E,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,4BAA4B,CAAC,CAAC;KAC9D;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,gEAgBC"}
\ No newline at end of file
diff --git a/src/resolve-environment.ts b/src/resolve-environment.ts
index 2b342fcb8..3bc6837cc 100644
--- a/src/resolve-environment.ts
+++ b/src/resolve-environment.ts
@@ -8,9 +8,12 @@ export async function runResolveBuildEnvironment(
   workingDir: string | undefined,
   language: Language
 ) {
-  logger.startGroup(
-    `Attempting to resolve build environment for ${language} in ${workingDir}`
-  );
+  logger.startGroup(`Attempting to resolve build environment for ${language}`);
+
+  if (workingDir !== undefined) {
+    logger.info(`Using ${workingDir} as the working directory.`);
+  }
+
   const codeql = await getCodeQL(cmd);
   const result = await codeql.resolveBuildEnvironment(workingDir, language);
   logger.endGroup();