Merge pull request #613 from salesforcecli/phale/W-12467406

fix: check if sandbox is resumable

Author: shetzel

messages/create.md

@@ -68,6 +68,10 @@ Number of scratch org auth retries after scratch org is successfully signed up.
 
 Streaming client socket timeout (in minutes).
 
+# flags.targetOrg.summary
+
+Username or alias of the production org that contains the sandbox license.
+
 # scratchOrgCreateSuccess
 
 Successfully created scratch org: %s, username: %s.

messages/sandboxbase.md

@@ -5,7 +5,7 @@ The sandbox org creation was successful.
 # sandboxSuccess.actions
 
 The username for the sandbox is %s.
-You can open the org by running "%s org open -e %s"
+You can open the org by running "%s org open -o %s"
 
 # checkSandboxStatus
 

package.json

@@ -7,26 +7,26 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^2.6.3",
-    "@salesforce/core": "^3.33.5",
-    "@salesforce/kit": "^1.9.0",
-    "@salesforce/sf-plugins-core": "^2.2.3",
-    "@salesforce/source-deploy-retrieve": "^7.11.0",
+    "@salesforce/core": "^3.34.3",
+    "@salesforce/kit": "^1.9.2",
+    "@salesforce/sf-plugins-core": "^2.2.4",
+    "@salesforce/source-deploy-retrieve": "^7.12.0",
     "open": "^8.4.2",
     "tslib": "^2"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.9",
-    "@salesforce/cli-plugins-testkit": "^3.2.25",
+    "@salesforce/cli-plugins-testkit": "^3.2.26",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.1.3",
     "@salesforce/plugin-command-reference": "^2.2.9",
     "@salesforce/plugin-source": "^2.8.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "1.4.6",
-    "@swc/core": "^1.3.37",
+    "@swc/core": "1.3.39",
     "@types/chai-as-promised": "^7.1.5",
     "@types/shelljs": "^0.8.10",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",

src/commands/force/org/create.ts

@@ -8,30 +8,30 @@
 import { Interfaces } from '@oclif/core';
 import {
   Flags,
-  SfCommand,
+  loglevel,
+  optionalHubFlagWithDeprecations,
   optionalOrgFlagWithDeprecations,
   orgApiVersionFlagWithDeprecations,
   parseVarArgs,
-  optionalHubFlagWithDeprecations,
-  loglevel,
+  SfCommand,
 } from '@salesforce/sf-plugins-core';
 import {
   AuthFields,
-  StateAggregator,
   Config,
   Lifecycle,
+  Logger,
   Messages,
-  OrgTypes,
   OrgConfigProperties,
+  OrgTypes,
   ResultEvent,
   SandboxEvents,
   SandboxProcessObject,
   SandboxUserAuthResponse,
-  SfError,
-  StatusEvent,
   ScratchOrgInfo,
   ScratchOrgRequest,
-  Logger,
+  SfError,
+  StateAggregator,
+  StatusEvent,
 } from '@salesforce/core';
 import { createSandboxRequest } from '../../../shared/sandboxRequest';
 import { SandboxReporter } from '../../../shared/sandboxReporter';
@@ -48,6 +48,7 @@ export interface ScratchOrgProcessObject {
 }
 
 export type CreateResult = ScratchOrgProcessObject | SandboxProcessObject;
+
 export class Create extends SfCommand<CreateResult> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
@@ -63,7 +64,10 @@ export class Create extends SfCommand<CreateResult> {
   public static readonly strict = false;
 
   public static readonly flags = {
-    'target-org': optionalOrgFlagWithDeprecations,
+    'target-org': {
+      ...optionalOrgFlagWithDeprecations,
+      summary: messages.getMessage('flags.targetOrg.summary'),
+    },
     'target-dev-hub': optionalHubFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,

src/shared/sandboxCommandBase.ts

@@ -160,8 +160,8 @@ export abstract class SandboxCommandBase<T> extends SfCommand<T> {
       [
         messages.getMessage('sandboxSuccess'),
         messages.getMessages('sandboxSuccess.actions', [
-          this.config.bin,
           results.sandboxRes?.authUserName,
+          this.config.bin,
           results.sandboxRes?.authUserName,
         ]),
       ].join(os.EOL)