Add logging to combineQueries

This commit is contained in:
Michael B. Gale
2025-09-22 15:17:34 +01:00
parent 54746c8dad
commit 889d482c54
4 changed files with 31 additions and 2 deletions

14
lib/init-action.js generated
View File

@@ -86442,10 +86442,15 @@ function parseQueriesFromInput(rawQueriesInput, queriesInputCombines, errorToThr
}
return trimmedInput.split(",").map((query) => ({ uses: query.trim() }));
}
function combineQueries(config, augmentationProperties) {
function combineQueries(logger, config, augmentationProperties) {
const result = [];
if (augmentationProperties.repoPropertyQueries && augmentationProperties.repoPropertyQueries.input) {
if (!augmentationProperties.repoPropertyQueries.combines) {
if (!isDefaultSetup()) {
logger.info(
`Queries are configured in the repository properties and don't allow combining with other query settings. Any queries configured elsewhere will be ignored.`
);
}
return augmentationProperties.repoPropertyQueries.input;
} else {
result.push(...augmentationProperties.repoPropertyQueries.input);
@@ -86463,12 +86468,16 @@ function combineQueries(config, augmentationProperties) {
}
return result;
}
function generateCodeScanningConfig(originalUserInput, augmentationProperties) {
function generateCodeScanningConfig(logger, originalUserInput, augmentationProperties) {
const augmentedConfig = cloneObject(originalUserInput);
augmentedConfig.queries = combineQueries(
logger,
augmentedConfig,
augmentationProperties
);
logger.debug(
`Combined queries: ${augmentedConfig.queries?.map((q) => q.uses).join(",")}`
);
if (augmentedConfig.queries?.length === 0) {
delete augmentedConfig.queries;
}
@@ -87614,6 +87623,7 @@ async function initActionState({
logger
);
const computedConfig = generateCodeScanningConfig(
logger,
userConfig,
augmentationProperties
);