Skip to content

Add "pack install" and "pack download" commands #1076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shati-patel merged 10 commits into from
Jan 19, 2022
Merged

Add "pack install" and "pack download" commands #1076

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
74ae0bc
Add "pack install" and "pack download" commands
shati-patel Jan 13, 2022
c3c422f
Address review comments
shati-patel Jan 14, 2022
da59c42
Update changelog
shati-patel Jan 14, 2022
9efa7ae
First attempt at tests
shati-patel Jan 17, 2022
9a780c4
Fix import + throw error
shati-patel Jan 17, 2022
3c4838d
Catch error in tests
shati-patel Jan 17, 2022
7a04ff0
Add separate tests for valid/invalid pack install
shati-patel Jan 18, 2022
5c5a1b2
Add CLI version constraint for packaging
shati-patel Jan 18, 2022
c46ace4
Update wording to be more clear
shati-patel Jan 19, 2022
0185c39
Update extensions/ql-vscode/CHANGELOG.md
shati-patel Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions extensions/ql-vscode/src/packaging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
getOnDiskWorkspaceFolders,
showAndLogErrorMessage,
showAndLogInformationMessage,
showAndLogWarningMessage,
} from './helpers';
import { QuickPickItem, window } from 'vscode';
import { ProgressCallback, UserCancellationException } from './commandRunner';
Expand Down Expand Up @@ -123,8 +122,8 @@ export async function handleInstallPacks(
}
if (failedPacks.length > 0) {
void logger.log(`Errors:\n${errors.join('\n')}`);
void showAndLogWarningMessage(
`Unable to install some packs: ${failedPacks.join(', ')}. See logs for more details.`
throw new Error(
`Unable to install packs: ${failedPacks.join(', ')}. See logs for more details.`
Comment thread
shati-patel marked this conversation as resolved.
Outdated
);
Comment thread
shati-patel marked this conversation as resolved.
} else {
void showAndLogInformationMessage('Finished installing packs.');
Expand Down
31 changes: 16 additions & 15 deletions extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('Packaging commands', function() {
showAndLogErrorMessageSpy = sandbox.stub();
showAndLogInformationMessageSpy = sandbox.stub();
mod = proxyquire('../../packaging', {
'../helpers': {
'./helpers': {
showAndLogErrorMessage: showAndLogErrorMessageSpy,
showAndLogInformationMessage: showAndLogInformationMessageSpy,
},
Expand Down Expand Up @@ -88,21 +88,22 @@ describe('Packaging commands', function() {
);
});

it('should install selected workspace packs', async () => {
it('should attempt to install selected workspace packs', async () => {
const rootDir = path.join(__dirname, '../../../src/vscode-tests/cli-integration/data');
quickPickSpy.resolves(
[
{
label: 'integration-test-queries-javascript',
packRootDir: [rootDir],
},
]
);

await mod.handleInstallPacks(cli, progress);
quickPickSpy.resolves([
{
label: 'integration-test-queries-javascript',
packRootDir: [rootDir],
},
]);

expect(showAndLogInformationMessageSpy.firstCall.args[0]).to.contain(
'Finished installing packs.'
);
try {
await mod.handleInstallPacks(cli, progress);
expect(showAndLogInformationMessageSpy.firstCall.args[0]).to.contain(
'Finished installing packs.'
);
} catch (error) {
expect(error.message).to.contain('Unable to install packs:');
}
Comment thread
shati-patel marked this conversation as resolved.
Outdated
});
});