fix: add wait to retrieve, move min wait and default wait to static m…

…embers
salesforcecli · Feb 18, 2021 · 74a3cdd · 74a3cdd
1 parent b1d8b82
commit 74a3cdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/commands/force/source/deploy.ts b/src/commands/force/source/deploy.ts
@@ -12,7 +12,7 @@ import { SourceDeployResult } from '@salesforce/source-deploy-retrieve';
 import { Duration } from '@salesforce/kit';
 import { asString } from '@salesforce/ts-types';
 import * as chalk from 'chalk';
-import { DEFAULT_SRC_WAIT_MINUTES, MINIMUM_SRC_WAIT_MINUTES, SourceCommand } from '../../../sourceCommand';
+import { SourceCommand } from '../../../sourceCommand';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'deploy');
@@ -30,8 +30,8 @@ export class deploy extends SourceCommand {
     }),
     wait: flags.minutes({
       char: 'w',
-      default: Duration.minutes(DEFAULT_SRC_WAIT_MINUTES),
-      min: Duration.minutes(MINIMUM_SRC_WAIT_MINUTES),
+      default: Duration.minutes(SourceCommand.DEFAULT_SRC_WAIT_MINUTES),
+      min: Duration.minutes(SourceCommand.MINIMUM_SRC_WAIT_MINUTES),
       description: messages.getMessage('flags.wait'),
     }),
     testlevel: flags.enum({

diff --git a/src/commands/force/source/retrieve.ts b/src/commands/force/source/retrieve.ts
@@ -12,7 +12,7 @@ import { SourceRetrieveResult } from '@salesforce/source-deploy-retrieve';
 import { Duration } from '@salesforce/kit';
 import { asString } from '@salesforce/ts-types';
 import { blue, yellow } from 'chalk';
-import { DEFAULT_SRC_WAIT_MINUTES, MINIMUM_SRC_WAIT_MINUTES, SourceCommand } from '../../../sourceCommand';
+import { SourceCommand } from '../../../sourceCommand';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve');
@@ -30,8 +30,8 @@ export class retrieve extends SourceCommand {
     }),
     wait: flags.minutes({
       char: 'w',
-      default: Duration.minutes(DEFAULT_SRC_WAIT_MINUTES),
-      min: MINIMUM_SRC_WAIT_MINUTES,
+      default: Duration.minutes(SourceCommand.DEFAULT_SRC_WAIT_MINUTES),
+      min: SourceCommand.MINIMUM_SRC_WAIT_MINUTES,
       description: messages.getMessage('flags.wait'),
     }),
     manifest: flags.filepath({
@@ -73,7 +73,7 @@ export class retrieve extends SourceCommand {
     const results = await cs.retrieve(this.org.getUsername(), path.resolve(defaultPackage.path), {
       merge: true,
       // TODO: fix this once wait has been updated in library
-      wait: 1000000,
+      wait: (this.flags.wait as Duration).milliseconds,
       // TODO: implement retrieve via package name
       // package: options.packagenames
     });

diff --git a/src/sourceCommand.ts b/src/sourceCommand.ts
@@ -17,10 +17,9 @@ export type FlagOptions = {
   metadata: string[];
 };
 
-export const MINIMUM_SRC_WAIT_MINUTES = 1;
-export const DEFAULT_SRC_WAIT_MINUTES = 33;
-
 export abstract class SourceCommand extends SfdxCommand {
+  public static MINIMUM_SRC_WAIT_MINUTES = 1;
+  public static DEFAULT_SRC_WAIT_MINUTES = 33;
   /**
    * will create one ComponentSet to be deployed/retrieved
    * will combine from all options passed in