Merge pull request #651 from salesforcecli/wr/quickDeployMdapi

fix: allow mdapi --dry-runs to be quick deploy'd if valid

Author: shetzel

package.json

@@ -241,7 +241,7 @@
       "output": []
     },
     "test:command-reference": {
-      "command": "\"./bin/dev\" commandreference:generate --erroronwarnings",
+      "command": "\"./bin/dev\" commandreference:generate --error-on-warnings",
       "files": [
         "src/**/*.ts",
         "messages/**",
@@ -270,4 +270,4 @@
       "output": []
     }
   }
-}
+}

src/commands/project/deploy/quick.ts

@@ -10,7 +10,7 @@ import { Messages, Org } from '@salesforce/core';
 import { SfCommand, toHelpSection, Flags } from '@salesforce/sf-plugins-core';
 import { RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { Duration } from '@salesforce/kit';
-import { buildComponentSet, DeployOptions, determineExitCode, poll, resolveApi } from '../../../utils/deploy';
+import { DeployOptions, determineExitCode, poll, resolveApi } from '../../../utils/deploy';
 import { DeployCache } from '../../../utils/deployCache';
 import { DEPLOY_STATUS_CODES_DESCRIPTIONS } from '../../../utils/errorCodes';
 import { AsyncDeployResultFormatter } from '../../../formatters/asyncDeployResultFormatter';
@@ -91,7 +91,6 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
     const api = await resolveApi(this.configAggregator);
 
     await org.getConnection(flags['api-version']).metadata.deployRecentValidation({ id: jobId, rest: api === 'REST' });
-    const componentSet = await buildComponentSet({ ...deployOpts, wait: flags.wait });
     this.log(`Deploy ID: ${bold(jobId)}`);
 
     if (flags.async) {
@@ -100,8 +99,7 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
       return asyncFormatter.getJson();
     }
 
-    const result = await poll(org, jobId, flags.wait, componentSet);
-
+    const result = await poll(org, jobId, flags.wait);
     const formatter = new DeployResultFormatter(result, flags);
 
     if (!this.jsonEnabled()) formatter.display();

src/utils/deploy.ts

@@ -219,10 +219,10 @@ export async function cancelDeployAsync(opts: Partial<DeployOptions>, id: string
   return { id: deploy.id };
 }
 
-export async function poll(org: Org, id: string, wait: Duration, componentSet: ComponentSet): Promise<DeployResult> {
+export async function poll(org: Org, id: string, wait: Duration, componentSet?: ComponentSet): Promise<DeployResult> {
   const report = async (): Promise<DeployResult> => {
     const res = await org.getConnection().metadata.checkDeployStatus(id, true);
-    const deployStatus = res as unknown as MetadataApiDeployStatus;
+    const deployStatus = res as MetadataApiDeployStatus;
     return new DeployResult(deployStatus, componentSet);
   };
 
@@ -238,7 +238,7 @@ export async function poll(org: Org, id: string, wait: Duration, componentSet: C
     },
   };
   const pollingClient = await PollingClient.create(opts);
-  return pollingClient.subscribe() as unknown as Promise<DeployResult>;
+  return pollingClient.subscribe();
 }
 
 export function determineExitCode(result: DeployResult, async = false): number {

test/commands/deploy/metadata/quick.nut.ts

@@ -6,8 +6,10 @@
  */
 
 import { SourceTestkit } from '@salesforce/source-testkit';
-import { assert } from 'chai';
+import { assert, config } from 'chai';
+import { execCmd } from '@salesforce/cli-plugins-testkit';
 import { DeployResultJson } from '../../../../src/utils/types';
+config.truncateThreshold = 0;
 
 describe('deploy metadata quick NUTs', () => {
   let testkit: SourceTestkit;
@@ -25,49 +27,59 @@ describe('deploy metadata quick NUTs', () => {
 
   describe('--use-most-recent', () => {
     it('should deploy previously validated deployment', async () => {
-      const validation = await testkit.execute<DeployResultJson>('deploy:metadata:validate', {
+      const validation = await testkit.execute<DeployResultJson>('project:deploy:validate', {
         args: '--source-dir force-app',
         json: true,
         exitCode: 0,
       });
       assert(validation);
-      await testkit.expect.filesToBeDeployedViaResult(
-        ['force-app/**/*'],
-        ['force-app/test/**/*'],
-        validation.result.files
-      );
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
 
-      const deploy = await testkit.execute<DeployResultJson>('deploy:metadata:quick', {
+      const deploy = await testkit.execute<DeployResultJson>('project:deploy:quick', {
         args: '--use-most-recent',
         json: true,
         exitCode: 0,
       });
       assert(deploy);
-      await testkit.expect.filesToBeDeployedViaResult(['force-app/**/*'], ['force-app/test/**/*'], deploy.result.files);
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
+    });
+    it('should deploy previously validated deployment with metadata format', async () => {
+      execCmd('project:convert:source --source-dir force-app --output-dir metadata');
+      const validation = await testkit.execute<DeployResultJson>('project:deploy:validate', {
+        args: '--metadata-dir metadata',
+        json: true,
+        exitCode: 0,
+      });
+      assert(validation);
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
+
+      const deploy = await testkit.execute<DeployResultJson>('project:deploy:quick', {
+        args: '--use-most-recent',
+        json: true,
+        exitCode: 0,
+      });
+      assert(deploy);
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
     });
   });
 
   describe('--job-id', () => {
     it('should deploy previously validated deployment', async () => {
-      const validation = await testkit.execute<DeployResultJson>('deploy:metadata:validate', {
+      const validation = await testkit.execute<DeployResultJson>('project:deploy:validate', {
         args: '--source-dir force-app',
         json: true,
         exitCode: 0,
       });
       assert(validation);
-      await testkit.expect.filesToBeDeployedViaResult(
-        ['force-app/**/*'],
-        ['force-app/test/**/*'],
-        validation.result.files
-      );
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
 
-      const deploy = await testkit.execute<DeployResultJson>('deploy:metadata:quick', {
+      const deploy = await testkit.execute<DeployResultJson>('project:deploy:quick', {
         args: `--job-id ${validation.result.id}`,
         json: true,
         exitCode: 0,
       });
       assert(deploy);
-      await testkit.expect.filesToBeDeployedViaResult(['force-app/**/*'], ['force-app/test/**/*'], deploy.result.files);
+      await testkit.expect.filesToBeDeployed(['force-app/**/*'], ['force-app/test/**/*']);
     });
 
     it('should fail to deploy previously deployed deployment', async () => {
@@ -77,7 +89,7 @@ describe('deploy metadata quick NUTs', () => {
         exitCode: 0,
       });
       assert(first);
-      const deploy = await testkit.execute<DeployResultJson>('deploy:metadata:quick', {
+      const deploy = await testkit.execute<DeployResultJson>('project:deploy:quick', {
         args: `--job-id ${first.result.id}`,
         json: true,
         exitCode: 1,