fix: remove -o conflict, add short char UTs, add short chars to NUTs (#…

…821)

messages/deployCommand.md

@@ -17,3 +17,11 @@ Deploying metadata to %s using the v%s %s API.
 # apiVersionMsgDetailed
 
 %s v%s metadata to %s using the v%s %s API.
+
+# missingUsername
+
+Unable to determine the username of the org to delete. Specify the username with the --target-org | -u flag.
+
+# flags.targetusername.summary
+
+Username or alias of the target org.

src/commands/force/mdapi/deploy.ts

@@ -12,11 +12,16 @@ import {
   Flags,
   loglevel,
   orgApiVersionFlagWithDeprecations,
-  requiredOrgFlagWithDeprecations,
   Ux,
 } from '@salesforce/sf-plugins-core';
 import { Interfaces } from '@oclif/core';
-import { DeployCommand, getCoverageFormattersOptions, reportsFormatters, TestLevel } from '../../../deployCommand';
+import {
+  DeployCommand,
+  getCoverageFormattersOptions,
+  reportsFormatters,
+  targetUsernameFlag,
+  TestLevel,
+} from '../../../deployCommand';
 import { DeployCommandAsyncResult } from '../../../formatters/source/deployAsyncResultFormatter';
 import { MdDeployResult, MdDeployResultFormatter } from '../../../formatters/mdapi/mdDeployResultFormatter';
 import { ProgressFormatter } from '../../../formatters/progressFormatter';
@@ -44,7 +49,7 @@ export class Deploy extends DeployCommand {
   public static readonly flags = {
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,
-    'target-org': requiredOrgFlagWithDeprecations,
+    'target-org': targetUsernameFlag,
     checkonly: Flags.boolean({
       char: 'c',
       description: messages.getMessage('flags.checkOnly.description'),
@@ -75,6 +80,7 @@ export class Deploy extends DeployCommand {
       summary: messages.getMessage('flags.runTests.summary'),
     }),
     ignoreerrors: Flags.boolean({
+      // break this
       char: 'o',
       description: messages.getMessage('flags.ignoreErrors.description'),
       summary: messages.getMessage('flags.ignoreErrors.summary'),
@@ -134,7 +140,7 @@ export class Deploy extends DeployCommand {
 
   public async run(): Promise<DeployResult> {
     this.flags = (await this.parse(Deploy)).flags;
-    this.org = this.flags['target-org'];
+    this.org = await Org.create({ aliasOrUsername: this.flags['target-org'] });
     await this.deploy();
     this.resolveSuccess();
     return this.formatResult();

src/commands/force/source/deploy.ts

@@ -14,11 +14,16 @@ import {
   Flags,
   loglevel,
   orgApiVersionFlagWithDeprecations,
-  requiredOrgFlagWithDeprecations,
   Ux,
 } from '@salesforce/sf-plugins-core';
 import { Interfaces } from '@oclif/core';
-import { DeployCommand, getCoverageFormattersOptions, reportsFormatters, TestLevel } from '../../../deployCommand';
+import {
+  DeployCommand,
+  getCoverageFormattersOptions,
+  reportsFormatters,
+  targetUsernameFlag,
+  TestLevel,
+} from '../../../deployCommand';
 import { DeployCommandResult, DeployResultFormatter } from '../../../formatters/deployResultFormatter';
 import {
   DeployAsyncResultFormatter,
@@ -53,7 +58,7 @@ export class Deploy extends DeployCommand {
   public static readonly flags = {
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,
-    'target-org': requiredOrgFlagWithDeprecations,
+    'target-org': targetUsernameFlag,
     checkonly: Flags.boolean({
       char: 'c',
       description: messages.getMessage('flags.checkonly.description'),
@@ -83,6 +88,7 @@ export class Deploy extends DeployCommand {
     }),
     ignoreerrors: Flags.boolean({
       char: 'o',
+      // brfeak this
       description: messages.getMessage('flags.ignoreErrors.description'),
       summary: messages.getMessage('flags.ignoreErrors.summary'),
     }),
@@ -159,7 +165,7 @@ export class Deploy extends DeployCommand {
   private org: Org;
   public async run(): Promise<DeployCommandCombinedResult> {
     this.flags = (await this.parse(Deploy)).flags;
-    this.org = this.flags['target-org'];
+    this.org = await Org.create({ aliasOrUsername: this.flags['target-org'] });
     await this.preChecks();
     await this.deploy();
     this.resolveSuccess();

src/deployCommand.ts

@@ -15,7 +15,17 @@ import {
   MetadataApiDeployStatus,
   RequestStatus,
 } from '@salesforce/source-deploy-retrieve';
-import { Connection, Messages, Org, PollingClient, SfdxPropertyKeys, SfError, StatusResult } from '@salesforce/core';
+import {
+  ConfigAggregator,
+  Connection,
+  Messages,
+  Org,
+  PollingClient,
+  SfdxPropertyKeys,
+  SfError,
+  StateAggregator,
+  StatusResult,
+} from '@salesforce/core';
 import { AnyJson, getBoolean, isString } from '@salesforce/ts-types';
 import { Duration, once, ensureArray } from '@salesforce/kit';
 import {
@@ -25,6 +35,7 @@ import {
   DefaultReportOptions,
   JUnitReporter,
 } from '@salesforce/apex-node';
+import { Flags } from '@salesforce/sf-plugins-core';
 import { SourceCommand } from './sourceCommand';
 import { DeployData, Stash } from './stash';
 import { transformCoverageToApexCoverage, transformDeployTestsResultsToTestResult } from './coverageUtils';
@@ -53,6 +64,7 @@ export abstract class DeployCommand extends SourceCommand {
     const stashKey = Stash.getKey(this.id);
     Stash.set(stashKey, { jobid: id });
   });
+
   /**
    * Request a report of an in-progress or completed deployment.
    *
@@ -259,3 +271,26 @@ export const getCoverageFormattersOptions = (formatters: string[] = []): Coverag
     reportOptions,
   };
 };
+
+export const targetUsernameFlag = Flags.string({
+  required: true,
+  char: 'u',
+  deprecateAliases: true,
+  // DO NOT alias to 'o', it will conflict with '--ignoreerrors'
+  aliases: ['targetusername', 'u'],
+  summary: messages.getMessage('flags.targetusername.summary'),
+  parse: async (input: string | undefined) => resolveUsername(input),
+  default: async () => resolveUsername(),
+  defaultHelp: async () => resolveUsername(),
+});
+
+export const resolveUsername = async (usernameOrAlias?: string): Promise<string> => {
+  const stateAggregator = await StateAggregator.getInstance();
+  // we have a value, but don't know if it's a username or an alias
+  if (usernameOrAlias) return stateAggregator.aliases.resolveUsername(usernameOrAlias);
+  // we didn't get a value, so let's see if the config has a default target org
+  const configAggregator = await ConfigAggregator.create();
+  const defaultUsernameOrAlias: string = configAggregator.getPropertyValue('target-org');
+  if (defaultUsernameOrAlias) return stateAggregator.aliases.resolveUsername(defaultUsernameOrAlias);
+  throw new SfError(messages.getMessage('missingUsername'), 'MissingUsernameError');
+};