@salesforce/plugin-org 1.10.0 → 1.11.2

package/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.11.2](https://github.com/salesforcecli/plugin-org/compare/v1.11.1...v1.11.2) (2022-02-21)
+
+### Bug Fixes
+
+- only local config ([54e7b93](https://github.com/salesforcecli/plugin-org/commit/54e7b934008bae5a12934932c239c6ff59e2f22e))
+- try to create local config first ([f84c64f](https://github.com/salesforcecli/plugin-org/commit/f84c64f46ed5141bab3167cba04f75ad4e59484b))
+- use Aliases.parseAndUpdate ([0b1860f](https://github.com/salesforcecli/plugin-org/commit/0b1860fb1b535ff2b5a84e4dcb1b691c4b85cdba))
+
+### [1.11.1](https://github.com/salesforcecli/plugin-org/compare/v1.11.0...v1.11.1) (2022-01-28)
+
+### Features
+
+- scratchOrg create ([955667e](https://github.com/salesforcecli/plugin-org/commit/955667e2d3e7e6444903c89ad065b9161444b22b))
+
+### Bug Fixes
+
+- add initial org:beta:create command ([1cf6bdb](https://github.com/salesforcecli/plugin-org/commit/1cf6bdb1399e20e2fc72a9f0c15080e95b26e219))
+- add initial org:beta:create command ([d2a89e2](https://github.com/salesforcecli/plugin-org/commit/d2a89e24a956136bb11d161618234b33842787e7))
+- add org:beta:create command for sandboxes, UTs ([654ca50](https://github.com/salesforcecli/plugin-org/commit/654ca50ee2192342c6df382e9e20f8b33f9fd73f))
+- add sandbox create/open/delete NUT ([60c81aa](https://github.com/salesforcecli/plugin-org/commit/60c81aa6330b87cecb06a84cca2994c7d466c3f5))
+- bump testkit to fix yarn.lock ([454afbd](https://github.com/salesforcecli/plugin-org/commit/454afbd6649e2ceaabdaeeb27ce9a3d5e5f9c813))
+- disable nuts-on-windows w/latest ([0bf02b1](https://github.com/salesforcecli/plugin-org/commit/0bf02b191d2ef039c5800ef233bba142b82bf975))
+- manual release for beta:org:create ([a33137f](https://github.com/salesforcecli/plugin-org/commit/a33137f04602bb36033c73132098e311206ebafe))
+- merge conflicts ([cd02453](https://github.com/salesforcecli/plugin-org/commit/cd024538fe2616fe3b46ef477d268e41f2516bea))
+- use compatible types from command/test ([a4de0b0](https://github.com/salesforcecli/plugin-org/commit/a4de0b06be0f899b07a6651b61febf6732069ef0))
+
+## [1.11.0](https://github.com/salesforcecli/plugin-org/compare/v1.10.1...v1.11.0) (2021-12-02)
+
+### Features
+
+- bump deps ([fbd44e7](https://github.com/salesforcecli/plugin-org/commit/fbd44e7872c691c290a62f8ad739e323854f8de0))
+
+### [1.10.1](https://github.com/salesforcecli/plugin-org/compare/v1.10.0...v1.10.1) (2021-12-01)
+
+### Bug Fixes
+
+- org:delete scratch org + sandboxes ([#228](https://github.com/salesforcecli/plugin-org/issues/228)) ([ab4b7a2](https://github.com/salesforcecli/plugin-org/commit/ab4b7a234c22d226aa148002daf578ee8a7975e6))
+
 ## [1.10.0](https://github.com/salesforcecli/plugin-org/compare/v1.9.2...v1.10.0) (2021-11-30)
 
 ### Features

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018, Salesforce.com, Inc.
+Copyright (c) 2022, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/README.md

@@ -78,20 +78,120 @@ sfdx plugins
 
 <!-- commands -->
 
+- [`sfdx force:org:beta:create [name=value...] [-t scratch|sandbox] [-f <filepath>] [-n] [-c] [-i <string>] [-s] [-a <string>] [-w <minutes>] [-d <integer>] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgbetacreate-namevalue--t-scratchsandbox--f-filepath--n--c--i-string--s--a-string--w-minutes--d-integer--v-string--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
+- [`sfdx force:org:delete [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgdelete--p--v-string--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 - [`sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgdisplay--u-string---apiversion-string---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 - [`sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorglist---all--p---clean---skipconnectionstatus---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 - [`sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgopen--b-string---r--p-string--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 
-## `sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
+## `sfdx force:org:beta:create [name=value...] [-t scratch|sandbox] [-f <filepath>] [-n] [-c] [-i <string>] [-s] [-a <string>] [-w <minutes>] [-d <integer>] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
-get the description for the current or target org
+create a scratch or sandbox org
+
+```
+USAGE
+  $ sfdx force:org:beta:create [name=value...] [-t scratch|sandbox] [-f <filepath>] [-n] [-c] [-i <string>] [-s] [-a
+  <string>] [-w <minutes>] [-d <integer>] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
+  trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+
+OPTIONS
+  -a, --setalias=setalias                                                           alias for the created org
+
+  -c, --noancestors                                                                 do not include second-generation
+                                                                                    package ancestors in the scratch org
+
+  -d, --durationdays=durationdays                                                   duration of the scratch org (in
+                                                                                    days) (default:7, min:1, max:30)
+
+  -f, --definitionfile=definitionfile                                               path to an org definition file
+
+  -i, --clientid=clientid                                                           connected app consumer key; not
+                                                                                    supported for sandbox org creation
+
+  -n, --nonamespace                                                                 create the scratch org with no
+                                                                                    namespace
+
+  -s, --setdefaultusername                                                          set the created org as the default
+                                                                                    username
+
+  -t, --type=(scratch|sandbox)                                                      [default: scratch] type of org to
+                                                                                    create
+
+  -u, --targetusername=targetusername                                               username or alias for the target
+                                                                                    org; overrides default target org
+
+  -v, --targetdevhubusername=targetdevhubusername                                   username or alias for the dev hub
+                                                                                    org; overrides default dev hub org
+
+  -w, --wait=wait                                                                   [default: 6 minutes] the streaming
+                                                                                    client socket timeout (in minutes)
+
+  --apiversion=apiversion                                                           override the api version used for
+                                                                                    api requests made by this command
+
+  --json                                                                            format output as json
+
+  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
+                                                                                    this command invocation
+
+DESCRIPTION
+  Creates a scratch org or a sandbox org using the values specified in a configuration file or key=value pairs that you
+  specify on the command line. Values specified on the command line override values in the configuration file. Specify a
+   configuration file or provide key=value pairs while creating a scratch org or a sandbox. When creating scratch orgs,
+  —targetdevhubusername (-v) must be a Dev Hub org. When creating sandboxes, the --targetusername (-u) must be a
+  production org with sandbox licenses. The —type (-t) is required if creating a sandbox.
+
+EXAMPLES
+  $ sfdx force:org:create -f config/enterprise-scratch-def.json -a MyScratchOrg
+  $ sfdx force:org:create edition=Developer -a MyScratchOrg -s -v devHub
+  $ sfdx force:org:create -f config/enterprise-scratch-def.json -a ScratchOrgWithOverrides
+  username=testuser1@mycompany.org
+  $ sfdx force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg
+```
+
+_See code: [src/commands/force/org/beta/create.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/beta/create.ts)_
+
+## `sfdx force:org:delete [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
+
+mark a scratch or sandbox org for deletion
 
 ```
+USAGE
+  $ sfdx force:org:delete [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
+  trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+
+OPTIONS
+  -p, --noprompt                                                                    no prompt to confirm deletion
+
+  -u, --targetusername=targetusername                                               username or alias for the target
+                                                                                    org; overrides default target org
+
+  -v, --targetdevhubusername=targetdevhubusername                                   username or alias for the dev hub
+                                                                                    org; overrides default dev hub org
+
+  --apiversion=apiversion                                                           override the api version used for
+                                                                                    api requests made by this command
+
+  --json                                                                            format output as json
+
+  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
+                                                                                    this command invocation
+
+DESCRIPTION
+  To mark the org for deletion without being prompted to confirm, specify --noprompt.
+
+EXAMPLES
+  $ sfdx force:org:delete -u me@my.org
+  $ sfdx force:org:delete -u MyOrgAlias -p
+```
+
+_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/delete.ts)_
+
+## `sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
+
 get the description for the current or target org
-Output includes your access token, client Id, connected status, org ID, instance URL, username, and alias, if applicable.
-Use --verbose to include the SFDX auth URL. WARNING: The SFDX auth URL contains sensitive information, such as a refresh token that can be used to access an org. Don't share or distribute this URL or token.
-Including --verbose displays the sfdxAuthUrl property only if you authenticated to the org using auth:web:login (not auth:jwt:grant)
 
+```
 USAGE
   $ sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
@@ -126,15 +226,13 @@ EXAMPLES
   sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json
 ```
 
-_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.9.2/src/commands/force/org/display.ts)_
+_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/display.ts)_
 
 ## `sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
 list all orgs you’ve created or authenticated to
 
 ```
-list all orgs you’ve created or authenticated to
-
 USAGE
   $ sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
@@ -164,19 +262,13 @@ EXAMPLES
   sfdx force:org:list --verbose --json > tmp/MyOrgList.json
 ```
 
-_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.9.2/src/commands/force/org/list.ts)_
+_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/list.ts)_
 
 ## `sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
 open your default scratch org, or another specified org
 
 ```
-open your default scratch org, or another specified org
-To open a specific page, specify the portion of the URL after "https://MyDomainName.my.salesforce.com/" as --path.
-For example, specify "--path lightning" to open Lightning Experience, or specify "--path /apex/YourPage" to open a Visualforce page.
-To generate a URL but not launch it in your browser, specify --urlonly.
-To open in a specific browser, use the --browser parameter. Supported browsers are "chrome", "edge", and "firefox". If you don't specify --browser, the org opens in your default browser.
-
 USAGE
   $ sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
@@ -205,7 +297,7 @@ DESCRIPTION
   Visualforce page.
   To generate a URL but not launch it in your browser, specify --urlonly.
   To open in a specific browser, use the --browser parameter. Supported browsers are "chrome", "edge", and "firefox". If
-  you don't specify --browser, the org opens in your default browser.
+   you don't specify --browser, the org opens in your default browser.
 
 EXAMPLES
   sfdx force:org:open
@@ -215,6 +307,6 @@ EXAMPLES
   sfdx force:org:open -u me@my.org -b firefox
 ```
 
-_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.9.2/src/commands/force/org/open.ts)_
+_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/open.ts)_
 
 <!-- commandsstop -->

package/lib/commands/force/org/beta/create.d.ts

@@ -0,0 +1,27 @@
+import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+import { AuthFields, SandboxProcessObject, ScratchOrgInfo } from '@salesforce/core';
+export interface ScratchOrgProcessObject {
+    username?: string;
+    scratchOrgInfo: ScratchOrgInfo;
+    authFields?: AuthFields;
+    warnings: string[];
+    orgId: string;
+}
+export declare class Create extends SfdxCommand {
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly supportsDevhubUsername = true;
+    static readonly supportsUsername = true;
+    static readonly varargs = true;
+    static readonly flagsConfig: FlagsConfig;
+    protected readonly lifecycleEventNames: string[];
+    private sandboxAuth?;
+    run(): Promise<SandboxProcessObject | ScratchOrgProcessObject>;
+    private validateSandboxFlags;
+    private lowerToUpper;
+    private createSandboxRequest;
+    private createSandbox;
+    private readJsonDefFile;
+    private setAliasAndDefaultUsername;
+    private createScratchOrg;
+}

package/lib/commands/force/org/beta/create.js

@@ -0,0 +1,310 @@
+"use strict";
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Create = void 0;
+const os = require("os");
+const fs = require("fs");
+const command_1 = require("@salesforce/command");
+const kit_1 = require("@salesforce/kit");
+const core_1 = require("@salesforce/core");
+const sandboxReporter_1 = require("../../../../shared/sandboxReporter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'create');
+class Create extends command_1.SfdxCommand {
+    constructor() {
+        super(...arguments);
+        this.lifecycleEventNames = ['postorgcreate'];
+    }
+    async run() {
+        this.logger.debug('Create started with args %s ', this.flags);
+        if (this.flags.type === core_1.OrgTypes.Sandbox) {
+            this.validateSandboxFlags();
+            return this.createSandbox();
+        }
+        else {
+            // default to scratch org
+            return this.createScratchOrg();
+        }
+    }
+    validateSandboxFlags() {
+        if (!this.flags.targetusername) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'requiresUsername');
+        }
+        if (this.flags.retry !== 0) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'retryIsNotValidForSandboxes');
+        }
+        if (this.flags.clientid) {
+            this.ux.warn(messages.getMessage('clientIdNotSupported', [this.flags.clientid]));
+        }
+        if (this.flags.nonamespace) {
+            this.ux.warn(messages.getMessage('noNamespaceNotSupported', [this.flags.nonamespace]));
+        }
+        if (this.flags.noancestors) {
+            this.ux.warn(messages.getMessage('noAncestorsNotSupported', [this.flags.noancestors]));
+        }
+        if (this.flags.durationdays) {
+            this.ux.warn(messages.getMessage('durationDaysNotSupported', [this.flags.durationdays]));
+        }
+    }
+    lowerToUpper(object) {
+        // the API has keys defined in capital camel case, while the definition schema has them as lower camel case
+        // we need to convert lower camel case to upper before merging options so they will override properly
+        Object.keys(object).map((key) => {
+            const upperCase = key.charAt(0).toUpperCase();
+            if (key.charAt(0) !== upperCase) {
+                const capitalKey = upperCase + key.slice(1);
+                object[capitalKey] = object[key];
+                delete object[key];
+            }
+        });
+        return object;
+    }
+    createSandboxRequest() {
+        this.logger.debug('Create Varargs: %s ', this.varargs);
+        let sandboxDefFileContents = this.readJsonDefFile();
+        let capitalizedVarArgs = {};
+        if (sandboxDefFileContents) {
+            sandboxDefFileContents = this.lowerToUpper(sandboxDefFileContents);
+        }
+        if (this.varargs) {
+            capitalizedVarArgs = this.lowerToUpper(this.varargs);
+        }
+        // varargs override file input
+        const sandboxReq = { SandboxName: undefined, ...sandboxDefFileContents, ...capitalizedVarArgs };
+        if (!sandboxReq.SandboxName) {
+            // sandbox names are 10 chars or less, a radix of 36 = [a-z][0-9]
+            // technically without querying the production org, the generated name could already exist, but the chances of that are lower than the perf penalty of querying and verifying
+            sandboxReq.SandboxName = `sbx${Date.now().toString(36).slice(-7)}`;
+            this.ux.warn(`No SandboxName defined, generating new SandboxName: ${sandboxReq.SandboxName}`);
+        }
+        if (!sandboxReq.LicenseType) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'missingLicenseType');
+        }
+        return sandboxReq;
+    }
+    async createSandbox() {
+        const prodOrg = await core_1.Org.create({ aliasOrUsername: this.flags.targetusername });
+        const lifecycle = core_1.Lifecycle.getInstance();
+        // register the sandbox event listeners before calling `prodOrg.createSandbox()`
+        // `on` doesn't support synchronous methods
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_ASYNC_RESULT, async (results) => {
+            this.ux.log(messages.getMessage('sandboxSuccess', [results.Id, results.SandboxName, this.flags.targetusername]));
+        });
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_STATUS, async (results) => {
+            this.ux.log(sandboxReporter_1.SandboxReporter.sandboxProgress(results));
+        });
+        // eslint-disable-next-line @typescript-eslint/require-await
+        lifecycle.on(core_1.SandboxEvents.EVENT_AUTH, async (results) => {
+            this.sandboxAuth = results;
+        });
+        lifecycle.on(core_1.SandboxEvents.EVENT_RESULT, async (results) => {
+            var _a;
+            const { sandboxReadyForUse, data } = sandboxReporter_1.SandboxReporter.logSandboxProcessResult(results);
+            this.ux.log(sandboxReadyForUse);
+            this.ux.styledHeader('Sandbox Org Creation Status');
+            this.ux.table(data, {
+                columns: [
+                    { key: 'key', label: 'Name' },
+                    { key: 'value', label: 'Value' },
+                ],
+            });
+            if ((_a = results.sandboxRes) === null || _a === void 0 ? void 0 : _a.authUserName) {
+                if (this.flags.setalias) {
+                    const alias = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+                    alias.set(this.flags.setalias, results.sandboxRes.authUserName);
+                    const result = await alias.write();
+                    this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+                }
+                if (this.flags.setdefaultusername) {
+                    const globalConfig = this.configAggregator.getGlobalConfig();
+                    globalConfig.set(core_1.Config.DEFAULT_USERNAME, results.sandboxRes.authUserName);
+                    const result = await globalConfig.write();
+                    this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+                }
+            }
+        });
+        const sandboxReq = this.createSandboxRequest();
+        this.logger.debug('Calling create with SandboxRequest: %s ', sandboxReq);
+        const wait = this.flags.wait;
+        try {
+            return prodOrg.createSandbox(sandboxReq, { wait });
+        }
+        catch (e) {
+            // guaranteed to be SfdxError from core;
+            const err = e;
+            if (err === null || err === void 0 ? void 0 : err.message.includes('The org cannot be found')) {
+                // there was most likely an issue with DNS when auth'ing to the new sandbox, but it was created.
+                if (this.flags.setalias && this.sandboxAuth) {
+                    const alias = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+                    alias.set(this.flags.setalias, this.sandboxAuth.authUserName);
+                    const result = await alias.write();
+                    this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+                }
+                if (this.flags.setdefaultusername && this.sandboxAuth) {
+                    const globalConfig = this.configAggregator.getGlobalConfig();
+                    globalConfig.set(core_1.Config.DEFAULT_USERNAME, this.sandboxAuth.authUserName);
+                    const result = await globalConfig.write();
+                    this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+                }
+                err.actions = [messages.getMessage('dnsTimeout'), messages.getMessage('partialSuccess')];
+                err.exitCode = 68;
+                throw err;
+            }
+        }
+    }
+    readJsonDefFile() {
+        // the -f option
+        if (this.flags.definitionfile) {
+            this.logger.debug('Reading JSON DefFile %s ', this.flags.definitionfile);
+            return JSON.parse(fs.readFileSync(this.flags.definitionfile, 'utf-8'));
+        }
+    }
+    async setAliasAndDefaultUsername(username) {
+        const aliases = await core_1.Aliases.create(core_1.Aliases.getDefaultOptions());
+        if (this.flags.setalias) {
+            await aliases.updateValue(this.flags.setalias, username);
+            this.logger.debug('Set Alias: %s result: %s', this.flags.setalias);
+        }
+        if (this.flags.setdefaultusername) {
+            let config;
+            try {
+                config = await core_1.Config.create({ isGlobal: false });
+            }
+            catch {
+                config = await core_1.Config.create({ isGlobal: true });
+            }
+            const value = aliases.getKeysByValue(username)[0] || username;
+            const result = config.set(core_1.Config.DEFAULT_USERNAME, value);
+            await config.write();
+            this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+        }
+    }
+    async createScratchOrg() {
+        this.logger.debug('OK, will do scratch org creation');
+        if (!this.hubOrg) {
+            throw core_1.SfdxError.create('@salesforce/plugin-org', 'create', 'RequiresDevhubUsernameError');
+        }
+        // Ensure we have an org config input source.
+        if (!this.flags.definitionfile && Object.keys(this.varargs).length === 0) {
+            throw new core_1.SfdxError(messages.getMessage('noConfig'));
+        }
+        this.logger.debug('validation complete');
+        let secret;
+        if (this.flags.clientid) {
+            // If the user supplied a specific client ID, we have no way of knowing if it's
+            // a certificate-based Connected App or not. Therefore, we have to assume that
+            // we'll need the client secret, so prompt the user for it.
+            secret = await this.ux.prompt(messages.getMessage('secretPrompt'), {
+                type: 'mask',
+            });
+        }
+        const createCommandOptions = {
+            connectedAppConsumerKey: this.flags.clientid,
+            durationDays: this.flags.durationdays,
+            nonamespace: this.flags.nonamespace,
+            noancestors: this.flags.noancestors,
+            wait: this.flags.wait,
+            retry: this.flags.retry,
+            apiversion: this.flags.apiversion,
+            definitionfile: this.flags.definitionfile,
+            orgConfig: this.varargs,
+            clientSecret: secret,
+        };
+        const { username, scratchOrgInfo, authFields, warnings } = await this.hubOrg.scratchOrgCreate(createCommandOptions);
+        await core_1.Lifecycle.getInstance().emit('scratchOrgInfo', scratchOrgInfo);
+        await this.setAliasAndDefaultUsername(username);
+        // emit postorgcreate event for hook
+        const postOrgCreateHookInfo = [authFields].map((element) => ({
+            accessToken: element.accessToken,
+            clientId: element.clientId,
+            created: element.created,
+            createdOrgInstance: element.createdOrgInstance,
+            devHubUsername: element.devHubUsername,
+            expirationDate: element.expirationDate,
+            instanceUrl: element.instanceUrl,
+            loginUrl: element.loginUrl,
+            orgId: element.orgId,
+            username: element.username,
+        }))[0];
+        await core_1.Lifecycle.getInstance().emit('postorgcreate', postOrgCreateHookInfo);
+        this.logger.debug(`orgConfig.loginUrl: ${authFields.loginUrl}`);
+        this.logger.debug(`orgConfig.instanceUrl: ${authFields.instanceUrl}`);
+        this.ux.log(messages.getMessage('scratchOrgCreateSuccess', [authFields.orgId, username]));
+        if (warnings.length > 0) {
+            warnings.forEach((warning) => {
+                this.ux.warn(warning);
+            });
+        }
+        return {
+            username,
+            scratchOrgInfo,
+            authFields,
+            warnings,
+            orgId: authFields.orgId,
+        };
+    }
+}
+exports.Create = Create;
+Create.description = messages.getMessage('description');
+Create.examples = messages.getMessage('examples').split(os.EOL);
+Create.supportsDevhubUsername = true;
+Create.supportsUsername = true;
+Create.varargs = true;
+Create.flagsConfig = {
+    type: command_1.flags.enum({
+        char: 't',
+        description: messages.getMessage('flags.type'),
+        options: [core_1.OrgTypes.Scratch, core_1.OrgTypes.Sandbox],
+        default: core_1.OrgTypes.Scratch,
+    }),
+    definitionfile: command_1.flags.filepath({
+        char: 'f',
+        description: messages.getMessage('flags.definitionFile'),
+    }),
+    nonamespace: command_1.flags.boolean({
+        char: 'n',
+        description: messages.getMessage('flags.noNamespace'),
+    }),
+    noancestors: command_1.flags.boolean({
+        char: 'c',
+        description: messages.getMessage('flags.noAncestors'),
+    }),
+    clientid: command_1.flags.string({
+        char: 'i',
+        description: messages.getMessage('flags.clientId'),
+    }),
+    setdefaultusername: command_1.flags.boolean({
+        char: 's',
+        description: messages.getMessage('flags.setDefaultUsername'),
+    }),
+    setalias: command_1.flags.string({
+        char: 'a',
+        description: messages.getMessage('flags.setAlias'),
+    }),
+    wait: command_1.flags.minutes({
+        char: 'w',
+        description: messages.getMessage('flags.wait'),
+        min: 6,
+        default: kit_1.Duration.minutes(6),
+    }),
+    durationdays: command_1.flags.integer({
+        char: 'd',
+        description: messages.getMessage('flags.durationDays'),
+        min: 1,
+        max: 30,
+    }),
+    retry: command_1.flags.number({
+        hidden: true,
+        default: 0,
+        max: 10,
+        description: messages.getMessage('flags.retry'),
+    }),
+};
+//# sourceMappingURL=create.js.map

package/lib/commands/force/org/beta/create.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/commands/force/org/beta/create.ts"],"names":[],"mappings":"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"}

package/lib/commands/force/org/delete.d.ts

@@ -0,0 +1,14 @@
+import { FlagsConfig, SfdxCommand } from '@salesforce/command';
+declare type DeleteResult = {
+    orgId: string;
+    username: string;
+};
+export declare class Delete extends SfdxCommand {
+    static readonly requiresUsername = true;
+    static readonly supportsDevhubUsername = true;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flagsConfig: FlagsConfig;
+    run(): Promise<DeleteResult>;
+}
+export {};

package/lib/commands/force/org/delete.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Delete = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const os = require("os");
+const command_1 = require("@salesforce/command");
+const core_1 = require("@salesforce/core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'delete');
+class Delete extends command_1.SfdxCommand {
+    async run() {
+        const username = this.org.getUsername();
+        const orgId = this.org.getOrgId();
+        const isSandbox = await this.org.isSandbox();
+        // read the config file for the org to be deleted, if it has a PROD_ORG_USERNAME entry, it's a sandbox
+        // we either need permission to proceed without a prompt OR get the user to confirm
+        if (this.flags.noprompt ||
+            (await this.ux.confirm(messages.getMessage('confirmDelete', [isSandbox ? 'sandbox' : 'scratch', username])))) {
+            let alreadyDeleted = false;
+            let successMessageKey = 'commandSandboxSuccess';
+            try {
+                // will determine if it's a scratch org or sandbox and will delete from the appropriate parent org (DevHub or Production)
+                await this.org.delete();
+            }
+            catch (e) {
+                if (e instanceof Error && e.name === 'ScratchOrgNotFound') {
+                    alreadyDeleted = true;
+                }
+                else if (e instanceof Error && e.name === 'SandboxNotFound') {
+                    successMessageKey = 'sandboxConfigOnlySuccess';
+                }
+                else {
+                    throw e;
+                }
+            }
+            this.ux.log(isSandbox
+                ? messages.getMessage(successMessageKey, [username])
+                : messages.getMessage(alreadyDeleted ? 'deleteOrgConfigOnlyCommandSuccess' : 'deleteOrgCommandSuccess', [
+                    username,
+                ]));
+        }
+        return { username, orgId };
+    }
+}
+exports.Delete = Delete;
+Delete.requiresUsername = true;
+Delete.supportsDevhubUsername = true;
+Delete.description = messages.getMessage('description');
+Delete.examples = messages.getMessage('examples').split(os.EOL);
+Delete.flagsConfig = {
+    noprompt: command_1.flags.boolean({
+        char: 'p',
+        description: messages.getMessage('flags.noprompt'),
+    }),
+};
+//# sourceMappingURL=delete.js.map

package/lib/commands/force/org/delete.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/force/org/delete.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAE5C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;AAO3E,MAAa,MAAO,SAAQ,qBAAW;IAY9B,KAAK,CAAC,GAAG;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC7C,sGAAsG;QACtG,mFAAmF;QACnF,IACE,IAAI,CAAC,KAAK,CAAC,QAAQ;YACnB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC5G;YACA,IAAI,cAAc,GAAG,KAAK,CAAC;YAC3B,IAAI,iBAAiB,GAAG,uBAAuB,CAAC;YAChD,IAAI;gBACF,yHAAyH;gBACzH,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aACzB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB,EAAE;oBACzD,cAAc,GAAG,IAAI,CAAC;iBACvB;qBAAM,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;oBAC7D,iBAAiB,GAAG,0BAA0B,CAAC;iBAChD;qBAAM;oBACL,MAAM,CAAC,CAAC;iBACT;aACF;YAED,IAAI,CAAC,EAAE,CAAC,GAAG,CACT,SAAS;gBACP,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACpD,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,yBAAyB,EAAE;oBACpG,QAAQ;iBACT,CAAC,CACP,CAAC;SACH;QACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;;AA9CH,wBA+CC;AA9CwB,uBAAgB,GAAG,IAAI,CAAC;AACxB,6BAAsB,GAAG,IAAI,CAAC;AAC9B,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,kBAAW,GAAgB;IAChD,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;KACnD,CAAC;CACH,CAAC"}

package/lib/shared/orgHooks.d.ts

@@ -0,0 +1,22 @@
+import * as Config from '@oclif/config';
+import { Optional } from '@salesforce/ts-types';
+import { AuthFields } from '@salesforce/core';
+declare type HookOpts<T> = {
+    Command: Config.Command.Class;
+    argv: string[];
+    commandId: string;
+    result: Optional<T>;
+};
+export declare type OrgCreateResult = Pick<AuthFields, 'accessToken' | 'clientId' | 'created' | 'createdOrgInstance' | 'devHubUsername' | 'expirationDate' | 'instanceUrl' | 'loginUrl' | 'orgId' | 'username'>;
+declare type PostOrgCreateOpts = HookOpts<OrgCreateResult>;
+/**
+ * Extends OCLIF's Hooks interface to add types for hooks that run on sfdx org commands
+ */
+export interface OrgHooks extends Config.Hooks {
+    postorgcreate: PostOrgCreateOpts;
+}
+export declare type OrgHook<T> = (this: Config.Hook.Context, options: T extends keyof Config.Hooks ? OrgHooks[T] : T) => any;
+export declare namespace OrgHook {
+    type PostOrgCreate = Config.Hook<OrgHooks['postorgcreate']>;
+}
+export {};

package/lib/shared/orgHooks.js

@@ -0,0 +1,9 @@
+"use strict";
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=orgHooks.js.map

package/lib/shared/orgHooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"orgHooks.js","sourceRoot":"","sources":["../../src/shared/orgHooks.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}

package/lib/shared/orgListUtil.js

@@ -263,7 +263,7 @@ class OrgListUtil {
                 const logger = await OrgListUtil.retrieveLogger();
                 logger.trace(`error refreshing auth for org: ${org.getUsername()}`);
                 logger.trace(error);
-                return (_a = error.code) !== null && _a !== void 0 ? _a : error.message;
+                return ((_a = error.code) !== null && _a !== void 0 ? _a : error.message);
             }
         }
         catch (err) {
@@ -271,7 +271,7 @@ class OrgListUtil {
             const logger = await OrgListUtil.retrieveLogger();
             logger.trace(`error refreshing auth for org: ${username}`);
             logger.trace(error);
-            return (_c = (_b = error.code) !== null && _b !== void 0 ? _b : error.message) !== null && _c !== void 0 ? _c : 'Unknown';
+            return ((_c = (_b = error.code) !== null && _b !== void 0 ? _b : error.message) !== null && _c !== void 0 ? _c : 'Unknown');
         }
     }
 }

package/lib/shared/orgListUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}

package/lib/shared/sandboxReporter.d.ts

@@ -0,0 +1,12 @@
+import { StatusEvent, ResultEvent } from '@salesforce/core';
+export declare class SandboxReporter {
+    static sandboxProgress(update: StatusEvent): string;
+    static logSandboxProcessResult(result: ResultEvent): {
+        sandboxReadyForUse: string;
+        data: Array<{
+            key: string;
+            value: string | number;
+        }>;
+    };
+    private static getSecondsToHuman;
+}

package/lib/shared/sandboxReporter.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SandboxReporter = void 0;
+const kit_1 = require("@salesforce/kit");
+class SandboxReporter {
+    static sandboxProgress(update) {
+        const { retries, interval, sandboxProcessObj, waitingOnAuth } = update;
+        const waitTimeInSec = retries * interval;
+        const waitTime = SandboxReporter.getSecondsToHuman(waitTimeInSec);
+        const waitTimeMsg = `Sleeping ${interval} seconds. Will wait ${waitTime} more before timing out.`;
+        const sandboxIdentifierMsg = `${sandboxProcessObj.SandboxName}(${sandboxProcessObj.Id})`;
+        const waitingOnAuthMessage = waitingOnAuth ? ', waiting on JWT auth' : '';
+        const completionMessage = `(${sandboxProcessObj.CopyProgress}% completed${waitingOnAuthMessage})`;
+        return `Sandbox request ${sandboxIdentifierMsg} is ${sandboxProcessObj.Status} ${completionMessage}. ${waitTimeMsg}`;
+    }
+    static logSandboxProcessResult(result
+    // sandboxProcessObj.CopyProgress is a number
+    ) {
+        const { sandboxProcessObj, sandboxRes } = result;
+        const sandboxReadyForUse = `Sandbox ${sandboxProcessObj.SandboxName}(${sandboxProcessObj.Id}) is ready for use.`;
+        const data = [
+            { key: 'Id', value: sandboxProcessObj.Id },
+            { key: 'SandboxName', value: sandboxProcessObj.SandboxName },
+            { key: 'Status', value: sandboxProcessObj.Status },
+            { key: 'CopyProgress', value: sandboxProcessObj.CopyProgress },
+            { key: 'Description', value: sandboxProcessObj.Description },
+            { key: 'LicenseType', value: sandboxProcessObj.LicenseType },
+            { key: 'SandboxInfoId', value: sandboxProcessObj.SandboxInfoId },
+            { key: 'SourceId', value: sandboxProcessObj.SourceId },
+            { key: 'SandboxOrg', value: sandboxProcessObj.SandboxOrganization },
+            { key: 'Created Date', value: sandboxProcessObj.CreatedDate },
+            { key: 'ApexClassId', value: sandboxProcessObj.ApexClassId },
+            { key: 'Authorized Sandbox Username', value: sandboxRes.authUserName },
+        ];
+        return { sandboxReadyForUse, data };
+    }
+    static getSecondsToHuman(waitTimeInSec) {
+        const hours = kit_1.Duration.hours(Math.floor(waitTimeInSec / 3600));
+        const minutes = kit_1.Duration.minutes(Math.floor((waitTimeInSec % 3600) / 60));
+        const seconds = kit_1.Duration.seconds(Math.floor(waitTimeInSec % 60));
+        const hDisplay = hours.hours > 0 ? hours.toString() + ' ' : '';
+        const mDisplay = minutes.minutes > 0 ? minutes.toString() + ' ' : '';
+        const sDisplay = seconds.seconds > 0 ? seconds.toString() : '';
+        return (hDisplay + mDisplay + sDisplay).trim();
+    }
+}
+exports.SandboxReporter = SandboxReporter;
+//# sourceMappingURL=sandboxReporter.js.map

package/lib/shared/sandboxReporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sandboxReporter.js","sourceRoot":"","sources":["../../src/shared/sandboxReporter.ts"],"names":[],"mappings":"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"}

package/messages/create.json

@@ -0,0 +1,37 @@
+{
+  "description": "create a scratch or sandbox org \nCreates a scratch org or a sandbox org using the values specified in a configuration file or key=value pairs that you specify on the command line. Values specified on the command line override values in the configuration file. Specify a configuration file or provide key=value pairs while creating a scratch org or a sandbox. When creating scratch orgs, —targetdevhubusername (-v) must be a Dev Hub org. When creating sandboxes, the --targetusername (-u) must be a production org with sandbox licenses. The —type (-t) is required if creating a sandbox.\n\n",
+  "examples": [
+    "$ sfdx force:org:create -f config/enterprise-scratch-def.json -a MyScratchOrg",
+    "$ sfdx force:org:create edition=Developer -a MyScratchOrg -s -v devHub",
+    "$ sfdx force:org:create -f config/enterprise-scratch-def.json -a ScratchOrgWithOverrides username=testuser1@mycompany.org",
+    "$ sfdx force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg"
+  ],
+  "flags": {
+    "clientId": "connected app consumer key; not supported for sandbox org creation",
+    "setDefaultUsername": "set the created org as the default username",
+    "setAlias": "alias for the created org",
+    "definitionFile": "path to an org definition file",
+    "definitionJson": "org definition in JSON format",
+    "noNamespace": "create the scratch org with no namespace",
+    "noAncestors": "do not include second-generation package ancestors in the scratch org",
+    "env": "environment where the scratch org is created: %s",
+    "type": "type of org to create",
+    "durationDays": "duration of the scratch org (in days) (default:7, min:1, max:30)",
+    "retry": "Number of scratch org auth retries after scratch org is successfully signed up.",
+    "wait": "the streaming client socket timeout (in minutes)"
+  },
+  "scratchOrgCreateSuccess": "Successfully created scratch org: %s, username: %s.",
+  "clientIdNotSupported": "-i | --clientid is not supported for the sandbox org create command. Its value, %s, has been ignored.",
+  "noNamespaceNotSupported": "-n | --nonamespace is not supported for the sandbox org create command. Its value, %s, has been ignored.",
+  "noAncestorsNotSupported": "-c | --noancestors is not supported for the sandbox org create command. Its value, %s, has been ignored.",
+  "durationDaysNotSupported": "-d | --durationdays is not supported for the sandbox org create command. Its value, %s, has been ignored.",
+  "retryIsNotValidForSandboxes": "One cannot use flag retry with Sandbox org create.",
+  "sandboxSuccess": "The sandbox org creation process %s is in progress. Run \"sfdx force:org:status -n %s -u %s\" to check for status. If the org is ready, checking the status also authorizes the org for use with Salesforce CLI.",
+  "requiresUsername": "This command requires a username. Specify it with the -u parameter or with the \"sfdx config:set defaultusername=<username>\" command.",
+  "missingLicenseType": "The sandbox license type is required, but you didn't provide a value.  Specify the license type in the sandbox definition file with the \"licenseType\" option, or specify the option as a name-value pair at the command-line.  See https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_sandbox_definition.htm for more information.",
+  "dnsTimeout": "The sandbox was successfully created and authenticated. However, the sandbox DNS records aren't ready yet and so the sandbox may not be available. Run \"force:org:list\" and check if the sandbox is listed correctly. If it isn't listed, run \"force:org:status\" to view its status and, if necessary, authenticate to it again. If this issue happens frequently, try setting the SFDX_DNS_TIMEOUT environment variable to a larger number; the default value is 3 seconds.",
+  "partialSuccess": "If you specified the -a or -s parameters, but the sandbox wasn't immediately available, the \"force:org:create\" command may not have finished setting the alias or defaultusername. If so, set the alias manually with \"sfdx alias:set\"  and the defaultusername with \"sfdx config:set\".",
+  "noConfig": "Please specify an org configuration via file and/or key=value pairs.",
+  "RequiresDevhubUsernameError": "This command requires a dev hub org username set either with a flag or by default in the config.",
+  "secretPrompt": "OAuth client secret of personal connected app?"
+}

package/messages/delete.json

@@ -0,0 +1,13 @@
+{
+  "description": "mark a scratch or sandbox org for deletion \nTo mark the org for deletion without being prompted to confirm, specify --noprompt.",
+  "examples": ["$ sfdx force:org:delete -u me@my.org", "$ sfdx force:org:delete -u MyOrgAlias -p"],
+  "flags": {
+    "noprompt": "no prompt to confirm deletion"
+  },
+  "confirmDelete": "Enqueue %s org with name: %s for deletion?  Are you sure (y/n)?",
+  "sandboxConfigOnlySuccess": "Successfully deleted sandbox org %s.",
+  "ScratchOrgNotFound": "Attempting to delete an expired or deleted org",
+  "deleteOrgConfigOnlyCommandSuccess": "Successfully deleted scratch org %s.'",
+  "deleteOrgCommandSuccess": "Successfully marked scratch org %s for deletion",
+  "commandSandboxSuccess": "The sandbox org %s has been successfully removed from your list of CLI authorized orgs.  If you created the sandbox with one of the force:org commands, it has also been marked for deletion."
+}

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.10.0","commands":{"force:org:display":{"id":"force:org:display","description":"get the description for the current or target org\nOutput includes your access token, client Id, connected status, org ID, instance URL, username, and alias, if applicable.\nUse --verbose to include the SFDX auth URL. WARNING: The SFDX auth URL contains sensitive information, such as a refresh token that can be used to access an org. Don't share or distribute this URL or token.\nIncluding --verbose displays the sfdxAuthUrl property only if you authenticated to the org using auth:web:login (not auth:jwt:grant)","usage":"<%= command.id %> [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:display","sfdx force:org:display -u me@my.org","sfdx force:org:display -u TestOrg1 --json","sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"verbose":{"name":"verbose","type":"boolean","description":"emit additional command output to stdout","allowNo":false}},"args":[]},"force:org:list":{"id":"force:org:list","description":"list all orgs you’ve created or authenticated to","usage":"<%= command.id %> [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:list","sfdx force:org:list --verbose --json","sfdx force:org:list --verbose --json > tmp/MyOrgList.json"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"verbose":{"name":"verbose","type":"boolean","description":"list more information about each org","allowNo":false},"all":{"name":"all","type":"boolean","description":"include expired, deleted, and unknown-status scratch orgs","allowNo":false},"clean":{"name":"clean","type":"boolean","description":"remove all local org authorizations for non-active orgs","allowNo":false},"noprompt":{"name":"noprompt","type":"boolean","char":"p","description":"do not prompt for confirmation","allowNo":false},"skipconnectionstatus":{"name":"skipconnectionstatus","type":"boolean","description":"skip retrieving the connection status of non-scratch orgs","allowNo":false}},"args":[]},"force:org:open":{"id":"force:org:open","description":"open your default scratch org, or another specified org\nTo open a specific page, specify the portion of the URL after \"https://MyDomainName.my.salesforce.com/\" as --path.\nFor example, specify \"--path lightning\" to open Lightning Experience, or specify \"--path /apex/YourPage\" to open a Visualforce page.\nTo generate a URL but not launch it in your browser, specify --urlonly.\nTo open in a specific browser, use the --browser parameter. Supported browsers are \"chrome\", \"edge\", and \"firefox\". If you don't specify --browser, the org opens in your default browser.","usage":"<%= command.id %> [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:open","sfdx force:org:open -u me@my.org","sfdx force:org:open -u MyTestOrg1","sfdx force:org:open -r -p lightning","sfdx force:org:open -u me@my.org -b firefox"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"browser":{"name":"browser","type":"option","char":"b","description":"browser where the org opens","options":["chrome","edge","firefox"]},"path":{"name":"path","type":"option","char":"p","description":"navigation URL path"},"urlonly":{"name":"urlonly","type":"boolean","char":"r","description":"display navigation URL, but don’t launch browser","allowNo":false}},"args":[]}}}
+{"version":"1.11.2","commands":{"force:org:delete":{"id":"force:org:delete","description":"mark a scratch or sandbox org for deletion \nTo mark the org for deletion without being prompted to confirm, specify --noprompt.","usage":"<%= command.id %> [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["$ sfdx force:org:delete -u me@my.org","$ sfdx force:org:delete -u MyOrgAlias -p"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetdevhubusername":{"name":"targetdevhubusername","type":"option","char":"v","description":"username or alias for the dev hub org; overrides default dev hub org"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"noprompt":{"name":"noprompt","type":"boolean","char":"p","description":"no prompt to confirm deletion","allowNo":false}},"args":[]},"force:org:display":{"id":"force:org:display","description":"get the description for the current or target org\nOutput includes your access token, client Id, connected status, org ID, instance URL, username, and alias, if applicable.\nUse --verbose to include the SFDX auth URL. WARNING: The SFDX auth URL contains sensitive information, such as a refresh token that can be used to access an org. Don't share or distribute this URL or token.\nIncluding --verbose displays the sfdxAuthUrl property only if you authenticated to the org using auth:web:login (not auth:jwt:grant)","usage":"<%= command.id %> [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:display","sfdx force:org:display -u me@my.org","sfdx force:org:display -u TestOrg1 --json","sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"verbose":{"name":"verbose","type":"boolean","description":"emit additional command output to stdout","allowNo":false}},"args":[]},"force:org:list":{"id":"force:org:list","description":"list all orgs you’ve created or authenticated to","usage":"<%= command.id %> [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:list","sfdx force:org:list --verbose --json","sfdx force:org:list --verbose --json > tmp/MyOrgList.json"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"verbose":{"name":"verbose","type":"boolean","description":"list more information about each org","allowNo":false},"all":{"name":"all","type":"boolean","description":"include expired, deleted, and unknown-status scratch orgs","allowNo":false},"clean":{"name":"clean","type":"boolean","description":"remove all local org authorizations for non-active orgs","allowNo":false},"noprompt":{"name":"noprompt","type":"boolean","char":"p","description":"do not prompt for confirmation","allowNo":false},"skipconnectionstatus":{"name":"skipconnectionstatus","type":"boolean","description":"skip retrieving the connection status of non-scratch orgs","allowNo":false}},"args":[]},"force:org:open":{"id":"force:org:open","description":"open your default scratch org, or another specified org\nTo open a specific page, specify the portion of the URL after \"https://MyDomainName.my.salesforce.com/\" as --path.\nFor example, specify \"--path lightning\" to open Lightning Experience, or specify \"--path /apex/YourPage\" to open a Visualforce page.\nTo generate a URL but not launch it in your browser, specify --urlonly.\nTo open in a specific browser, use the --browser parameter. Supported browsers are \"chrome\", \"edge\", and \"firefox\". If you don't specify --browser, the org opens in your default browser.","usage":"<%= command.id %> [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["sfdx force:org:open","sfdx force:org:open -u me@my.org","sfdx force:org:open -u MyTestOrg1","sfdx force:org:open -r -p lightning","sfdx force:org:open -u me@my.org -b firefox"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"browser":{"name":"browser","type":"option","char":"b","description":"browser where the org opens","options":["chrome","edge","firefox"]},"path":{"name":"path","type":"option","char":"p","description":"navigation URL path"},"urlonly":{"name":"urlonly","type":"boolean","char":"r","description":"display navigation URL, but don’t launch browser","allowNo":false}},"args":[]},"force:org:beta:create":{"id":"force:org:beta:create","description":"create a scratch or sandbox org \nCreates a scratch org or a sandbox org using the values specified in a configuration file or key=value pairs that you specify on the command line. Values specified on the command line override values in the configuration file. Specify a configuration file or provide key=value pairs while creating a scratch org or a sandbox. When creating scratch orgs, —targetdevhubusername (-v) must be a Dev Hub org. When creating sandboxes, the --targetusername (-u) must be a production org with sandbox licenses. The —type (-t) is required if creating a sandbox.\n\n","usage":"<%= command.id %> [name=value...] [-t scratch|sandbox] [-f <filepath>] [-n] [-c] [-i <string>] [-s] [-a <string>] [-w <minutes>] [-d <integer>] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-org","pluginType":"core","aliases":[],"examples":["$ sfdx force:org:create -f config/enterprise-scratch-def.json -a MyScratchOrg","$ sfdx force:org:create edition=Developer -a MyScratchOrg -s -v devHub","$ sfdx force:org:create -f config/enterprise-scratch-def.json -a ScratchOrgWithOverrides username=testuser1@mycompany.org","$ sfdx force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetdevhubusername":{"name":"targetdevhubusername","type":"option","char":"v","description":"username or alias for the dev hub org; overrides default dev hub org"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"type":{"name":"type","type":"option","char":"t","description":"type of org to create","helpValue":"(scratch|sandbox)","options":["scratch","sandbox"],"default":"scratch"},"definitionfile":{"name":"definitionfile","type":"option","char":"f","description":"path to an org definition file"},"nonamespace":{"name":"nonamespace","type":"boolean","char":"n","description":"create the scratch org with no namespace","allowNo":false},"noancestors":{"name":"noancestors","type":"boolean","char":"c","description":"do not include second-generation package ancestors in the scratch org","allowNo":false},"clientid":{"name":"clientid","type":"option","char":"i","description":"connected app consumer key; not supported for sandbox org creation"},"setdefaultusername":{"name":"setdefaultusername","type":"boolean","char":"s","description":"set the created org as the default username","allowNo":false},"setalias":{"name":"setalias","type":"option","char":"a","description":"alias for the created org"},"wait":{"name":"wait","type":"option","char":"w","description":"the streaming client socket timeout (in minutes)","default":{"quantity":6,"unit":0}},"durationdays":{"name":"durationdays","type":"option","char":"d","description":"duration of the scratch org (in days) (default:7, min:1, max:30)"},"retry":{"name":"retry","type":"option","description":"Number of scratch org auth retries after scratch org is successfully signed up.","hidden":true,"default":0}},"args":[]}}}

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@salesforce/plugin-org",
     "description": "A template repository for sfdx plugins",
-    "version": "1.10.0",
+    "version": "1.11.2",
     "author": "Salesforce",
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
-        "@oclif/config": "^1.17.1",
-        "@salesforce/command": "^4.1.3",
-        "@salesforce/core": "^2.28.0",
+        "@oclif/config": "^1.18.1",
+        "@salesforce/command": "^4.2.2",
+        "@salesforce/core": "^2.35.0",
         "@salesforce/kit": "^1.5.17",
         "open": "8.4.0",
         "tslib": "^2"
@@ -15,12 +15,13 @@
     "devDependencies": {
         "@oclif/dev-cli": "^1",
         "@oclif/plugin-command-snapshot": "^2.2.2",
-        "@salesforce/cli-plugins-testkit": "^1.4.10",
-        "@salesforce/dev-config": "^2.1.2",
-        "@salesforce/dev-scripts": "^1.0.0",
+        "@salesforce/cli-plugins-testkit": "^1.5.3",
+        "@salesforce/dev-config": "^3.0.0",
+        "@salesforce/dev-scripts": "^2.0.0",
         "@salesforce/plugin-command-reference": "^1.3.0",
         "@salesforce/prettier-config": "^0.0.2",
         "@salesforce/ts-sinon": "1.3.21",
+        "@types/shelljs": "^0.8.10",
         "@typescript-eslint/eslint-plugin": "^4.33.0",
         "@typescript-eslint/parser": "^4.33.0",
         "chai": "^4.2.0",
@@ -32,20 +33,20 @@
         "eslint-config-salesforce-license": "^0.1.6",
         "eslint-config-salesforce-typescript": "^0.2.8",
         "eslint-plugin-header": "^3.0.0",
-        "eslint-plugin-import": "2.25.2",
+        "eslint-plugin-import": "2.25.4",
         "eslint-plugin-jsdoc": "^35.1.2",
         "eslint-plugin-prettier": "^3.1.3",
         "husky": "^7.0.4",
         "lint-staged": "^11.0.0",
-        "mocha": "^8.4.0",
+        "mocha": "^9.1.3",
         "moment": "^2.29.1",
         "nyc": "^15.1.0",
         "prettier": "^2.4.1",
         "pretty-quick": "^3.1.0",
-        "shx": "0.3.3",
+        "shx": "0.3.4",
         "sinon": "10.0.0",
         "ts-node": "^10.0.0",
-        "typescript": "^4.1.3"
+        "typescript": "^4.4.4"
     },
     "config": {
         "commitizen": {
@@ -108,13 +109,14 @@
         "test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
         "test:deprecation-policy": "./bin/run snapshot:compare",
         "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
+        "test:nuts:sandbox": "nyc mocha \"**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000",
         "version": "oclif-dev readme"
     },
     "publishConfig": {
         "access": "public"
     },
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/1.10.0.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/1.10.0.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/1.11.2.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/1.11.2.sig"
     }
 }