fix: messages receive the bin instead of saying "sfdx"

Author: mshanemc

messages/clone.md

@@ -2,10 +2,6 @@
 
 Clone a sandbox org.
 
-# success
-
-The sandbox org cloning process %s is in progress. Run "sfdx force:org:status -n %s" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.
-
 # description
 
 There are two ways to clone a sandbox: either specify a sandbox definition file or provide key=value pairs at the command line. Key-value pairs at the command-line override their equivalent sandbox definition file values. In either case, you must specify both the "SandboxName" and "SourceSandboxName" options to set the names of the new sandbox and the one being cloned, respectively.
@@ -44,7 +40,7 @@ Sets the streaming client socket timeout, in minutes. If the streaming client so
 
 # commandSuccess
 
-The sandbox org cloning process %s is in progress. Run "sfdx force:org:status -n %s" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.
+The sandbox org cloning process %s is in progress. Run "%s force:org:status -n %s" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.
 
 # commandOrganizationTypeNotSupport
 

messages/create.md

@@ -36,10 +36,6 @@ Alias for the created org.
 
 Path to an org definition file.
 
-# flags.definitionJson
-
-Org definition in JSON format.
-
 # flags.noNamespace
 
 Create the scratch org with no namespace.
@@ -48,10 +44,6 @@ Create the scratch org with no namespace.
 
 Do not include second-generation package ancestors in the scratch org.
 
-# flags.env
-
-Environment where the scratch org is created: %s.
-
 # flags.type
 
 Type of org to create.
@@ -98,19 +90,19 @@ One cannot use flag retry with Sandbox org create.
 
 # sandboxSuccess
 
-The sandbox org creation process %s is in progress. Run "sfdx force:org:status -n %s -u %s" to check for status. If the org is ready, checking the status also authorizes the org for use with Salesforce CLI.
+The sandbox org creation process %s is in progress. Run "%s force:org:status -n %s -u %s" to check for status. If the org is ready, checking the status also authorizes the org for use with Salesforce CLI.
 
 # requiresUsername
 
-This command requires a username. Specify it with the -u parameter or with the "sfdx config:set defaultusername=<username>" command.
+This command requires a username. Specify it with the -u parameter or with the "%s config set defaultusername=<username>" command.
 
 # dnsTimeout
 
-The sandbox was successfully created and authenticated. However, the sandbox DNS records aren't ready yet and so the sandbox may not be available. Run "org:list" and check if the sandbox is listed correctly. If it isn't listed, run "force:org:status" to view its status and, if necessary, authenticate to it again. If this issue happens frequently, try setting the SFDX_DNS_TIMEOUT environment variable to a larger number; the default value is 3 seconds.
+The sandbox was successfully created and authenticated. However, the sandbox DNS records aren't ready yet and so the sandbox may not be available. Run "%s org:list" and check if the sandbox is listed correctly. If it isn't listed, run "%s force:org:status" to view its status and, if necessary, authenticate to it again. If this issue happens frequently, try setting the SFDX_DNS_TIMEOUT environment variable to a larger number; the default value is 3 seconds.
 
 # partialSuccess
 
-If you specified the -a or -s parameters, but the sandbox wasn't immediately available, the "force:org:create" command may not have finished setting the alias or defaultusername. If so, set the alias manually with "sfdx alias:set" and the defaultusername with "sfdx config:set".
+If you specified the -a or -s parameters, but the sandbox wasn't immediately available, the "%s force:org:create" command may not have finished setting the alias or defaultusername. If so, set the alias manually with "%s alias:set" and the defaultusername with "%s config:set".
 
 # noConfig
 

messages/create.sandbox.md

@@ -102,10 +102,6 @@ To disable source tracking in the new sandbox, specify the --no-track-source fla
 
 Is the configuration correct?
 
-# warning.NoSandboxNameDefined
-
-No SandboxName defined, generating new SandboxName: %s.
-
 # error.SandboxNameLength
 
 The sandbox name "%s" should be 10 or fewer characters.

messages/list.md

@@ -62,4 +62,4 @@ No non-scratch orgs found.
 
 # cleanWarning
 
-Unable to clean org with username %s. You can run "sfdx org:delete:scratch -o %s" to remove it.`
+Unable to clean org with username %s. You can run "%s org:delete:scratch -o %s" to remove it.`

messages/messages.md

@@ -1,81 +1,5 @@
-# HelpDefaults
-
-If not supplied, the apiversion, template, and outputdir use default values.
-
-# HelpOutputDirRelative
-
-The outputdir can be an absolute path or relative to the current working directory.
-
-# HelpOutputDirRelativeLightning
-
-If you don’t specify an outputdir, we create a subfolder in your current working directory with the name of your bundle. For example, if the current working directory is force-app and your Lightning bundle is called myBundle, we create force-app/myBundle/ to store the files in the bundle.
-
-# HelpExamplesTitle
-
-Examples:
-
-# OutputDirFlagDescription
-
-folder for saving the created files
-
-# OutputDirFlagLongDescription
-
-The directory to store the newly created files. The location can be an absolute path or relative to the current working directory. The default is the current directory.
-
-# TemplateFlagDescription
-
-template to use for file creation
-
-# TemplateFlagLongDescription
-
-The template to use to create the file. Supplied parameter values or default values are filled into a copy of the template.
-
-# TargetDirOutput
-
-target dir = %s
-
-# App
-
-app
-
-# Event
-
-event
-
-# Interface
-
-interface
-
-# Test
-
-test
-
-# Component
-
-component
-
-# Page
-
-page
-
-# AlphaNumericNameError
-
-Name must contain only alphanumeric characters.
-
-# NameMustStartWithLetterError
-
-Name must start with a letter.
-
-# EndWithUnderscoreError
-
-Name can't end with an underscore.
-
-# DoubleUnderscoreError
-
-Name can't contain 2 consecutive underscores.
-
 # SecurityWarning
 
 This command will expose sensitive information that allows for subsequent activity using your current authenticated session.
 Sharing this information is equivalent to logging someone in under the current credential, resulting in unintended access and escalation of privilege.
