robojerk/codeql-action

Refactoring: Simplify retrieving error message

Browse source
This commit is contained in:
Henry Mercer 2024-09-16 22:38:35 +02:00
parent bbd7c801a0
commit dd7307d603
54 changed files with 106 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/debug-artifacts.ts
View file

@ -17,8 +17,8 @@ import {
bundleDb,
doesDirectoryExist,
getCodeQLDatabasePath,
getErrorMessage,
listFolder,
wrapError,
} from "./util";
export function sanitizeArifactName(name: string): string {
@ -94,9 +94,9 @@ function tryGetSarifResultPath(
}
} catch (e) {
logger.warning(
`Failed to find SARIF results path for ${language}. Reason: ${
wrapError(e).message
}`,
`Failed to find SARIF results path for ${language}. Reason: ${getErrorMessage(
e,
)}`,
);
}
return [];
@ -114,16 +114,16 @@ async function tryBundleDatabase(
} catch (e) {
logger.warning(
`Failed to bundle database for ${language} using the CLI. ` +
`Falling back to a partial bundle. Reason: ${wrapError(e).message}`,
`Falling back to a partial bundle. Reason: ${getErrorMessage(e)}`,
);
}
}
return [await createPartialDatabaseBundle(config, language)];
} catch (e) {
logger.warning(
`Failed to bundle database for ${language}. Reason: ${
wrapError(e).message
}`,
`Failed to bundle database for ${language}. Reason: ${getErrorMessage(
e,
)}`,
);
return [];
}
@ -168,7 +168,7 @@ export async function uploadAllAvailableDebugArtifacts(
);
} catch (e) {
logger.warning(
`Failed to upload debug artifacts. Reason: ${wrapError(e).message}`,
`Failed to upload debug artifacts. Reason: ${getErrorMessage(e)}`,
);
}
}
@ -210,7 +210,7 @@ export async function uploadDebugArtifacts(
} catch (e) {
// A failure to upload debug artifacts should not fail the entire action.
core.warning(
`Failed to upload debug artifacts. Reason: ${wrapError(e).message}`,
`Failed to upload debug artifacts. Reason: ${getErrorMessage(e)}`,
);
}
}