fix: check for resumable state for sandbox resume

@W-12467406@
forcedotcom · Feb 28, 2023 · 157622f · 157622f
1 parent 4bd8fe5
commit 157622f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/messages/org.md b/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.
diff --git a/src/org/org.ts b/src/org/org.ts
@@ -44,22 +44,7 @@ import { scratchOrgCreate, ScratchOrgCreateOptions, ScratchOrgCreateResult } fro
 import { OrgConfigProperties } from './orgConfigProperties';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.load('@salesforce/core', 'org', [
-  'deleteOrgHubError',
-  'insufficientAccessToDelete',
-  'missingAuthUsername',
-  'noDevHubFound',
-  'notADevHub',
-  'noUsernameFound',
-  'sandboxDeleteFailed',
-  'sandboxInfoCreateFailed',
-  'sandboxNotFound',
-  'scratchOrgNotFound',
-  'AuthInfoOrgIdUndefined',
-  'sandboxCreateNotComplete',
-  'SandboxProcessNotFoundBySandboxName',
-  'MultiSandboxProcessNotFoundBySandboxName',
-]);
+const messages = Messages.loadMessages('@salesforce/core', 'org');
 
 export type OrganizationInformation = {
   Name: string;
@@ -107,6 +92,12 @@ export interface SandboxUserAuthResponse {
   loginUrl: string;
 }
 
+const resumableSandboxStatus = ['Activating', 'Pending', 'Pending Activation', 'Processing', 'Sampling'];
+
+export function sandboxIsResumable(value: string): boolean {
+  return resumableSandboxStatus.includes(value);
+}
+
 export type SandboxProcessObject = {
   Id: string;
   Status: string;
@@ -315,6 +306,12 @@ export class Org extends AsyncOptionalCreatable<Org.Options> {
       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,