@salesforce/core 3.33.5 → 3.33.7

package/lib/org/org.d.ts

@@ -44,6 +44,7 @@ export interface SandboxUserAuthResponse {
     instanceUrl: string;
     loginUrl: string;
 }
+export declare function sandboxIsResumable(value: string): boolean;
 export type SandboxProcessObject = {
     Id: string;
     Status: string;

package/lib/org/org.js

@@ -7,7 +7,7 @@
  */
 /* eslint-disable class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Org = exports.SandboxEvents = exports.OrgTypes = void 0;
+exports.Org = exports.sandboxIsResumable = exports.SandboxEvents = exports.OrgTypes = void 0;
 const path_1 = require("path");
 const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
@@ -28,7 +28,7 @@ const connection_1 = require("./connection");
 const authInfo_1 = require("./authInfo");
 const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
-const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."]]));
+const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."], ["sandboxNotResumable", "The sandbox %s cannot resume with status of %s."]]));
 var OrgTypes;
 (function (OrgTypes) {
     OrgTypes["Scratch"] = "scratch";
@@ -42,6 +42,11 @@ var SandboxEvents;
     SandboxEvents["EVENT_AUTH"] = "auth";
     SandboxEvents["EVENT_RESUME"] = "resume";
 })(SandboxEvents = exports.SandboxEvents || (exports.SandboxEvents = {}));
+const resumableSandboxStatus = ['Activating', 'Pending', 'Pending Activation', 'Processing', 'Sampling'];
+function sandboxIsResumable(value) {
+    return resumableSandboxStatus.includes(value);
+}
+exports.sandboxIsResumable = sandboxIsResumable;
 /**
  * Provides a way to manage a locally authenticated Org.
  *
@@ -173,6 +178,12 @@ class Org extends kit_1.AsyncOptionalCreatable {
             await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_ASYNC_RESULT, sandboxCreationProgress);
             throw messages.createError('sandboxCreateNotComplete');
         }
+        if (!sandboxIsResumable(sandboxCreationProgress.Status)) {
+            throw messages.createError('sandboxNotResumable', [
+                sandboxCreationProgress.SandboxName,
+                sandboxCreationProgress.Status,
+            ]);
+        }
         this.logger.debug(`resume - pollStatusAndAuth sandboxProcessObj ${JSON.stringify(sandboxCreationProgress, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj: sandboxCreationProgress,

package/lib/testSetup.js

@@ -399,7 +399,7 @@ const stubContext = (testContext) => {
         // init calls read calls getPath which sets the path on the config file the first time.
         // Since read is now stubbed, make sure to call getPath to initialize it.
         configFile.getPath();
-        // @ts-ignore set this to true to avoid an infinite loop in tests when reading config files.
+        // @ts-expect-error: set this to true to avoid an infinite loop in tests when reading config files.
         configFile.hasRead = true;
         return stub;
     };
@@ -421,9 +421,9 @@ const stubContext = (testContext) => {
         }
     };
     // Mock out all config file IO for all tests. They can restore individually if they need original functionality.
-    // @ts-ignore
-    stubs.configRead = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'readSync').callsFake(readSync);
-    stubs.configReadSync = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'read').callsFake(read);
+    stubs.configRead = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'read').callsFake(read);
+    // @ts-expect-error: muting exact type match for stub readSync
+    stubs.configReadSync = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'readSync').callsFake(readSync);
     const writeSync = function (newContents) {
         if (!testContext.configStubs[this.constructor.name]) {
             testContext.configStubs[this.constructor.name] = {};

package/messages/org.md

@@ -61,3 +61,7 @@ We can't find a SandboxProcess with the SandboxName %s.
 # MultiSandboxProcessNotFoundBySandboxName
 
 We found more than one SandboxProcess with the SandboxName %s.
+
+# sandboxNotResumable
+
+The sandbox %s cannot resume with status of %s.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.33.5",
+  "version": "3.33.7",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -63,11 +63,11 @@
     "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
     "@types/jsen": "0.0.21",
-    "@types/jsonwebtoken": "8.5.9",
+    "@types/jsonwebtoken": "9.0.1",
     "@types/lodash": "^4.14.191",
     "@types/shelljs": "0.8.11",
     "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
+    "@typescript-eslint/parser": "^5.54.1",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",