Sm/org-create-with-alias

.circleci/config.yml

@@ -87,6 +87,9 @@ jobs:
             shx rm -rf node_modules/@salesforce/kit
             yarn build
           working_directory: node_modules/@salesforce/core
+      - run:
+          name: any top-level jsforce1 modules
+          command: shx rm -rf node_modules/@types/jsforce
       - run:
           name: remove sf-plugins-core/core
           # deletes sf-plugins-core/core to prevent ts conflicts

messages/scratchOrgCreate.md

@@ -18,26 +18,6 @@ Expected 'durationDays' to be an integer number.
 
 Expected 'retry' to be an integer number.
 
-# WaitValidationMaxError
-
-Expected 'wait' greater than or equal to %s but received %s.
-
-# NoScratchOrgInfoError
-
-No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct.
-
-# ScratchOrgDeletedError
-
-That scratch org has been deleted, so you can't connect to it anymore.
-
 # CacheMissError
 
 The ScratchOrgInfoId %s was not found in the cache.
-
-# StillInProgressError
-
-The scratch org is not ready yet (Status = %).
-
-# action.StillInProgress
-
-Wait for a few minutes, and then try the <%= config.bin %> <%= command.id %> command again

messages/scratchOrgErrorCodes.md

@@ -14,6 +14,22 @@ See https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_ob
 
 The request to create a scratch org returned an unexpected status
 
+# StillInProgressError
+
+The scratch org is not ready yet (Status = %).
+
+# action.StillInProgress
+
+Wait for a few minutes, and then try the <%= config.bin %> <%= command.id %> command again
+
+# NoScratchOrgInfoError
+
+No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct.
+
+# ScratchOrgDeletedError
+
+That scratch org has been deleted, so you can't connect to it anymore.
+
 # INVALID_ID_FIELD
 
 Provide a valid template ID, in the format 0TTxxxxxxxxxxxx.

src/org/org.ts

@@ -132,20 +132,7 @@ export type ResumeSandboxRequest = {
   SandboxProcessObjId?: string;
 };
 
-export type ScratchOrgRequest = Pick<
-  ScratchOrgCreateOptions,
-  | 'connectedAppConsumerKey'
-  | 'durationDays'
-  | 'nonamespace'
-  | 'noancestors'
-  | 'wait'
-  | 'retry'
-  | 'apiversion'
-  | 'definitionjson'
-  | 'definitionfile'
-  | 'orgConfig'
-  | 'clientSecret'
->;
+export type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
 
 export type SandboxFields = {
   sandboxOrgId: string;

src/org/scratchOrgCreate.ts

@@ -33,13 +33,8 @@ const messages = Messages.load('@salesforce/core', 'scratchOrgCreate', [
   'DurationDaysValidationMaxError',
   'DurationDaysValidationMinError',
   'RetryNotIntError',
-  'WaitValidationMaxError',
   'DurationDaysNotIntError',
-  'NoScratchOrgInfoError',
-  'ScratchOrgDeletedError',
-  'StillInProgressError',
   'CacheMissError',
-  'action.StillInProgress',
 ]);
 
 export const DEFAULT_STREAM_TIMEOUT_MINUTES = 6;
@@ -88,7 +83,7 @@ export interface ScratchOrgCreateOptions {
   alias?: string;
   /** after complete, set the org as the default */
   setDefault?: boolean;
-  /** do not use source tracking for this org */
+  /** if false, do not use source tracking for this scratch org */
   tracksSource?: boolean;
 }
 

src/org/scratchOrgErrorCodes.ts

@@ -22,6 +22,10 @@ const namedMessages = Messages.load('@salesforce/core', 'scratchOrgErrorCodes',
   'SignupFailedUnknownError',
   'SignupFailedError',
   'SignupUnexpectedError',
+  'StillInProgressError',
+  'action.StillInProgress',
+  'ScratchOrgDeletedError',
+  'NoScratchOrgInfoError',
 ]);
 
 // getMessage will throw when the code isn't found
@@ -56,12 +60,12 @@ export const validateScratchOrgInfoForResume = async ({
     cache.unset(jobId);
     await cache.write();
     throw scratchOrgInfo.Status === 'Deleted'
-      ? messages.createError('ScratchOrgDeletedError')
-      : messages.createError('NoScratchOrgInfoError');
+      ? namedMessages.createError('ScratchOrgDeletedError')
+      : namedMessages.createError('NoScratchOrgInfoError');
   }
   if (['New', 'Creating'].includes(scratchOrgInfo.Status)) {
     // 2. scratchOrgInfo exists, still isn't finished.  Stays in cache for future attempts
-    throw messages.createError('StillInProgressError', [scratchOrgInfo.Status], ['action.StillInProgress']);
+    throw namedMessages.createError('StillInProgressError', [scratchOrgInfo.Status], ['action.StillInProgress']);
   }
   return checkScratchOrgInfoForErrors(scratchOrgInfo, hubUsername);
 };