Skip to content

Commit bc3670a

Browse files
committed
Enable database uploads for GHEC-DR
1 parent 4a51972 commit bc3670a

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

lib/database-upload.js

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

lib/database-upload.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/database-upload.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Config } from "./config-utils";
77
import { Logger } from "./logging";
88
import { RepositoryNwo } from "./repository";
99
import * as util from "./util";
10-
import { bundleDb } from "./util";
10+
import { bundleDb, parseGitHubUrl } from "./util";
1111

1212
export async function uploadDatabases(
1313
repositoryNwo: RepositoryNwo,
@@ -21,8 +21,11 @@ export async function uploadDatabases(
2121
}
2222

2323
// Do nothing when not running against github.com
24-
if (config.gitHubVersion.type !== util.GitHubVariant.DOTCOM) {
25-
logger.debug("Not running against github.com. Skipping upload.");
24+
if (
25+
config.gitHubVersion.type !== util.GitHubVariant.DOTCOM &&
26+
config.gitHubVersion.type !== util.GitHubVariant.GHE_DOTCOM
27+
) {
28+
logger.debug("Not running against github.com or GHEC-DR. Skipping upload.");
2629
return;
2730
}
2831

@@ -35,6 +38,9 @@ export async function uploadDatabases(
3538
const client = getApiClient();
3639
const codeql = await getCodeQL(config.codeQLCmd);
3740

41+
const uploadsUrl = new URL(parseGitHubUrl(apiDetails.url));
42+
uploadsUrl.hostname = `uploads.${uploadsUrl.hostname}`;
43+
3844
for (const language of config.languages) {
3945
try {
4046
// Upload the database bundle.
@@ -49,8 +55,9 @@ export async function uploadDatabases(
4955
);
5056
try {
5157
await client.request(
52-
`POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`,
58+
`POST /repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name&commit_oid=:commit_oid`,
5359
{
60+
baseUrl: uploadsUrl.toString(),
5461
owner: repositoryNwo.owner,
5562
repo: repositoryNwo.repo,
5663
language,

0 commit comments

Comments
 (0)