-For additional information, please review the authorization section of the https://developer.salesforce.com/docs/atlas.en-us.234.0.sfdx_dev.meta/sfdx_dev/sfdx_dev_auth_web_flow.htm
+For additional information, please review the authorization section of the https://developer.salesforce.com/docs/atlas.en-us.234.0.sfdx_dev.meta/sfdx_dev/sfdx_dev_auth_web_flow.htm

messages/open.md

@@ -67,7 +67,3 @@ Waiting to resolve the Lightning Experience-enabled custom domain...
 # domainTimeoutError
 
 The Lightning Experience-enabled custom domain is unavailable.
-
-# domainTimeoutAction
-
-The Lightning Experience-enabled custom domain may take a few more minutes to resolve. Try the "org:open" command again.

src/commands/force/org/clone.ts

@@ -89,7 +89,9 @@ export class OrgCloneCommand extends SfCommand<SandboxProcessObject> {
     if (flags.type === OrgTypes.Sandbox) {
       lifecycle.on(SandboxEvents.EVENT_ASYNC_RESULT, async (results: SandboxProcessObject) =>
         // Keep all console output in the command
-        Promise.resolve(this.log(messages.getMessage('commandSuccess', [results.Id, results.SandboxName])))
+        Promise.resolve(
+          this.log(messages.getMessage('commandSuccess', [results.Id, this.config.bin, results.SandboxName]))
+        )
       );
 
       lifecycle.on(SandboxEvents.EVENT_STATUS, async (results: StatusEvent) =>

src/commands/force/org/create.ts

@@ -166,14 +166,16 @@ export class Create extends SfCommand<CreateResult> {
 
   private async createSandbox(): Promise<SandboxProcessObject> {
     if (!this.flags['target-org']) {
-      throw new SfError(messages.getMessage('requiresUsername'));
+      throw new SfError(messages.getMessage('requiresUsername', [this.config.bin]));
     }
     const lifecycle = Lifecycle.getInstance();
     const username = this.flags['target-org'].getUsername();
     // register the sandbox event listeners before calling `prodOrg.createSandbox()`
 
     lifecycle.on(SandboxEvents.EVENT_ASYNC_RESULT, async (results: SandboxProcessObject) =>
-      Promise.resolve(this.log(messages.getMessage('sandboxSuccess', [results.Id, results.SandboxName, username])))
+      Promise.resolve(
+        this.log(messages.getMessage('sandboxSuccess', [results.Id, this.config.bin, results.SandboxName, username]))
+      )
     );
 
     lifecycle.on(SandboxEvents.EVENT_STATUS, async (results: StatusEvent) =>
@@ -233,7 +235,10 @@ export class Create extends SfCommand<CreateResult> {
           const result = await globalConfig.write();
           this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
         }
-        err.actions = [messages.getMessage('dnsTimeout'), messages.getMessage('partialSuccess')];
+        err.actions = [
+          messages.getMessage('dnsTimeout', [this.config.bin, this.config.bin]),
+          messages.getMessage('partialSuccess', [this.config.bin, this.config.bin, this.config.bin]),
+        ];
         err.exitCode = 68;
       }
 

src/commands/org/list.ts

@@ -102,10 +102,11 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
           const org = await Org.create({ aliasOrUsername: fields.username, connection });
           await org.remove();
         } catch (e) {
-          const err = e as SfError;
-          const logger = await Logger.child('org:list');
-          logger.debug(`Error cleaning org ${fields.username}: ${err.message}`);
-          this.warn(messages.getMessage('cleanWarning', [fields.username, fields.username]));
+          this.warn(messages.getMessage('cleanWarning', [fields.username, this.config.bin, fields.username]));
+          if (e instanceof Error) {
+            const logger = await Logger.child('org:list');
+            logger.debug(`Error cleaning org ${fields.username}: ${e.message}`);
+          }
         }
       })
     );

test/nut/legacy/sandbox.sandboxNut.ts

@@ -42,9 +42,17 @@ describe('Sandbox Orgs via legacy org:create', () => {
       console.log(e);
       assert(e instanceof SfError);
       // there was a DNS issue, verify we handled it as best as we could
-      expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('partialSuccess'));
-      expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('dnsTimeout'));
       expect(e.exitCode, 'org:create DNS issue').to.equal(68);
+      // it'll be one of the CLIs
+      try {
+        expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('partialSuccess', ['sf', 'sf', 'sf']));
+        expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('dnsTimeout', ['sf', 'sf']));
+      } catch {
+        expect(e.message, 'org:create DNS issue').to.include(
+          messages.getMessage('partialSuccess', ['sfdx', 'sfdx', 'sfdx'])
+        );
+        expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('dnsTimeout', ['sfdx', 'sfdx']));
+      }
     }
     assert(result, JSON.stringify(result));
     // autogenerated sandbox names start with 'sbx'