Unconditionally disable combining SARIF files for GHES 3.18

Author: koesie10

lib/upload-lib.js

@@ -446,7 +446,7 @@ test("throwIfCombineSarifFilesDisabled when on GHES 3.13", async (t) => {
   await t.notThrowsAsync(
     uploadLib.throwIfCombineSarifFilesDisabled(
       [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
-      createFeatures([Feature.DisableCombineSarifFiles]),
+      createFeatures([]),
       {
         type: GitHubVariant.GHES,
         version: "3.13.2",
@@ -459,7 +459,7 @@ test("throwIfCombineSarifFilesDisabled when on GHES 3.14", async (t) => {
   await t.notThrowsAsync(
     uploadLib.throwIfCombineSarifFilesDisabled(
       [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
-      createFeatures([Feature.DisableCombineSarifFiles]),
+      createFeatures([]),
       {
         type: GitHubVariant.GHES,
         version: "3.14.0",
@@ -468,11 +468,50 @@ test("throwIfCombineSarifFilesDisabled when on GHES 3.14", async (t) => {
   );
 });
 
+test("throwIfCombineSarifFilesDisabled when on GHES 3.17", async (t) => {
+  await t.notThrowsAsync(
+    uploadLib.throwIfCombineSarifFilesDisabled(
+      [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
+      createFeatures([]),
+      {
+        type: GitHubVariant.GHES,
+        version: "3.17.0",
+      },
+    ),
+  );
+});
+
+test("throwIfCombineSarifFilesDisabled when on GHES 3.18 pre", async (t) => {
+  await t.throwsAsync(
+    uploadLib.throwIfCombineSarifFilesDisabled(
+      [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
+      createFeatures([]),
+      {
+        type: GitHubVariant.GHES,
+        version: "3.18.0.pre1",
+      },
+    ),
+  );
+});
+
+test("throwIfCombineSarifFilesDisabled when on GHES 3.18 alpha", async (t) => {
+  await t.throwsAsync(
+    uploadLib.throwIfCombineSarifFilesDisabled(
+      [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
+      createFeatures([]),
+      {
+        type: GitHubVariant.GHES,
+        version: "3.18.0-alpha.1",
+      },
+    ),
+  );
+});
+
 test("throwIfCombineSarifFilesDisabled when on GHES 3.18", async (t) => {
   await t.throwsAsync(
     uploadLib.throwIfCombineSarifFilesDisabled(
       [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
-      createFeatures([Feature.DisableCombineSarifFiles]),
+      createFeatures([]),
       {
         type: GitHubVariant.GHES,
         version: "3.18.0",

lib/upload-lib.js.map

@@ -175,20 +175,26 @@ async function shouldDisableCombineSarifFiles(
   features: FeatureEnablement,
   githubVersion: GitHubVersion,
 ) {
-  // Never block on GHES versions before 3.18.0
-  if (
-    githubVersion.type === GitHubVariant.GHES &&
-    semver.lt(githubVersion.version, "3.18.0")
-  ) {
-    return false;
+  if (githubVersion.type === GitHubVariant.GHES) {
+    // Never block on GHES versions before 3.18.
+    if (semver.lt(githubVersion.version, "3.18.0-0")) {
+      return false;
+    }
+  } else {
+    // Never block when the feature flag is disabled.
+    if (!(await features.getValue(Feature.DisableCombineSarifFiles))) {
+      return false;
+    }
   }
 
   if (areAllRunsUnique(sarifObjects)) {
     // If all runs are unique, we can safely combine them.
     return false;
   }
 
-  return features.getValue(Feature.DisableCombineSarifFiles);
+  // Combining SARIF files is not supported and Code Scanning will return an
+  // error if multiple runs with the same category are uploaded.
+  return true;
 }
 
 // Takes a list of paths to sarif files and combines them together using the