Merge pull request #560 from salesforcecli/sm/no-org-on-report

fix: remove 2 flags from report

Author: WillieRuemmele

command-snapshot.json

@@ -74,16 +74,7 @@
   {
     "command": "project:deploy:report",
     "plugin": "@salesforce/plugin-deploy-retrieve",
-    "flags": [
-      "api-version",
-      "coverage-formatters",
-      "job-id",
-      "json",
-      "junit",
-      "results-dir",
-      "target-org",
-      "use-most-recent"
-    ],
+    "flags": ["coverage-formatters", "job-id", "json", "junit", "results-dir", "use-most-recent"],
     "alias": ["deploy:metadata:report"]
   },
   {

messages/deploy.metadata.report.md

@@ -18,14 +18,6 @@ Run this command by either passing it a job ID or specifying the --use-most-rece
 
       <%= config.bin %> <%= command.id %> --use-most-recent
 
-# flags.target-org.summary
-
-Login username or alias for the target org.
-
-# flags.api-version.summary
-
-API version to use
-
 # flags.job-id.summary
 
 Job ID of the deploy operation you want to check the status of.

src/commands/project/deploy/report.ts

@@ -26,11 +26,6 @@ export default class DeployMetadataReport extends SfCommand<DeployResultJson> {
   public static readonly deprecateAliases = true;
 
   public static readonly flags = {
-    'target-org': Flags.requiredOrg({
-      summary: messages.getMessage('flags.target-org.summary'),
-      required: true,
-    }),
-    'api-version': Flags.orgApiVersion(),
     'job-id': Flags.salesforceId({
       char: 'i',
       startsWith: '0Af',
@@ -63,14 +58,18 @@ export default class DeployMetadataReport extends SfCommand<DeployResultJson> {
 
     const deployOpts = cache.get(jobId);
     const org = await Org.create({ aliasOrUsername: deployOpts['target-org'] });
-    const deployStatus = await org.getConnection(flags['api-version']).metadata.checkDeployStatus(jobId, true);
+    const [deployStatus, componentSet] = await Promise.all([
+      // we'll use whatever the org supports since we can't specify the org
+      // eslint-disable-next-line sf-plugin/get-connection-with-version
+      org.getConnection().metadata.checkDeployStatus(jobId, true),
+      buildComponentSet({ ...deployOpts, wait: Duration.minutes(deployOpts.wait) }),
+    ]);
 
-    const componentSet = await buildComponentSet({ ...deployOpts, wait: Duration.minutes(deployOpts.wait) });
     const result = new DeployResult(deployStatus as MetadataApiDeployStatus, componentSet);
 
     const formatter = new DeployReportResultFormatter(result, {
       ...deployOpts,
-      ...{ 'target-org': flags['target-org'] },
+      ...{ 'target-org': org },
     });
 
     if (!this.jsonEnabled()) formatter.display();