Remove code specific to GitHub AE

src/api-client.test.ts

@@ -85,16 +85,6 @@ test("getGitHubVersion for GHES", async (t) => {
   );
 });
 
-test("getGitHubVersion for GHAE", async (t) => {
-  mockGetMetaVersionHeader("GitHub AE");
-  const ghae = await api.getGitHubVersionFromApi(api.getApiClient(), {
-    auth: "",
-    url: "https://example.githubenterprise.com",
-    apiURL: undefined,
-  });
-  t.deepEqual({ type: util.GitHubVariant.GHAE }, ghae);
-});
-
 test("getGitHubVersion for different domain", async (t) => {
   mockGetMetaVersionHeader(undefined);
   const v3 = await api.getGitHubVersionFromApi(api.getApiClient(), {

src/api-client.ts

@@ -90,10 +90,6 @@ export async function getGitHubVersionFromApi(
     return { type: GitHubVariant.DOTCOM };
   }
 
-  if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "GitHub AE") {
-    return { type: GitHubVariant.GHAE };
-  }
-
   if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "ghe.com") {
     return { type: GitHubVariant.GHE_DOTCOM };
   }

src/codeql.test.ts

@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import path from "path";
 
 import { ExecOptions } from "@actions/exec";
 import * as toolrunner from "@actions/exec/lib/toolrunner";
@@ -33,12 +32,6 @@ import { initializeEnvironment } from "./util";
 
 setupTests(test);
 
-const sampleGHAEApiDetails = {
-  auth: "token",
-  url: "https://example.githubenterprise.com",
-  apiURL: "https://example.githubenterprise.com/api/v3",
-};
-
 let stubConfig: Config;
 
 test.beforeEach(() => {
@@ -302,72 +295,70 @@ for (const toolcacheVersion of [
   );
 }
 
-for (const variant of [util.GitHubVariant.GHAE, util.GitHubVariant.GHES]) {
-  test(`uses a cached bundle when no tools input is given on ${util.GitHubVariant[variant]}`, async (t) => {
-    await util.withTmpDir(async (tmpDir) => {
-      setupActionsVars(tmpDir, tmpDir);
+test(`uses a cached bundle when no tools input is given on GHES`, async (t) => {
+  await util.withTmpDir(async (tmpDir) => {
+    setupActionsVars(tmpDir, tmpDir);
 
-      await installIntoToolcache({
-        tagName: "codeql-bundle-20200601",
-        isPinned: true,
-        tmpDir,
-      });
-
-      const result = await codeql.setupCodeQL(
-        undefined,
-        SAMPLE_DOTCOM_API_DETAILS,
-        tmpDir,
-        variant,
-        {
-          cliVersion: defaults.cliVersion,
-          tagName: defaults.bundleVersion,
-        },
-        getRunnerLogger(true),
-        false,
-      );
-      t.deepEqual(result.toolsVersion, "0.0.0-20200601");
-      t.is(result.toolsSource, ToolsSource.Toolcache);
-      t.is(result.toolsDownloadDurationMs, undefined);
-
-      const cachedVersions = toolcache.findAllVersions("CodeQL");
-      t.is(cachedVersions.length, 1);
+    await installIntoToolcache({
+      tagName: "codeql-bundle-20200601",
+      isPinned: true,
+      tmpDir,
     });
-  });
 
-  test(`downloads bundle if only an unpinned version is cached on ${util.GitHubVariant[variant]}`, async (t) => {
-    await util.withTmpDir(async (tmpDir) => {
-      setupActionsVars(tmpDir, tmpDir);
-
-      await installIntoToolcache({
-        tagName: "codeql-bundle-20200601",
-        isPinned: false,
-        tmpDir,
-      });
-
-      mockBundleDownloadApi({
+    const result = await codeql.setupCodeQL(
+      undefined,
+      SAMPLE_DOTCOM_API_DETAILS,
+      tmpDir,
+      util.GitHubVariant.GHES,
+      {
+        cliVersion: defaults.cliVersion,
         tagName: defaults.bundleVersion,
-      });
-      const result = await codeql.setupCodeQL(
-        undefined,
-        SAMPLE_DOTCOM_API_DETAILS,
-        tmpDir,
-        variant,
-        {
-          cliVersion: defaults.cliVersion,
-          tagName: defaults.bundleVersion,
-        },
-        getRunnerLogger(true),
-        false,
-      );
-      t.deepEqual(result.toolsVersion, defaults.cliVersion);
-      t.is(result.toolsSource, ToolsSource.Download);
-      t.assert(Number.isInteger(result.toolsDownloadDurationMs));
+      },
+      getRunnerLogger(true),
+      false,
+    );
+    t.deepEqual(result.toolsVersion, "0.0.0-20200601");
+    t.is(result.toolsSource, ToolsSource.Toolcache);
+    t.is(result.toolsDownloadDurationMs, undefined);
 
-      const cachedVersions = toolcache.findAllVersions("CodeQL");
-      t.is(cachedVersions.length, 2);
-    });
+    const cachedVersions = toolcache.findAllVersions("CodeQL");
+    t.is(cachedVersions.length, 1);
   });
-}
+});
+
+test(`downloads bundle if only an unpinned version is cached on GHES`, async (t) => {
+  await util.withTmpDir(async (tmpDir) => {
+    setupActionsVars(tmpDir, tmpDir);
+
+    await installIntoToolcache({
+      tagName: "codeql-bundle-20200601",
+      isPinned: false,
+      tmpDir,
+    });
+
+    mockBundleDownloadApi({
+      tagName: defaults.bundleVersion,
+    });
+    const result = await codeql.setupCodeQL(
+      undefined,
+      SAMPLE_DOTCOM_API_DETAILS,
+      tmpDir,
+      util.GitHubVariant.GHES,
+      {
+        cliVersion: defaults.cliVersion,
+        tagName: defaults.bundleVersion,
+      },
+      getRunnerLogger(true),
+      false,
+    );
+    t.deepEqual(result.toolsVersion, defaults.cliVersion);
+    t.is(result.toolsSource, ToolsSource.Download);
+    t.assert(Number.isInteger(result.toolsDownloadDurationMs));
+
+    const cachedVersions = toolcache.findAllVersions("CodeQL");
+    t.is(cachedVersions.length, 2);
+  });
+});
 
 test('downloads bundle if "latest" tools specified but not cached', async (t) => {
   await util.withTmpDir(async (tmpDir) => {
@@ -400,82 +391,6 @@ test('downloads bundle if "latest" tools specified but not cached', async (t) =>
   });
 });
 
-for (const isBundleVersionInUrl of [true, false]) {
-  const inclusionString = isBundleVersionInUrl
-    ? "includes"
-    : "does not include";
-  test(`download codeql bundle from github ae endpoint (URL ${inclusionString} bundle version)`, async (t) => {
-    await util.withTmpDir(async (tmpDir) => {
-      setupActionsVars(tmpDir, tmpDir);
-
-      const bundleAssetID = 10;
-
-      const platform =
-        process.platform === "win32"
-          ? "win64"
-          : process.platform === "linux"
-          ? "linux64"
-          : "osx64";
-      const codeQLBundleName = `codeql-bundle-${platform}.tar.gz`;
-
-      const eventualDownloadUrl = isBundleVersionInUrl
-        ? `https://example.githubenterprise.com/github/codeql-action/releases/download/${defaults.bundleVersion}/${codeQLBundleName}`
-        : `https://example.githubenterprise.com/api/v3/repos/github/codeql-action/releases/assets/${bundleAssetID}`;
-
-      nock("https://example.githubenterprise.com")
-        .get(
-          `/api/v3/enterprise/code-scanning/codeql-bundle/find/${defaults.bundleVersion}`,
-        )
-        .reply(200, {
-          assets: { [codeQLBundleName]: bundleAssetID },
-        });
-
-      nock("https://example.githubenterprise.com")
-        .get(
-          `/api/v3/enterprise/code-scanning/codeql-bundle/download/${bundleAssetID}`,
-        )
-        .reply(200, {
-          url: eventualDownloadUrl,
-        });
-
-      nock("https://example.githubenterprise.com")
-        .get(
-          eventualDownloadUrl.replace(
-            "https://example.githubenterprise.com",
-            "",
-          ),
-        )
-        .replyWithFile(
-          200,
-          path.join(__dirname, `/../src/testdata/codeql-bundle-pinned.tar.gz`),
-        );
-
-      mockApiDetails(sampleGHAEApiDetails);
-      sinon.stub(actionsUtil, "isRunningLocalAction").returns(false);
-      process.env["GITHUB_ACTION_REPOSITORY"] = "github/codeql-action";
-
-      const result = await codeql.setupCodeQL(
-        undefined,
-        sampleGHAEApiDetails,
-        tmpDir,
-        util.GitHubVariant.GHAE,
-        {
-          cliVersion: defaults.cliVersion,
-          tagName: defaults.bundleVersion,
-        },
-        getRunnerLogger(true),
-        false,
-      );
-
-      t.is(result.toolsSource, ToolsSource.Download);
-      t.assert(Number.isInteger(result.toolsDownloadDurationMs));
-
-      const cachedVersions = toolcache.findAllVersions("CodeQL");
-      t.is(cachedVersions.length, 1);
-    });
-  });
-}
-
 test("bundle URL from another repo is cached as 0.0.0-bundleVersion", async (t) => {
   await util.withTmpDir(async (tmpDir) => {
     setupActionsVars(tmpDir, tmpDir);

src/config-utils.ts

@@ -98,8 +98,7 @@ export interface Config {
    */
   codeQLCmd: string;
   /**
-   * Version of GHES that we have determined that we are talking to, or undefined
-   * if talking to github.com or GitHub AE.
+   * Version of GitHub we are talking to.
    */
   gitHubVersion: GitHubVersion;
   /**

src/database-upload.test.ts

@@ -133,35 +133,6 @@ test("Abort database upload if running against GHES", async (t) => {
   });
 });
 
-test("Abort database upload if running against GHAE", async (t) => {
-  await withTmpDir(async (tmpDir) => {
-    setupActionsVars(tmpDir, tmpDir);
-    sinon
-      .stub(actionsUtil, "getRequiredInput")
-      .withArgs("upload-database")
-      .returns("true");
-    sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true);
-
-    const config = getTestConfig(tmpDir);
-    config.gitHubVersion = { type: GitHubVariant.GHAE };
-
-    const loggedMessages = [];
-    await uploadDatabases(
-      testRepoName,
-      config,
-      testApiDetails,
-      getRecordingLogger(loggedMessages),
-    );
-    t.assert(
-      loggedMessages.find(
-        (v: LoggedMessage) =>
-          v.type === "debug" &&
-          v.message === "Not running against github.com. Skipping upload.",
-      ) !== undefined,
-    );
-  });
-});
-
 test("Abort database upload if not analyzing default branch", async (t) => {
   await withTmpDir(async (tmpDir) => {
     setupActionsVars(tmpDir, tmpDir);

src/feature-flags.test.ts

@@ -32,45 +32,32 @@ test.beforeEach(() => {
 
 const testRepositoryNwo = parseRepositoryNwo("github/example");
 
-const ALL_FEATURES_DISABLED_VARIANTS: Array<{
-  description: string;
-  gitHubVersion: util.GitHubVersion;
-}> = [
-  {
-    description: "GHES",
-    gitHubVersion: { type: GitHubVariant.GHES, version: "3.0.0" },
-  },
-  { description: "GHAE", gitHubVersion: { type: GitHubVariant.GHAE } },
-];
+test(`All features are disabled if running against GHES`, async (t) => {
+  await withTmpDir(async (tmpDir) => {
+    const loggedMessages = [];
+    const features = setUpFeatureFlagTests(
+      tmpDir,
+      getRecordingLogger(loggedMessages),
+      { type: GitHubVariant.GHES, version: "3.0.0" },
+    );
 
-for (const variant of ALL_FEATURES_DISABLED_VARIANTS) {
-  test(`All features are disabled if running against ${variant.description}`, async (t) => {
-    await withTmpDir(async (tmpDir) => {
-      const loggedMessages = [];
-      const features = setUpFeatureFlagTests(
-        tmpDir,
-        getRecordingLogger(loggedMessages),
-        variant.gitHubVersion,
+    for (const feature of Object.values(Feature)) {
+      t.deepEqual(
+        await features.getValue(feature, includeCodeQlIfRequired(feature)),
+        featureConfig[feature].defaultValue,
       );
+    }
 
-      for (const feature of Object.values(Feature)) {
-        t.deepEqual(
-          await features.getValue(feature, includeCodeQlIfRequired(feature)),
-          featureConfig[feature].defaultValue,
-        );
-      }
-
-      t.assert(
-        loggedMessages.find(
-          (v: LoggedMessage) =>
-            v.type === "debug" &&
-            v.message ===
-              "Not running against github.com. Disabling all toggleable features.",
-        ) !== undefined,
-      );
-    });
+    t.assert(
+      loggedMessages.find(
+        (v: LoggedMessage) =>
+          v.type === "debug" &&
+          v.message ===
+            "Not running against github.com. Disabling all toggleable features.",
+      ) !== undefined,
+    );
   });
-}
+});
 
 test("API response missing and features use default value", async (t) => {
   await withTmpDir(async (tmpDir) => {
@@ -358,19 +345,19 @@ test("Environment variable can override feature flag cache", async (t) => {
   });
 });
 
-for (const variant of [GitHubVariant.GHAE, GitHubVariant.GHES]) {
-  test(`selects CLI from defaults.json on ${GitHubVariant[variant]}`, async (t) => {
-    await withTmpDir(async (tmpDir) => {
-      const features = setUpFeatureFlagTests(tmpDir);
+test(`selects CLI from defaults.json on GHES`, async (t) => {
+  await withTmpDir(async (tmpDir) => {
+    const features = setUpFeatureFlagTests(tmpDir);
 
-      const defaultCliVersion = await features.getDefaultCliVersion(variant);
-      t.deepEqual(defaultCliVersion, {
-        cliVersion: defaults.cliVersion,
-        tagName: defaults.bundleVersion,
-      });
+    const defaultCliVersion = await features.getDefaultCliVersion(
+      GitHubVariant.GHES,
+    );
+    t.deepEqual(defaultCliVersion, {
+      cliVersion: defaults.cliVersion,
+      tagName: defaults.bundleVersion,
     });
   });
-}
+});
 
 test("selects CLI v2.20.1 on Dotcom when feature flags enable v2.20.0 and v2.20.1", async (t) => {
   await withTmpDir(async (tmpDir) => {

src/setup-codeql.ts

@@ -111,7 +111,6 @@ export async function tryFindCliVersionDotcomOnly(
 async function getCodeQLBundleDownloadURL(
   tagName: string,
   apiDetails: api.GitHubApiDetails,
-  variant: util.GitHubVariant,
   logger: Logger,
 ): Promise<string> {
   const codeQLActionRepository = getCodeQLActionRepository(logger);
@@ -131,39 +130,6 @@ async function getCodeQLBundleDownloadURL(
     },
   );
   const codeQLBundleName = getCodeQLBundleName();
-  if (variant === util.GitHubVariant.GHAE) {
-    try {
-      const release = await api
-        .getApiClient()
-        .request("GET /enterprise/code-scanning/codeql-bundle/find/{tag}", {
-          tag: tagName,
-        });
-      const assetID = release.data.assets[codeQLBundleName];
-      if (assetID !== undefined) {
-        const download = await api
-          .getApiClient()
-          .request(
-            "GET /enterprise/code-scanning/codeql-bundle/download/{asset_id}",
-            { asset_id: assetID },
-          );
-        const downloadURL = download.data.url;
-        logger.info(
-          `Found CodeQL bundle at GitHub AE endpoint with URL ${downloadURL}.`,
-        );
-        return downloadURL;
-      } else {
-        logger.info(
-          `Attempted to fetch bundle from GitHub AE endpoint but the bundle ${codeQLBundleName} was not found in the assets ${JSON.stringify(
-            release.data.assets,
-          )}.`,
-        );
-      }
-    } catch (e) {
-      logger.info(
-        `Attempted to fetch bundle from GitHub AE endpoint but got error ${e}.`,
-      );
-    }
-  }
   for (const downloadSource of uniqueDownloadSources) {
     const [apiURL, repository] = downloadSource;
     // If we've reached the final case, short-circuit the API check since we know the bundle exists and is public.
@@ -483,12 +449,7 @@ export async function getCodeQLSource(
   }
 
   if (!url) {
-    url = await getCodeQLBundleDownloadURL(
-      tagName!,
-      apiDetails,
-      variant,
-      logger,
-    );
+    url = await getCodeQLBundleDownloadURL(tagName!, apiDetails, logger);
   }
 
   return {

src/util.ts

@@ -453,12 +453,10 @@ let hasBeenWarnedAboutVersion = false;
 export enum GitHubVariant {
   DOTCOM,
   GHES,
-  GHAE,
   GHE_DOTCOM,
 }
 export type GitHubVersion =
   | { type: GitHubVariant.DOTCOM }
-  | { type: GitHubVariant.GHAE }
   | { type: GitHubVariant.GHE_DOTCOM }
   | { type: GitHubVariant.GHES; version: string };