Fix tests

Author: oscarsj

src/status-report.test.ts

@@ -316,6 +316,7 @@ const testCreateInitWithConfigStatusReport = test.macro({
         const initStatusReport: InitStatusReport = {
           ...statusReportBase,
           tools_input: "",
+          computed_tools_input: "",
           tools_resolved_version: "foo",
           tools_source: ToolsSource.Unknown,
           workflow_languages: "actions",

src/upload-lib.ts

@@ -47,16 +47,7 @@ const GENERIC_404_MSG =
 // Checks whether the deprecation warning for combining SARIF files should be shown.
 export async function shouldShowCombineSarifFilesDeprecationWarning(
   sarifObjects: Array<Partial<sarif.Log>>,
-  githubVersion: GitHubVersion,
 ) {
-  // Do not show this warning on GHES versions before 3.14.0
-  if (
-    githubVersion.type === GitHubVariant.GHES &&
-    satisfiesGHESVersion(githubVersion.version, "<3.14", true)
-  ) {
-    return false;
-  }
-
   // Only give a deprecation warning when not all runs are unique and
   // we haven't already shown the warning.
   return (
@@ -131,12 +122,7 @@ async function combineSarifFilesUsingCLI(
       "Not all SARIF files were produced by CodeQL. Merging files in the action.",
     );
 
-    if (
-      await shouldShowCombineSarifFilesDeprecationWarning(
-        sarifObjects,
-        gitHubVersion,
-      )
-    ) {
+    if (await shouldShowCombineSarifFilesDeprecationWarning(sarifObjects)) {
       logger.warning(
         `Uploading multiple SARIF runs with the same category is deprecated ${deprecationWarningMessage}. Please update your workflow to upload a single run per category. ${deprecationMoreInformationMessage}`,
       );
@@ -1053,7 +1039,7 @@ function sanitize(str?: string) {
   return (str ?? "_").replace(/[^a-zA-Z0-9_]/g, "_").toLocaleUpperCase();
 }
 
-function filterAlertsByDiffRange(
+export function filterAlertsByDiffRange(
   logger: Logger,
   sarifLog: Partial<sarif.Log>,
 ): Partial<sarif.Log> {
@@ -1066,8 +1052,6 @@ function filterAlertsByDiffRange(
     return sarifLog;
   }
 
-  const checkoutPath = actionsUtil.getRequiredInput("checkout_path");
-
   for (const run of sarifLog.runs) {
     if (run.results) {
       run.results = run.results.filter((result) => {
@@ -1082,19 +1066,14 @@ function filterAlertsByDiffRange(
           if (!locationUri || locationStartLine === undefined) {
             return false;
           }
-          // CodeQL always uses forward slashes as the path separator, so on Windows we
-          // need to replace any backslashes with forward slashes.
-          const locationPath = path
-            .join(checkoutPath, locationUri)
-            .replaceAll(path.sep, "/");
           // Alert filtering here replicates the same behavior as the restrictAlertsTo
           // extensible predicate in CodeQL. See the restrictAlertsTo documentation
           // https://codeql.github.com/codeql-standard-libraries/csharp/codeql/util/AlertFiltering.qll/predicate.AlertFiltering$restrictAlertsTo.3.html
           // for more details, such as why the filtering applies only to the first line
           // of an alert location.
           return diffRanges.some(
             (range) =>
-              range.path === locationPath &&
+              range.path === locationUri &&
               ((range.startLine <= locationStartLine &&
                 range.endLine >= locationStartLine) ||
                 (range.startLine === 0 && range.endLine === 0)),