fix: error keys support createError

salesforcecli · Mar 2, 2022 · f094c49 · f094c49
1 parent 5d917bf
commit f094c49
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/messages/messages.md b/messages/messages.md
@@ -42,18 +42,18 @@ apiVersion configuration overridden at %s
 
 API versions up to %s are deprecated. See %s for more information.
 
-# flags.apiVersion.errors.InvalidApiVersion
+# errors.InvalidApiVersion
 
 %s is not a valid API version.
 
-# flags.apiVersion.errors.RetiredApiVersion
+# errors.RetiredApiVersion
 
 The API version must be greater than %s.
 
-# flags.duration.errors.InvalidInput
+# errors.InvalidDuration
 
 The value must be an integer.
 
-# flags.duration.errors.DurationBounds
+# errors.DurationBounds
 
 The value must be between %s and %s (inclusive).
diff --git a/src/flags/duration.ts b/src/flags/duration.ts
@@ -53,17 +53,17 @@ const validate = (input: string, config: DurationFlagConfig): Duration => {
   try {
     parsedInput = parseInt(input, 10);
     if (typeof parsedInput !== 'number' || isNaN(parsedInput)) {
-      throw messages.createError('flags.duration.errors.InvalidInput');
+      throw messages.createError('errors.InvalidDuration');
     }
   } catch (e) {
-    throw messages.createError('flags.duration.errors.InvalidInput');
+    throw messages.createError('errors.InvalidDuration');
   }
 
   if (min && parsedInput < min) {
-    throw messages.createError('flags.duration.errors.DurationBounds', [min, max]);
+    throw messages.createError('errors.DurationBounds', [min, max]);
   }
   if (max && parsedInput > max) {
-    throw messages.createError('flags.duration.errors.DurationBounds', [min, max]);
+    throw messages.createError('errors.DurationBounds', [min, max]);
   }
   return toDuration(parsedInput, unit);
 };

diff --git a/src/flags/orgApiVersion.ts b/src/flags/orgApiVersion.ts
@@ -46,11 +46,11 @@ const getDefaultFromConfig = async (): Promise<string | undefined> => {
 const validate = async (input: string): Promise<string> => {
   // basic format check
   if (!sfdc.validateApiVersion(input)) {
-    throw messages.createError('flags.apiVersion.errors.InvalidApiVersion', [input]);
+    throw messages.createError('errors.InvalidApiVersion', [input]);
   }
   const requestedVersion = parseInt(input, 10);
   if (requestedVersion < minValidApiVersion) {
-    throw messages.createError('flags.apiVersion.errors.RetiredApiVersion', [minValidApiVersion]);
+    throw messages.createError('errors.RetiredApiVersion', [minValidApiVersion]);
   }
   if (requestedVersion <= maxDeprecated) {
     await Lifecycle.getInstance().emitWarning(

diff --git a/src/flags/orgFlags.ts b/src/flags/orgFlags.ts
@@ -23,7 +23,8 @@ const getHubOrThrow = async (aliasOrUsername?: string): Promise<Org> => {
   if (!aliasOrUsername) {
     // check config for a default
     const config = await ConfigAggregator.create();
-    aliasOrUsername = config.getInfo('defaultdevhubusername')?.value as string;
+    aliasOrUsername =
+      (config.getInfo('target-dev-hub')?.value as string) ?? (config.getInfo('defaultdevhubusername')?.value as string);
     if (!aliasOrUsername) {
       throw messages.createError('errors.NoDefaultDevHub');
     }

diff --git a/src/flags/salesforceId.ts b/src/flags/salesforceId.ts
@@ -10,7 +10,7 @@ import { Messages, sfdc } from '@salesforce/core';
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
 
-interface IdFlagConfig extends Partial<Interfaces.OptionFlagProps> {
+export interface IdFlagConfig extends Partial<Interfaces.OptionFlagProps> {
   /**
    * Can specify if the version must be 15 or 18 characters long.  Leave blank to allow either 15 or 18.
    */

diff --git a/test/unit/flags/apiVersion.test.ts b/test/unit/flags/apiVersion.test.ts
@@ -59,7 +59,7 @@ describe('fs flags', () => {
       throw new Error(`Should have thrown an error ${JSON.stringify(out)}`);
     } catch (err) {
       const error = err as Error;
-      expect(error.message).to.equal(messages.getMessage('flags.apiVersion.errors.InvalidApiVersion', ['foo']));
+      expect(error.message).to.equal(messages.getMessage('errors.InvalidApiVersion', ['foo']));
     }
   });
 
@@ -73,9 +73,7 @@ describe('fs flags', () => {
       throw new Error(`Should have thrown an error ${JSON.stringify(out)}`);
     } catch (err) {
       const error = err as Error;
-      expect(error.message).to.equal(
-        messages.getMessage('flags.apiVersion.errors.RetiredApiVersion', [minValidApiVersion])
-      );
+      expect(error.message).to.equal(messages.getMessage('errors.RetiredApiVersion', [minValidApiVersion]));
     }
   });
 

diff --git a/test/unit/flags/duration.test.ts b/test/unit/flags/duration.test.ts
@@ -99,7 +99,7 @@ describe('duration flag', () => {
           throw new Error(`Should have thrown an error ${JSON.stringify(out)}`);
         } catch (err) {
           const error = err as Error;
-          expect(error.message).to.equal(messages.getMessage('flags.duration.errors.DurationBounds', [1, 60]));
+          expect(error.message).to.equal(messages.getMessage('errors.DurationBounds', [1, 60]));
         }
       });
       it('above max fails', async () => {
@@ -108,7 +108,7 @@ describe('duration flag', () => {
           throw new Error(`Should have thrown an error ${JSON.stringify(out)}`);
         } catch (err) {
           const error = err as Error;
-          expect(error.message).to.equal(messages.getMessage('flags.duration.errors.DurationBounds', [1, 60]));
+          expect(error.message).to.equal(messages.getMessage('errors.DurationBounds', [1, 60]));
         }
       });
       it('invalid input', async () => {
@@ -117,7 +117,7 @@ describe('duration flag', () => {
           throw new Error(`Should have thrown an error ${JSON.stringify(out)}`);
         } catch (err) {
           const error = err as Error;
-          expect(error.message).to.equal(messages.getMessage('flags.duration.errors.InvalidInput'));
+          expect(error.message).to.equal(messages.getMessage('errors.InvalidInput'));
         }
       });
     });