Skip to content

Commit 3ca2260

Browse files
rneatherwayrneatherway
committed
Account for versioning of ghe.com
1 parent 760583e commit 3ca2260

File tree

8 files changed

+32
-4
lines changed

8 files changed

+32
-4
lines changed

‎lib/feature-flags.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.test.js‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.test.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/feature-flags.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export type CodeQLDefaultVersionInfo =
2222
| {
2323
cliVersion: string;
2424
tagName: string;
25-
variant: util.GitHubVariant.GHAE | util.GitHubVariant.GHES;
25+
variant:
26+
| util.GitHubVariant.GHAE
27+
| util.GitHubVariant.GHES
28+
| util.GitHubVariant.GHE_DOTCOM;
2629
};
2730

2831
export interface FeatureEnablement {

‎src/util.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,14 @@ test("getGitHubVersion", async (t) => {
237237
apiURL: undefined,
238238
});
239239
t.deepEqual({ type: util.GitHubVariant.DOTCOM }, v3);
240+
241+
mockGetMetaVersionHeader("ghe.com");
242+
const gheDotcom = await util.getGitHubVersion({
243+
auth: "",
244+
url: "https://foo.ghe.com",
245+
apiURL: undefined,
246+
});
247+
t.deepEqual({ type: util.GitHubVariant.GHE_DOTCOM }, gheDotcom);
240248
});
241249

242250
const ML_POWERED_JS_STATUS_TESTS: Array<[string[], string]> = [

‎src/util.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,12 @@ export enum GitHubVariant {
305305
DOTCOM,
306306
GHES,
307307
GHAE,
308+
GHE_DOTCOM,
308309
}
309310
export type GitHubVersion =
310311
| { type: GitHubVariant.DOTCOM }
311312
| { type: GitHubVariant.GHAE }
313+
| { type: GitHubVariant.GHE_DOTCOM }
312314
| { type: GitHubVariant.GHES; version: string };
313315

314316
export async function getGitHubVersion(
@@ -334,6 +336,10 @@ export async function getGitHubVersion(
334336
return { type: GitHubVariant.GHAE };
335337
}
336338

339+
if (response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] === "ghe.com") {
340+
return { type: GitHubVariant.GHE_DOTCOM };
341+
}
342+
337343
const version = response.headers[GITHUB_ENTERPRISE_VERSION_HEADER] as string;
338344
return { type: GitHubVariant.GHES, version };
339345
}

0 commit comments

Comments
 (0)