@salesforce/core 5.3.3 → 5.3.5

package/lib/org/authInfo.js

@@ -206,7 +206,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param sfdxAuthUrl
      */
     static parseSfdxAuthUrl(sfdxAuthUrl) {
-        const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
+        const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+={0,2}):([a-zA-Z0-9._-]*={0,2}):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
         if (!match) {
             throw new sfError_1.SfError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
         }

package/lib/org/org.d.ts

@@ -36,7 +36,8 @@ export declare enum SandboxEvents {
     EVENT_ASYNC_RESULT = "asyncResult",
     EVENT_RESULT = "result",
     EVENT_AUTH = "auth",
-    EVENT_RESUME = "resume"
+    EVENT_RESUME = "resume",
+    EVENT_MULTIPLE_SBX_PROCESSES = "multipleMatchingSbxProcesses"
 }
 export interface SandboxUserAuthResponse {
     authUserName: string;
@@ -141,11 +142,11 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
         interval?: Duration;
     }): Promise<SandboxProcessObject>;
     /**
-     * resume a sandbox creation from a production org
-     * 'this' needs to be a production org with sandbox licenses available
+     * Resume a sandbox creation from a production org.
+     * `this` needs to be a production org with sandbox licenses available.
      *
      * @param resumeSandboxRequest SandboxRequest options to create the sandbox with
-     * @param options Wait: The amount of time to wait (default: 30 minutes) before timing out,
+     * @param options Wait: The amount of time to wait (default: 0 minutes) before timing out,
      * Interval: The time interval (default: 30 seconds) between polling
      */
     resumeSandbox(resumeSandboxRequest: ResumeSandboxRequest, options?: {

package/lib/org/org.js

@@ -41,6 +41,7 @@ var SandboxEvents;
     SandboxEvents["EVENT_RESULT"] = "result";
     SandboxEvents["EVENT_AUTH"] = "auth";
     SandboxEvents["EVENT_RESUME"] = "resume";
+    SandboxEvents["EVENT_MULTIPLE_SBX_PROCESSES"] = "multipleMatchingSbxProcesses";
 })(SandboxEvents = exports.SandboxEvents || (exports.SandboxEvents = {}));
 const resumableSandboxStatus = ['Activating', 'Pending', 'Pending Activation', 'Processing', 'Sampling', 'Completed'];
 function sandboxIsResumable(value) {
@@ -129,11 +130,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
         return this.createSandbox(sandboxReq, options);
     }
     /**
-     * resume a sandbox creation from a production org
-     * 'this' needs to be a production org with sandbox licenses available
+     * Resume a sandbox creation from a production org.
+     * `this` needs to be a production org with sandbox licenses available.
      *
      * @param resumeSandboxRequest SandboxRequest options to create the sandbox with
-     * @param options Wait: The amount of time to wait (default: 30 minutes) before timing out,
+     * @param options Wait: The amount of time to wait (default: 0 minutes) before timing out,
      * Interval: The time interval (default: 30 seconds) between polling
      */
     async resumeSandbox(resumeSandboxRequest, options = {
@@ -144,12 +145,27 @@ class Org extends kit_1.AsyncOptionalCreatable {
         this.logger.debug(resumeSandboxRequest, 'ResumeSandbox called with ResumeSandboxRequest');
         let sandboxCreationProgress;
         // seed the sandboxCreationProgress via the resumeSandboxRequest options
-        if (resumeSandboxRequest.SandboxName) {
-            sandboxCreationProgress = await this.querySandboxProcessBySandboxName(resumeSandboxRequest.SandboxName);
-        }
-        else if (resumeSandboxRequest.SandboxProcessObjId) {
+        if (resumeSandboxRequest.SandboxProcessObjId) {
             sandboxCreationProgress = await this.querySandboxProcessById(resumeSandboxRequest.SandboxProcessObjId);
         }
+        else if (resumeSandboxRequest.SandboxName) {
+            try {
+                // There can be multiple sandbox processes returned when querying by name. Use the most recent
+                // process and fire a warning event with all processes.
+                sandboxCreationProgress = await this.querySandboxProcessBySandboxName(resumeSandboxRequest.SandboxName);
+            }
+            catch (err) {
+                if (err instanceof sfError_1.SfError && err.name === 'SingleRecordQuery_MultipleRecords' && err.data) {
+                    const sbxProcesses = err.data;
+                    // 0 index will always be the most recently created process since the query sorts on created date desc.
+                    sandboxCreationProgress = sbxProcesses[0];
+                    await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_MULTIPLE_SBX_PROCESSES, sbxProcesses);
+                }
+                else {
+                    throw err;
+                }
+            }
+        }
         else {
             throw messages.createError('sandboxNotFound', [
                 resumeSandboxRequest.SandboxName ?? resumeSandboxRequest.SandboxProcessObjId,
@@ -1085,7 +1101,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         let waitingOnAuth = false;
         const pollingClient = await pollingClient_1.PollingClient.create({
             poll: async () => {
-                const sandboxProcessObj = await this.querySandboxProcessBySandboxInfoId(options.sandboxProcessObj.SandboxInfoId);
+                const sandboxProcessObj = await this.querySandboxProcessById(options.sandboxProcessObj.Id);
                 // check to see if sandbox can authenticate via sandboxAuth endpoint
                 const sandboxInfo = await this.sandboxSignupComplete(sandboxProcessObj);
                 if (sandboxInfo) {
@@ -1127,10 +1143,17 @@ class Org extends kit_1.AsyncOptionalCreatable {
      * @private
      */
     async querySandboxProcess(where) {
-        const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} AND Status != 'D'`;
-        return this.connection.singleRecordQuery(queryStr, {
-            tooling: true,
-        });
+        const soql = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} ORDER BY CreatedDate DESC`;
+        const result = (await this.connection.tooling.query(soql)).records.filter((item) => !item.Status.startsWith('Del'));
+        if (result.length === 0) {
+            throw new sfError_1.SfError(`No record found for ${soql}`, connection_1.SingleRecordQueryErrors.NoRecords);
+        }
+        if (result.length > 1) {
+            const err = new sfError_1.SfError('The query returned more than 1 record', connection_1.SingleRecordQueryErrors.MultipleRecords);
+            err.data = result;
+            throw err;
+        }
+        return result[0];
     }
     /**
      * determines if the sandbox has successfully been created

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "5.3.3",
+  "version": "5.3.5",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -62,7 +62,7 @@
     "@salesforce/dev-config": "^4.0.1",
     "@salesforce/dev-scripts": "^5.4.2",
     "@salesforce/prettier-config": "^0.0.3",
-    "@salesforce/ts-sinon": "^1.4.15",
+    "@salesforce/ts-sinon": "^1.4.16",
     "@types/benchmark": "^2.1.3",
     "@types/chai-string": "^1.4.3",
     "@types/jsonwebtoken": "9.0.3",