github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-10-03 09:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Actions logger in API client

Browse Source 
This allows us to remove the `console-log-level` dependency.
This commit is contained in:
Henry Mercer
2025-10-28 12:15:03 +00:00
parent 20900ee769
commit 8b1e55d11e
15 changed files with 86 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/analyze-action-post.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -26499,7 +26499,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -28088,55 +28087,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -118552,7 +118502,6 @@ var restoreInputs = function() {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
var GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";
function createApiClientWithDetails(apiDetails, { allowExternal = false } = {}) {
const auth = allowExternal && apiDetails.externalRepoAuth || apiDetails.auth;
@@ -118561,7 +118510,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

64
lib/analyze-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning7(message, properties = {}) {
function warning8(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning7;
exports2.warning = warning8;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -32348,7 +32348,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -33937,55 +33936,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -90258,7 +90208,6 @@ var core11 = __toESM(require_core());
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -90293,7 +90242,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}
@@ -95842,9 +95794,9 @@ function validateSarifFileSchema(sarif, sarifFilePath, logger) {
const warnings = (result.errors ?? []).filter(
(err) => err.name === "format" && typeof err.argument === "string" && warningAttributes.includes(err.argument)
);
for (const warning7 of warnings) {
for (const warning8 of warnings) {
logger.info(
`Warning: '${warning7.instance}' is not a valid URI in '${warning7.property}'.`
`Warning: '${warning8.instance}' is not a valid URI in '${warning8.property}'.`
);
}
if (errors.length > 0) {

60
lib/autobuild-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -26499,7 +26499,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -28088,55 +28087,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -79248,7 +79198,6 @@ async function runTool(cmd, args = [], opts = {}) {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -79283,7 +79232,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

64
lib/init-action-post.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning9(message, properties = {}) {
function warning10(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning9;
exports2.warning = warning10;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -32348,7 +32348,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -33937,55 +33936,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -128478,7 +128428,6 @@ function fixCodeQualityCategory(logger, category) {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -128513,7 +128462,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}
@@ -133235,9 +133187,9 @@ function validateSarifFileSchema(sarif, sarifFilePath, logger) {
const warnings = (result.errors ?? []).filter(
(err) => err.name === "format" && typeof err.argument === "string" && warningAttributes.includes(err.argument)
);
for (const warning9 of warnings) {
for (const warning10 of warnings) {
logger.info(
`Warning: '${warning9.instance}' is not a valid URI in '${warning9.property}'.`
`Warning: '${warning10.instance}' is not a valid URI in '${warning10.property}'.`
);
}
if (errors.length > 0) {

60
lib/init-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning8(message, properties = {}) {
function warning9(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning8;
exports2.warning = warning9;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -32348,7 +32348,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -33937,55 +33936,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -87574,7 +87524,6 @@ var codeQualityQueries = ["code-quality"];
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -87609,7 +87558,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

60
lib/resolve-environment-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -26499,7 +26499,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -28088,55 +28087,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -79256,7 +79206,6 @@ async function runTool(cmd, args = [], opts = {}) {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -79291,7 +79240,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

60
lib/setup-codeql-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -32348,7 +32348,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -33937,55 +33936,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js
var require_internal_glob_options_helper = __commonJS({
"node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js"(exports2) {
@@ -85950,7 +85900,6 @@ async function runTool(cmd, args = [], opts = {}) {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -85985,7 +85934,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

60
lib/start-proxy-action-post.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -26499,7 +26499,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -28088,55 +28087,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -118435,7 +118385,6 @@ var restoreInputs = function() {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
var GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";
function createApiClientWithDetails(apiDetails, { allowExternal = false } = {}) {
const auth = allowExternal && apiDetails.externalRepoAuth || apiDetails.auth;
@@ -118444,7 +118393,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

60
lib/start-proxy-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning4(message, properties = {}) {
function warning5(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning4;
exports2.warning = warning5;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -45035,7 +45035,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -46624,55 +46623,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/jsonschema/lib/helpers.js
var require_helpers = __commonJS({
"node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
@@ -96273,7 +96223,6 @@ var persistInputs = function() {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -96307,7 +96256,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

64
lib/upload-lib.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning6(message, properties = {}) {
function warning7(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning6;
exports2.warning = warning7;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -33645,7 +33645,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -35234,55 +35233,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js
var require_internal_glob_options_helper = __commonJS({
"node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js"(exports2) {
@@ -88643,7 +88593,6 @@ var SarifScanOrder = [CodeQuality, CodeScanning];
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -88678,7 +88627,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}
@@ -92645,9 +92597,9 @@ function validateSarifFileSchema(sarif, sarifFilePath, logger) {
const warnings = (result.errors ?? []).filter(
(err) => err.name === "format" && typeof err.argument === "string" && warningAttributes.includes(err.argument)
);
for (const warning6 of warnings) {
for (const warning7 of warnings) {
logger.info(
`Warning: '${warning6.instance}' is not a valid URI in '${warning6.property}'.`
`Warning: '${warning7.instance}' is not a valid URI in '${warning7.property}'.`
);
}
if (errors.length > 0) {

60
lib/upload-sarif-action-post.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning7(message, properties = {}) {
function warning8(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning7;
exports2.warning = warning8;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -26499,7 +26499,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -28088,55 +28087,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/@actions/artifact/lib/internal/shared/config.js
var require_config = __commonJS({
"node_modules/@actions/artifact/lib/internal/shared/config.js"(exports2) {
@@ -118439,7 +118389,6 @@ var restoreInputs = function() {
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
var GITHUB_ENTERPRISE_VERSION_HEADER = "x-github-enterprise-version";
function createApiClientWithDetails(apiDetails, { allowExternal = false } = {}) {
const auth = allowExternal && apiDetails.externalRepoAuth || apiDetails.auth;
@@ -118448,7 +118397,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}

64
lib/upload-sarif-action.js generated
View File

@@ -19743,10 +19743,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
(0, command_1.issueCommand)("error", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.error = error2;
function warning7(message, properties = {}) {
function warning8(message, properties = {}) {
(0, command_1.issueCommand)("warning", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
exports2.warning = warning7;
exports2.warning = warning8;
function notice(message, properties = {}) {
(0, command_1.issueCommand)("notice", (0, utils_1.toCommandProperties)(properties), message instanceof Error ? message.toString() : message);
}
@@ -32348,7 +32348,6 @@ var require_package = __commonJS({
"@schemastore/package": "0.0.10",
archiver: "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
del: "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -33937,55 +33936,6 @@ var require_dist_node15 = __commonJS({
}
});
// node_modules/console-log-level/index.js
var require_console_log_level = __commonJS({
"node_modules/console-log-level/index.js"(exports2, module2) {
"use strict";
var util = require("util");
var levels = ["trace", "debug", "info", "warn", "error", "fatal"];
var noop2 = function() {
};
module2.exports = function(opts) {
opts = opts || {};
opts.level = opts.level || "info";
var logger = {};
var shouldLog = function(level) {
return levels.indexOf(level) >= levels.indexOf(opts.level);
};
levels.forEach(function(level) {
logger[level] = shouldLog(level) ? log : noop2;
function log() {
var prefix = opts.prefix;
var normalizedLevel;
if (opts.stderr) {
normalizedLevel = "error";
} else {
switch (level) {
case "trace":
normalizedLevel = "info";
break;
case "debug":
normalizedLevel = "info";
break;
case "fatal":
normalizedLevel = "error";
break;
default:
normalizedLevel = level;
}
}
if (prefix) {
if (typeof prefix === "function") prefix = prefix(level);
arguments[0] = util.format(prefix, arguments[0]);
}
console[normalizedLevel](util.format.apply(util, arguments));
}
});
return logger;
};
}
});
// node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js
var require_internal_glob_options_helper = __commonJS({
"node_modules/@actions/cache/node_modules/@actions/glob/lib/internal-glob-options-helper.js"(exports2) {
@@ -88852,7 +88802,6 @@ var SarifScanOrder = [CodeQuality, CodeScanning];
var core5 = __toESM(require_core());
var githubUtils = __toESM(require_utils4());
var retry = __toESM(require_dist_node15());
var import_console_log_level = __toESM(require_console_log_level());
// src/repository.ts
function getRepositoryNwo() {
@@ -88887,7 +88836,10 @@ function createApiClientWithDetails(apiDetails, { allowExternal = false } = {})
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: (0, import_console_log_level.default)({ level: "debug" })
log: {
...core5,
warn: core5.warning
}
})
);
}
@@ -93301,9 +93253,9 @@ function validateSarifFileSchema(sarif, sarifFilePath, logger) {
const warnings = (result.errors ?? []).filter(
(err) => err.name === "format" && typeof err.argument === "string" && warningAttributes.includes(err.argument)
);
for (const warning7 of warnings) {
for (const warning8 of warnings) {
logger.info(
`Warning: '${warning7.instance}' is not a valid URI in '${warning7.property}'.`
`Warning: '${warning8.instance}' is not a valid URI in '${warning8.property}'.`
);
}
if (errors.length > 0) {

7
package-lock.json generated
View File

@@ -24,7 +24,6 @@
"@schemastore/package": "0.0.10",
"archiver": "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
"del": "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",
@@ -4257,6 +4256,8 @@
},
"node_modules/check-disk-space": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/check-disk-space/-/check-disk-space-3.4.0.tgz",
"integrity": "sha512-drVkSqfwA+TvuEhFipiR1OC9boEGZL5RrWvVsOthdcvQNXyCCuKkEiTOTXZ7qxSf/GLwq4GvzfrQD/Wz325hgw==",
"license": "MIT",
"engines": {
"node": ">=16"
@@ -4480,10 +4481,6 @@
"node": "^14.18.0 || >=16.10.0"
}
},
"node_modules/console-log-level": {
"version": "1.4.1",
"license": "MIT"
},
"node_modules/convert-to-spaces": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz",

1
package.json
View File

@@ -39,7 +39,6 @@
"@schemastore/package": "0.0.10",
"archiver": "^7.0.1",
"check-disk-space": "^3.4.0",
"console-log-level": "^1.4.1",
"del": "^8.0.0",
"fast-deep-equal": "^3.1.3",
"follow-redirects": "^1.15.11",

6
src/api-client.ts
View File

@@ -1,7 +1,6 @@
import * as core from "@actions/core";
import * as githubUtils from "@actions/github/lib/utils";
import * as retry from "@octokit/plugin-retry";
import consoleLogLevel from "console-log-level";
import { getActionVersion, getRequiredInput } from "./actions-util";
import { Logger } from "./logging";
@@ -50,7 +49,10 @@ function createApiClientWithDetails(
githubUtils.getOctokitOptions(auth, {
baseUrl: apiDetails.apiURL,
userAgent: `CodeQL-Action/${getActionVersion()}`,
log: consoleLogLevel({ level: "debug" }),
log: {
...core,
warn: core.warning,
},
}),
);
}