diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 3cbce5bed74..02d02931592 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,8 @@ ## [UNRELEASED] +- Add ability for users to download databases directly from GitHub. [#1466](https://github.com/github/vscode-codeql/pull/1466) + ## 1.6.10 - 9 August 2022 No user facing changes. diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 866d9fec87f..5e8aa72de5d 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -664,7 +664,7 @@ }, { "command": "codeQLDatabases.chooseDatabaseGithub", - "when": "config.codeQL.canary && view == codeQLDatabases", + "when": "view == codeQLDatabases", "group": "navigation" }, { @@ -878,10 +878,6 @@ } ], "commandPalette": [ - { - "command": "codeQL.authenticateToGitHub", - "when": "config.codeQL.canary" - }, { "command": "codeQL.runQuery", "when": "resourceLangId == ql && resourceExtname == .ql" @@ -926,10 +922,6 @@ "command": "codeQL.viewCfg", "when": "resourceScheme == codeql-zip-archive && config.codeQL.canary" }, - { - "command": "codeQL.chooseDatabaseGithub", - "when": "config.codeQL.canary" - }, { "command": "codeQLDatabases.setCurrentDatabase", "when": "false" @@ -1175,7 +1167,7 @@ }, { "view": "codeQLDatabases", - "contents": "Add a CodeQL database:\n[From a folder](command:codeQLDatabases.chooseDatabaseFolder)\n[From an archive](command:codeQLDatabases.chooseDatabaseArchive)\n[From a URL (as a zip file)](command:codeQLDatabases.chooseDatabaseInternet)\n[From LGTM](command:codeQLDatabases.chooseDatabaseLgtm)" + "contents": "Add a CodeQL database:\n[From a folder](command:codeQLDatabases.chooseDatabaseFolder)\n[From an archive](command:codeQLDatabases.chooseDatabaseArchive)\n[From a URL (as a zip file)](command:codeQLDatabases.chooseDatabaseInternet)\n[From GitHub](command:codeQLDatabases.chooseDatabaseGithub)\n[From LGTM](command:codeQLDatabases.chooseDatabaseLgtm)" }, { "view": "codeQLEvalLogViewer", diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index 4da5e8ab9e0..43109b93be2 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -1018,19 +1018,16 @@ async function activateWithInstalledDistribution( } }; - // The "authenticateToGitHub" command is internal-only. ctx.subscriptions.push( commandRunner('codeQL.authenticateToGitHub', async () => { - if (isCanary()) { - /** - * Credentials for authenticating to GitHub. - * These are used when making API calls. - */ - const credentials = await Credentials.initialize(ctx); - const octokit = await credentials.getOctokit(); - const userInfo = await octokit.users.getAuthenticated(); - void showAndLogInformationMessage(`Authenticated to GitHub as user: ${userInfo.data.login}`); - } + /** + * Credentials for authenticating to GitHub. + * These are used when making API calls. + */ + const credentials = await Credentials.initialize(ctx); + const octokit = await credentials.getOctokit(); + const userInfo = await octokit.users.getAuthenticated(); + void showAndLogInformationMessage(`Authenticated to GitHub as user: ${userInfo.data.login}`); })); ctx.subscriptions.push(