fix: default for wait on mdapi:report commands (#804)

* fix: default for wait on mdapi:report commands * docs: suggest deploy start/report pair for deprecated report commands --------- Co-authored-by: Willie Ruemmele <[email protected]>
salesforcecli · Apr 7, 2023 · 63bd14d · 63bd14d
1 parent f28f2fb
commit 63bd14d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/messages/md.deployreport.md b/messages/md.deployreport.md
@@ -54,4 +54,4 @@ Using specified username %s.
 
 # deprecation
 
-We plan to deprecate this command in the future. Try using the "%s" command instead.
+We plan to deprecate this command in the future. Try using the "%s" and "%s" pair instead.
diff --git a/messages/report.md b/messages/report.md
@@ -50,4 +50,4 @@ The metadata deploy operation failed.
 
 # deprecation
 
-We plan to deprecate this command in the future. Try using the "%s" command instead.
+We plan to deprecate this command in the future. Try using the "%s" and "%s" pair instead.
diff --git a/src/commands/force/mdapi/deploy/report.ts b/src/commands/force/mdapi/deploy/report.ts
@@ -34,7 +34,7 @@ export class Report extends DeployCommand {
   public static readonly state = 'deprecated';
   public static readonly deprecationOptions = {
     to: replacement,
-    message: messages.getMessage('deprecation', [replacement]),
+    message: messages.getMessage('deprecation', ['project deploy start', replacement]),
   };
   public static readonly flags = {
     'api-version': orgApiVersionFlagWithDeprecations,
@@ -43,6 +43,7 @@ export class Report extends DeployCommand {
     wait: Flags.duration({
       char: 'w',
       defaultValue: 0,
+      default: Duration.minutes(0),
       min: -1,
       unit: 'minutes',
       summary: messages.getMessage('flags.wait.summary'),
@@ -88,7 +89,7 @@ export class Report extends DeployCommand {
       this.log(messages.getMessage('usernameOutput', [this.org.getUsername()]));
     }
     const waitFlag = this.flags.wait;
-    const waitDuration = waitFlag.minutes === -1 ? Duration.days(7) : waitFlag;
+    const waitDuration = waitFlag?.minutes === -1 ? Duration.days(7) : waitFlag;
 
     this.isAsync = waitDuration.quantity === 0;
 

diff --git a/src/commands/force/mdapi/retrieve/report.ts b/src/commands/force/mdapi/retrieve/report.ts
@@ -60,6 +60,7 @@ export class Report extends SourceCommand {
       unit: 'minutes',
       summary: messages.getMessage('flags.wait.summary'),
       min: -1,
+      default: Duration.minutes(1440),
       defaultValue: 1440, // 24 hours is a reasonable default versus -1 (no timeout)
     }),
     verbose: Flags.boolean({

diff --git a/src/commands/force/source/deploy/report.ts b/src/commands/force/source/deploy/report.ts
@@ -40,7 +40,7 @@ export class Report extends DeployCommand {
   public static readonly state = 'deprecated';
   public static readonly deprecationOptions = {
     to: replacement,
-    message: messages.getMessage('deprecation', [replacement]),
+    message: messages.getMessage('deprecation', ['project deploy start', replacement]),
   };
   public static readonly flags = {
     'api-version': orgApiVersionFlagWithDeprecations,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,4 +54,4 @@ Using specified username %s.

		# deprecation

		We plan to deprecate this command in the future. Try using the "%s" command instead.
		We plan to deprecate this command in the future. Try using the "%s" and "%s" pair instead.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,4 +50,4 @@ The metadata deploy operation failed.

		# deprecation

		We plan to deprecate this command in the future. Try using the "%s" command instead.
		We plan to deprecate this command in the future. Try using the "%s" and "%s" pair instead.