Fix failing test and address PR comments

lib/codeql.js

@@ -866,7 +866,7 @@ async function generateCodescanningConfig(codeql, config) {
     }
     const configLocation = path.resolve(config.tempDir, "user-config.yaml");
     // make a copy so we can modify it
-    const augmentedConfig = JSON.parse(JSON.stringify(config.originalUserInput));
+    const augmentedConfig = cloneObject(config.originalUserInput);
     // Inject the queries from the input
     if (config.augmentationProperties.queriesInput) {
         if (config.augmentationProperties.queriesInputCombines) {
@@ -921,4 +921,7 @@ async function generateCodescanningConfig(codeql, config) {
     fs.writeFileSync(configLocation, yaml.dump(augmentedConfig));
     return configLocation;
 }
+function cloneObject(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
 //# sourceMappingURL=codeql.js.map

lib/config-utils.js

@@ -47,6 +47,8 @@ exports.defaultAugmentationProperties = {
     queriesInputCombines: false,
     packsInputCombines: false,
     injectedMlQueries: false,
+    packsInput: undefined,
+    queriesInput: undefined,
 };
 /**
  * A list of queries from https://github.com/github/codeql that

lib/config-utils.test.js

@@ -839,7 +839,8 @@ const invalidPackNameMacro = ava_1.default.macro({
  * Test macro for testing the packs block and the packs input
  */
 function parseInputAndConfigMacro(t, packsFromConfig, packsFromInput, languages, expected) {
-    t.deepEqual(configUtils.parsePacks(packsFromConfig, packsFromInput, !!(packsFromInput === null || packsFromInput === void 0 ? void 0 : packsFromInput.trim().startsWith("+")), languages, "/a/b", mockLogger), expected);
+    t.deepEqual(configUtils.parsePacks(packsFromConfig, packsFromInput, !!(packsFromInput === null || packsFromInput === void 0 ? void 0 : packsFromInput.trim().startsWith("+")), // coerce to boolean
+    languages, "/a/b", mockLogger), expected);
 }
 parseInputAndConfigMacro.title = (providedTitle) => `Parse Packs input and config: ${providedTitle}`;
 const mockLogger = {

lib/util.js

@@ -649,9 +649,8 @@ exports.isInTestMode = isInTestMode;
  * that gets passed to the CLI.
  */
 async function useCodeScanningConfigInCli(codeql) {
-    return ((process.env[EnvVar.CODEQL_PASS_CONFIG_TO_CLI] === "true" &&
-        (await codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_CONFIG_FILES))) ||
-        false);
+    return (process.env[EnvVar.CODEQL_PASS_CONFIG_TO_CLI] === "true" &&
+        (await codeQlVersionAbove(codeql, codeql_1.CODEQL_VERSION_CONFIG_FILES)));
 }
 exports.useCodeScanningConfigInCli = useCodeScanningConfigInCli;
 //# sourceMappingURL=util.js.map