Skip to content

Commit

Permalink
Remove old upload path
Browse files Browse the repository at this point in the history
The `useUploadDomain` approach is now fully enabled
  • Loading branch information
Robin Neatherway committed Jan 24, 2022
1 parent a7adbce commit 1a686e7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 50 deletions.
31 changes: 10 additions & 21 deletions lib/database-upload.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/database-upload.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 13 additions & 28 deletions src/database-upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ export async function uploadDatabases(

const client = getApiClient(apiDetails);
const codeql = await getCodeQL(config.codeQLCmd);
const useUploadDomain = await featureFlags.getValue(
FeatureFlag.UploadsDomainEnabled
);

for (const language of config.languages) {
// Upload the database bundle.
Expand All @@ -56,31 +53,19 @@ export async function uploadDatabases(
await bundleDb(config, language, codeql, language)
);
try {
if (useUploadDomain) {
await client.request(
`POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name`,
{
owner: repositoryNwo.owner,
repo: repositoryNwo.repo,
language,
name: `${language}-database`,
data: payload,
headers: {
authorization: `token ${apiDetails.auth}`,
},
}
);
} else {
await client.request(
`PUT /repos/:owner/:repo/code-scanning/codeql/databases/:language`,
{
owner: repositoryNwo.owner,
repo: repositoryNwo.repo,
language,
data: payload,
}
);
}
await client.request(
`POST https://uploads.github.com/repos/:owner/:repo/code-scanning/codeql/databases/:language?name=:name`,
{
owner: repositoryNwo.owner,
repo: repositoryNwo.repo,
language,
name: `${language}-database`,
data: payload,
headers: {
authorization: `token ${apiDetails.auth}`,
},
}
);
logger.debug(`Successfully uploaded database for ${language}`);
} catch (e) {
console.log(e);
Expand Down

0 comments on commit 1a686e7

Please sign in to comment.