Remove now redundant variant property

Previously, this was useful for discriminating between different
`CodeQLDefaultVersion` instances. However now all instances return a
tag name.

src/codeql.test.ts

@@ -89,7 +89,7 @@ async function installIntoToolcache({
     tmpDir,
     util.GitHubVariant.GHES,
     cliVersion !== undefined
-      ? { cliVersion, tagName, variant: util.GitHubVariant.GHES }
+      ? { cliVersion, tagName }
       : SAMPLE_DEFAULT_CLI_VERSION,
     getRunnerLogger(true),
     false
@@ -300,7 +300,6 @@ for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
         {
           cliVersion: defaults.cliVersion,
           tagName: defaults.bundleVersion,
-          variant,
         },
         getRunnerLogger(true),
         false
@@ -335,7 +334,6 @@ for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
         {
           cliVersion: defaults.cliVersion,
           tagName: defaults.bundleVersion,
-          variant,
         },
         getRunnerLogger(true),
         false
@@ -443,7 +441,6 @@ for (const isBundleVersionInUrl of [true, false]) {
         {
           cliVersion: defaults.cliVersion,
           tagName: defaults.bundleVersion,
-          variant: util.GitHubVariant.GHAE,
         },
         getRunnerLogger(true),
         false

src/feature-flags.test.ts

@@ -366,7 +366,6 @@ for (const variant of [GitHubVariant.GHAE, GitHubVariant.GHES]) {
       t.deepEqual(defaultCliVersion, {
         cliVersion: defaults.cliVersion,
         tagName: defaults.bundleVersion,
-        variant,
       });
     });
   });
@@ -391,7 +390,6 @@ test("selects CLI v2.20.1 on Dotcom when feature flags enable v2.20.0 and v2.20.
       cliVersion: "2.20.1",
       tagName: "codeql-bundle-v2.20.1",
       toolsFeatureFlagsValid: true,
-      variant: GitHubVariant.DOTCOM,
     });
   });
 });
@@ -410,7 +408,6 @@ test("includes tag name when feature flags enable version greater than v2.13.4",
       cliVersion: "2.20.0",
       tagName: "codeql-bundle-v2.20.0",
       toolsFeatureFlagsValid: true,
-      variant: GitHubVariant.DOTCOM,
     });
   });
 });
@@ -428,7 +425,6 @@ test(`selects CLI from defaults.json on Dotcom when no default version feature f
       cliVersion: defaults.cliVersion,
       tagName: defaults.bundleVersion,
       toolsFeatureFlagsValid: false,
-      variant: GitHubVariant.DOTCOM,
     });
   });
 });
@@ -454,7 +450,6 @@ test("ignores invalid version numbers in default version feature flags", async (
       cliVersion: "2.20.1",
       tagName: "codeql-bundle-v2.20.1",
       toolsFeatureFlagsValid: true,
-      variant: GitHubVariant.DOTCOM,
     });
 
     t.assert(

src/feature-flags.ts

@@ -21,7 +21,6 @@ export interface CodeQLDefaultVersionInfo {
   cliVersion: string;
   tagName: string;
   toolsFeatureFlagsValid?: boolean;
-  variant: util.GitHubVariant;
 }
 
 export interface FeatureEnablement {
@@ -257,7 +256,6 @@ class GitHubFeatureFlags {
     return {
       cliVersion: defaults.cliVersion,
       tagName: defaults.bundleVersion,
-      variant,
     };
   }
 
@@ -294,7 +292,6 @@ class GitHubFeatureFlags {
       const result: CodeQLDefaultVersionInfo = {
         cliVersion: defaults.cliVersion,
         tagName: defaults.bundleVersion,
-        variant: util.GitHubVariant.DOTCOM,
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
@@ -314,7 +311,6 @@ class GitHubFeatureFlags {
       cliVersion: maxCliVersion,
       tagName: `codeql-bundle-v${maxCliVersion}`,
       toolsFeatureFlagsValid: true,
-      variant: util.GitHubVariant.DOTCOM,
     };
   }
 

src/init-action.ts

@@ -38,7 +38,6 @@ import {
   getMlPoweredJsQueriesStatus,
   getRequiredEnvParam,
   getThreadsFlagValue,
-  GitHubVariant,
   initializeEnvironment,
   isHostedRunner,
   wrapError,
@@ -235,9 +234,7 @@ async function run() {
     const codeQLDefaultVersionInfo = await features.getDefaultCliVersion(
       gitHubVersion.type
     );
-    if (codeQLDefaultVersionInfo.variant === GitHubVariant.DOTCOM) {
-      toolsFeatureFlagsValid = codeQLDefaultVersionInfo.toolsFeatureFlagsValid;
-    }
+    toolsFeatureFlagsValid = codeQLDefaultVersionInfo.toolsFeatureFlagsValid;
     const initCodeQLResult = await initCodeQL(
       getOptionalInput("tools"),
       apiDetails,

src/testing-utils.ts

@@ -15,7 +15,7 @@ import {
   FeatureEnablement,
 } from "./feature-flags";
 import { Logger } from "./logging";
-import { GitHubVariant, HTTPError } from "./util";
+import { HTTPError } from "./util";
 
 export const SAMPLE_DOTCOM_API_DETAILS = {
   auth: "token",
@@ -26,7 +26,6 @@ export const SAMPLE_DOTCOM_API_DETAILS = {
 export const SAMPLE_DEFAULT_CLI_VERSION: CodeQLDefaultVersionInfo = {
   cliVersion: "2.20.0",
   tagName: "codeql-bundle-v2.20.0",
-  variant: GitHubVariant.DOTCOM,
 };
 
 type TestContext = {