Skip to content
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

Ra/isv step 4 #5035

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Ra/isv step 4 #5035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fab0900
chore: fix step 4
RitamAgrawal Aug 9, 2023
21111f8
chore: add unzip flag to retrieve command
RitamAgrawal Aug 9, 2023
4ee1c4e
chore: remove manual unzipping
RitamAgrawal Aug 17, 2023
928c5b8
chore: add back unpackaged in path
RitamAgrawal Aug 17, 2023
2711d13
Merge branch 'develop' into ra/isv_step_4
RitamAgrawal Aug 17, 2023
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
31 changes: 16 additions & 15 deletions packages/salesforcedx-vscode-core/src/commands/isvdebugging/bootstrapCmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export class IsvDebugBootstrapExecutor extends SfdxCommandletExecutor<{}> {
.withFlag('--target-metadata-dir', this.relativeMetdataTempPath)
.withFlag('--manifest', this.relativeApexPackageXmlPath)
.withFlag('--target-org', data.sessionId)
.withArg('--unzip')
.withLogName('isv_debug_bootstrap_retrieve_org_source')
.build();
}
Expand Down Expand Up @@ -341,21 +342,21 @@ export class IsvDebugBootstrapExecutor extends SfdxCommandletExecutor<{}> {
);

// 4a: unzip retrieved source
try {
const zip = new AdmZip(
path.join(projectMetadataTempPath, 'unpackaged.zip')
);
zip.extractAllTo(projectMetadataTempPath, true);
} catch (error) {
console.error(error);
channelService.appendLine(
nls.localize('error_extracting_org_source', error.toString())
);
notificationService.showErrorMessage(
nls.localize('error_extracting_org_source', error.toString())
);
return;
}
// try {
// const zip = new AdmZip(
// path.join(projectMetadataTempPath, 'unpackaged.zip')
// );
// zip.extractAllTo(projectMetadataTempPath, true);
// } catch (error) {
// console.error(error);
// channelService.appendLine(
// nls.localize('error_extracting_org_source', error.toString())
// );
// notificationService.showErrorMessage(
// nls.localize('error_extracting_org_source', error.toString())
// );
// return;
// }

// 4b: convert org source
await this.executeCommand(
Expand Down
2 changes: 1 addition & 1 deletion ...alesforcedx-vscode-core/test/vscode-integration/commands/isvdebugger/bootstrapCmd.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe('ISV Debugging Project Bootstrap Command', () => {
projectTemplate: 'standard'
});
expect(command.toCommand()).to.equal(
`sfdx project:retrieve:start --target-metadata-dir ${builder.relativeMetdataTempPath} --manifest ${builder.relativeApexPackageXmlPath} --target-org ${SESSION_ID}`
`sfdx project:retrieve:start --target-metadata-dir ${builder.relativeMetdataTempPath} --manifest ${builder.relativeApexPackageXmlPath} --target-org ${SESSION_ID} --unzip`
);
expect(command.description).to.equal(
nls.localize('isv_debug_bootstrap_step3_retrieve_org_source')
Expand Down