Merge pull request #1597 from github/rneatherway/ghe-dotcom

Account for versioning of ghe.com
github · Mar 22, 2023 · aefd989 · aefd989
2 parents 760583e + 3ca2260
commit aefd989
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 4 deletions.
diff --git a/lib/feature-flags.js.map b/lib/feature-flags.js.map
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/lib/util.test.js b/lib/util.test.js
diff --git a/lib/util.test.js.map b/lib/util.test.js.map
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
@@ -22,7 +22,10 @@ export type CodeQLDefaultVersionInfo =
   | {
       cliVersion: string;
       tagName: string;
-      variant: util.GitHubVariant.GHAE | util.GitHubVariant.GHES;
+      variant:
+        | util.GitHubVariant.GHAE
+        | util.GitHubVariant.GHES
+        | util.GitHubVariant.GHE_DOTCOM;
     };
 
 export interface FeatureEnablement {

diff --git a/src/util.test.ts b/src/util.test.ts
@@ -237,6 +237,14 @@ test("getGitHubVersion", async (t) => {
     apiURL: undefined,
   });
   t.deepEqual({ type: util.GitHubVariant.DOTCOM }, v3);
+
+  mockGetMetaVersionHeader("ghe.com");
+  const gheDotcom = await util.getGitHubVersion({
+    auth: "",
+    url: "https://foo.ghe.com",
+    apiURL: undefined,
+  });
+  t.deepEqual({ type: util.GitHubVariant.GHE_DOTCOM }, gheDotcom);
 });
 
 const ML_POWERED_JS_STATUS_TESTS: Array<[string[], string]> = [

diff --git a/src/util.ts b/src/util.ts
@@ -305,10 +305,12 @@ 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 };
 
 export async function getGitHubVersion(
@@ -334,6 +336,10 @@ export async function getGitHubVersion(
     return { type: GitHubVariant.GHAE };
   }
 
+  if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "ghe.com") {
+    return { type: GitHubVariant.GHE_DOTCOM };
+  }
+
   const version = response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] as string;
   return { type: GitHubVariant.GHES, version };
 }