Remove now redundant variant property

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

lib/codeql.test.js

@@ -84,7 +84,7 @@ ava_1.default.beforeEach(() => {
 async function installIntoToolcache({ apiDetails = testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, cliVersion, isPinned, tagName, tmpDir, }) {
     const url = (0, testing_utils_1.mockBundleDownloadApi)({ apiDetails, isPinned, tagName });
     await codeql.setupCodeQL(cliVersion !== undefined ? undefined : url, apiDetails, tmpDir, util.GitHubVariant.GHES, cliVersion !== undefined
-        ? { cliVersion, tagName, variant: util.GitHubVariant.GHES }
+        ? { cliVersion, tagName }
         : testing_utils_1.SAMPLE_DEFAULT_CLI_VERSION, (0, logging_1.getRunnerLogger)(true), false);
 }
 function mockReleaseApi({ apiDetails = testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, assetNames, tagName, }) {
@@ -219,7 +219,6 @@ for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
             const result = await codeql.setupCodeQL(undefined, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, tmpDir, variant, {
                 cliVersion: defaults.cliVersion,
                 tagName: defaults.bundleVersion,
-                variant,
             }, (0, logging_1.getRunnerLogger)(true), false);
             t.deepEqual(result.toolsVersion, "0.0.0-20200601");
             t.is(result.toolsSource, init_1.ToolsSource.Toolcache);
@@ -242,7 +241,6 @@ for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
             const result = await codeql.setupCodeQL(undefined, testing_utils_1.SAMPLE_DOTCOM_API_DETAILS, tmpDir, variant, {
                 cliVersion: defaults.cliVersion,
                 tagName: defaults.bundleVersion,
-                variant,
             }, (0, logging_1.getRunnerLogger)(true), false);
             t.deepEqual(result.toolsVersion, defaults.cliVersion);
             t.is(result.toolsSource, init_1.ToolsSource.Download);
@@ -307,7 +305,6 @@ for (const isBundleVersionInUrl of [true, false]) {
             const result = await codeql.setupCodeQL(undefined, sampleGHAEApiDetails, tmpDir, util.GitHubVariant.GHAE, {
                 cliVersion: defaults.cliVersion,
                 tagName: defaults.bundleVersion,
-                variant: util.GitHubVariant.GHAE,
             }, (0, logging_1.getRunnerLogger)(true), false);
             t.is(result.toolsSource, init_1.ToolsSource.Download);
             t.assert(Number.isInteger(result.toolsDownloadDurationMs));

lib/feature-flags.js

@@ -186,7 +186,6 @@ class GitHubFeatureFlags {
         return {
             cliVersion: defaults.cliVersion,
             tagName: defaults.bundleVersion,
-            variant,
         };
     }
     async getDefaultDotcomCliVersion() {
@@ -213,7 +212,6 @@ class GitHubFeatureFlags {
             const result = {
                 cliVersion: defaults.cliVersion,
                 tagName: defaults.bundleVersion,
-                variant: util.GitHubVariant.DOTCOM,
             };
             if (this.hasAccessedRemoteFeatureFlags) {
                 result.toolsFeatureFlagsValid = false;
@@ -226,7 +224,6 @@ class GitHubFeatureFlags {
             cliVersion: maxCliVersion,
             tagName: `codeql-bundle-v${maxCliVersion}`,
             toolsFeatureFlagsValid: true,
-            variant: util.GitHubVariant.DOTCOM,
         };
     }
     async getValue(feature) {

lib/feature-flags.test.js

@@ -223,7 +223,6 @@ for (const variant of [util_1.GitHubVariant.GHAE, util_1.GitHubVariant.GHES]) {
             t.deepEqual(defaultCliVersion, {
                 cliVersion: defaults.cliVersion,
                 tagName: defaults.bundleVersion,
-                variant,
             });
         });
     });
@@ -244,7 +243,6 @@ for (const variant of [util_1.GitHubVariant.GHAE, util_1.GitHubVariant.GHES]) {
             cliVersion: "2.20.1",
             tagName: "codeql-bundle-v2.20.1",
             toolsFeatureFlagsValid: true,
-            variant: util_1.GitHubVariant.DOTCOM,
         });
     });
 });
@@ -259,7 +257,6 @@ for (const variant of [util_1.GitHubVariant.GHAE, util_1.GitHubVariant.GHES]) {
             cliVersion: "2.20.0",
             tagName: "codeql-bundle-v2.20.0",
             toolsFeatureFlagsValid: true,
-            variant: util_1.GitHubVariant.DOTCOM,
         });
     });
 });
@@ -273,7 +270,6 @@ for (const variant of [util_1.GitHubVariant.GHAE, util_1.GitHubVariant.GHES]) {
             cliVersion: defaults.cliVersion,
             tagName: defaults.bundleVersion,
             toolsFeatureFlagsValid: false,
-            variant: util_1.GitHubVariant.DOTCOM,
         });
     });
 });
@@ -292,7 +288,6 @@ for (const variant of [util_1.GitHubVariant.GHAE, util_1.GitHubVariant.GHES]) {
             cliVersion: "2.20.1",
             tagName: "codeql-bundle-v2.20.1",
             toolsFeatureFlagsValid: true,
-            variant: util_1.GitHubVariant.DOTCOM,
         });
         t.assert(loggedMessages.find((v) => v.type === "warning" &&
             v.message ===

lib/init-action.js

@@ -123,9 +123,7 @@ async function run() {
             return;
         }
         const codeQLDefaultVersionInfo = await features.getDefaultCliVersion(gitHubVersion.type);
-        if (codeQLDefaultVersionInfo.variant === util_1.GitHubVariant.DOTCOM) {
         toolsFeatureFlagsValid = codeQLDefaultVersionInfo.toolsFeatureFlagsValid;
-        }
         const initCodeQLResult = await (0, init_1.initCodeQL)((0, actions_util_1.getOptionalInput)("tools"), apiDetails, (0, actions_util_1.getTemporaryDirectory)(), gitHubVersion.type, codeQLDefaultVersionInfo, logger);
         codeql = initCodeQLResult.codeql;
         toolsDownloadDurationMs = initCodeQLResult.toolsDownloadDurationMs;

lib/testing-utils.js

@@ -43,7 +43,6 @@ exports.SAMPLE_DOTCOM_API_DETAILS = {
 exports.SAMPLE_DEFAULT_CLI_VERSION = {
     cliVersion: "2.20.0",
     tagName: "codeql-bundle-v2.20.0",
-    variant: util_1.GitHubVariant.DOTCOM,
 };
 function wrapOutput(context) {
     // Function signature taken from Socket.write.

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;
-    }
     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 = {