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.

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

fix: deploy validate doesn\'t require a project #691

Merged
merged 2 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/commands/project/deploy/quick.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
public static readonly description = messages.getMessage('description');
public static readonly summary = messages.getMessage('summary');
public static readonly examples = messages.getMessages('examples');
public static readonly requiresProject = true;
public static readonly aliases = ['deploy:metadata:quick'];
public static readonly deprecateAliases = true;

Expand Down
1 change: 0 additions & 1 deletion src/commands/project/deploy/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default class DeployMetadataReport extends SfCommand<DeployResultJson> {
public static readonly description = messages.getMessage('description');
public static readonly summary = messages.getMessage('summary');
public static readonly examples = messages.getMessages('examples');
public static readonly requiresProject = true;
public static readonly aliases = ['deploy:metadata:report'];
public static readonly deprecateAliases = true;

Expand Down
13 changes: 11 additions & 2 deletions src/commands/project/deploy/resume.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export default class DeployMetadataResume extends SfCommand<DeployResultJson> {
public static readonly description = messages.getMessage('description');
public static readonly summary = messages.getMessage('summary');
public static readonly examples = messages.getMessages('examples');
public static readonly requiresProject = true;
public static readonly aliases = ['deploy:metadata:resume'];
public static readonly deprecateAliases = true;

Expand Down Expand Up @@ -93,7 +92,17 @@ export default class DeployMetadataResume extends SfCommand<DeployResultJson> {
const wait = flags.wait ?? Duration.minutes(deployOpts.wait);
const { deploy } = await executeDeploy(
// there will always be conflicts on a resume if anything deployed--the changes on the server are not synced to local
{ ...deployOpts, wait, 'dry-run': false, 'ignore-conflicts': true },
{
...deployOpts,
wait,
'dry-run': false,
'ignore-conflicts': true,
// TODO: isMdapi is generated from 'metadata-dir' flag, but we don't have that flag here
// change the cache value to actually cache the metadata-dir, and if there's a value, it isMdapi
// deployCache~L38, so to tell the executeDeploy method it's ok to not have a project, we spoof a metadata-dir
// in deploy~L140, it checks the if the id is present, so this metadata-dir value is never _really_ used
'metadata-dir': deployOpts.isMdapi ? { type: 'file', path: 'testing' } : undefined,
},
this.config.bin,
this.project,
jobId
Expand Down
1 change: 0 additions & 1 deletion src/commands/project/deploy/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default class DeployMetadataValidate extends SfCommand<DeployResultJson>
public static readonly description = messages.getMessage('description');
public static readonly summary = messages.getMessage('summary');
public static readonly examples = messages.getMessages('examples');
public static readonly requiresProject = true;
public static readonly aliases = ['deploy:metadata:validate'];
public static readonly deprecateAliases = true;

Expand Down