@salesforce/plugin-org 2.2.24 → 2.2.25

package/lib/commands/org/list.js

@@ -0,0 +1,192 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrgListCommand = void 0;
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const orgListUtil_1 = require("../../shared/orgListUtil");
+const orgHighlighter_1 = require("../../shared/orgHighlighter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'list');
+class OrgListCommand extends sf_plugins_core_1.SfCommand {
+    // eslint-disable-next-line sf-plugin/should-parse-flags
+    async run() {
+        const [{ flags }, fileNames] = await Promise.all([this.parse(OrgListCommand), getAuthFileNames()]);
+        this.flags = flags;
+        const metaConfigs = await orgListUtil_1.OrgListUtil.readLocallyValidatedMetaConfigsGroupedByOrgType(fileNames, flags);
+        const groupedSortedOrgs = {
+            nonScratchOrgs: metaConfigs.nonScratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
+            scratchOrgs: metaConfigs.scratchOrgs.map(decorateWithDefaultStatus).sort(comparator),
+            expiredScratchOrgs: metaConfigs.scratchOrgs.filter((org) => !(0, orgListUtil_1.identifyActiveOrgByStatus)(org)),
+        };
+        if (flags.clean && groupedSortedOrgs.expiredScratchOrgs.length > 0) {
+            await this.cleanScratchOrgs(groupedSortedOrgs.expiredScratchOrgs, !flags['no-prompt']);
+        }
+        if (groupedSortedOrgs.expiredScratchOrgs.length > 10 && !flags.clean) {
+            this.warn(messages.getMessage('deleteOrgs', [groupedSortedOrgs.expiredScratchOrgs.length]));
+        }
+        const result = {
+            nonScratchOrgs: groupedSortedOrgs.nonScratchOrgs,
+            scratchOrgs: flags.all
+                ? groupedSortedOrgs.scratchOrgs
+                : groupedSortedOrgs.scratchOrgs.filter(orgListUtil_1.identifyActiveOrgByStatus),
+        };
+        this.printOrgTable(result.nonScratchOrgs, flags['skip-connection-status']);
+        this.printScratchOrgTable(result.scratchOrgs);
+        return result;
+    }
+    async cleanScratchOrgs(scratchOrgs, prompt) {
+        if (prompt && (await this.confirm(messages.getMessage('prompt', [scratchOrgs.length]))) === false) {
+            return;
+        }
+        await Promise.all(scratchOrgs.map(async (fields) => {
+            try {
+                const authInfo = await core_1.AuthInfo.create({ username: fields.username });
+                const connection = await core_1.Connection.create({
+                    authInfo,
+                    configAggregator: {
+                        // Force an api version to prevent connection check with the server for expired orgs.
+                        getInfo: () => ({ value: '47.0' }),
+                    },
+                });
+                const org = await core_1.Org.create({ aliasOrUsername: fields.username, connection });
+                await org.remove();
+            }
+            catch (e) {
+                const err = e;
+                const logger = await core_1.Logger.child('org:list');
+                logger.debug(`Error cleaning org ${fields.username}: ${err.message}`);
+                this.warn(messages.getMessage('cleanWarning', [fields.username, fields.username]));
+            }
+        }));
+    }
+    printOrgTable(nonScratchOrgs, skipconnectionstatus) {
+        if (!nonScratchOrgs.length) {
+            this.log(messages.getMessage('noResultsFound'));
+        }
+        else {
+            const rows = nonScratchOrgs
+                .map((row) => (0, orgHighlighter_1.getStyledObject)(row))
+                .map((org) => Object.fromEntries(Object.entries(org).filter(([key]) => ['defaultMarker', 'alias', 'username', 'orgId', 'connectedStatus'].includes(key))));
+            this.table(rows, {
+                defaultMarker: {
+                    header: '',
+                    get: (data) => data.defaultMarker ?? '',
+                },
+                alias: {
+                    header: 'ALIAS',
+                    get: (data) => data.alias ?? '',
+                },
+                username: { header: 'USERNAME' },
+                orgId: { header: 'ORG ID' },
+                ...(!skipconnectionstatus ? { connectedStatus: { header: 'CONNECTED STATUS' } } : {}),
+            }, {
+                title: 'Non-scratch orgs',
+            });
+        }
+    }
+    printScratchOrgTable(scratchOrgs) {
+        if (scratchOrgs.length === 0) {
+            this.log(messages.getMessage('noActiveScratchOrgs'));
+        }
+        else {
+            // One or more rows are available.
+            // we only need a few of the props for our table.  Oclif table doesn't like extra props non-string props.
+            const rows = scratchOrgs
+                .map(orgHighlighter_1.getStyledObject)
+                .map((org) => Object.fromEntries(Object.entries(org).filter(([key]) => [
+                'defaultMarker',
+                'alias',
+                'username',
+                'orgId',
+                'status',
+                'expirationDate',
+                'devHubOrgId',
+                'createdDate',
+                'instanceUrl',
+            ].includes(key))));
+            this.table(rows, {
+                defaultMarker: {
+                    header: '',
+                    get: (data) => data.defaultMarker ?? '',
+                },
+                alias: {
+                    header: 'ALIAS',
+                    get: (data) => data.alias ?? '',
+                },
+                username: { header: 'USERNAME' },
+                orgId: { header: 'ORG ID' },
+                ...(this.flags.all || this.flags.verbose ? { status: { header: 'STATUS' } } : {}),
+                ...(this.flags.verbose
+                    ? {
+                        devHubOrgId: { header: 'DEV HUB' },
+                        createdDate: { header: 'CREATED DATE' },
+                        instanceUrl: { header: 'INSTANCE URL' },
+                    }
+                    : {}),
+                expirationDate: { header: 'EXPIRATION DATE' },
+            }, {
+                title: 'Scratch orgs',
+            });
+        }
+    }
+}
+exports.OrgListCommand = OrgListCommand;
+OrgListCommand.summary = messages.getMessage('summary');
+OrgListCommand.examples = messages.getMessages('examples');
+OrgListCommand.aliases = ['force:org:list'];
+OrgListCommand.deprecateAliases = true;
+OrgListCommand.flags = {
+    verbose: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.verbose.summary'),
+    }),
+    all: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.all.summary'),
+    }),
+    clean: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.clean.summary'),
+    }),
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
+        char: 'p',
+        summary: messages.getMessage('flags.noPrompt.summary'),
+        dependsOn: ['clean'],
+        aliases: ['noprompt'],
+        deprecateAliases: true,
+    }),
+    'skip-connection-status': sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.skipConnectionStatus.summary'),
+        aliases: ['skipconnectionstatus'],
+        deprecateAliases: true,
+    }),
+    loglevel: sf_plugins_core_1.loglevel,
+};
+const decorateWithDefaultStatus = (val) => ({
+    ...val,
+    ...(val.isDefaultDevHubUsername ? { defaultMarker: '(D)' } : {}),
+    ...(val.isDefaultUsername ? { defaultMarker: '(U)' } : {}),
+});
+// sort by alias then username
+const comparator = (a, b) => {
+    const aliasCompareResult = (a.alias ?? '').localeCompare(b.alias ?? '');
+    return aliasCompareResult !== 0 ? aliasCompareResult : (a.username ?? '').localeCompare(b.username);
+};
+const getAuthFileNames = async () => {
+    try {
+        return ((await core_1.AuthInfo.listAllAuthorizations()) ?? []).map((auth) => auth.username);
+    }
+    catch (err) {
+        const error = err;
+        if (error.name === 'NoAuthInfoFound') {
+            throw new core_1.SfError(messages.getMessage('noOrgsFound'), 'noOrgsFound', [messages.getMessage('noOrgsFoundAction')]);
+        }
+        else {
+            throw error;
+        }
+    }
+};
+//# sourceMappingURL=list.js.map

package/lib/commands/org/list.js.map

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

package/lib/commands/org/open.d.ts

@@ -0,0 +1,25 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Org } from '@salesforce/core';
+export declare class OrgOpenCommand extends SfCommand<OrgOpenOutput> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly aliases: string[];
+    static depreprecateAliases: boolean;
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<Org>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        browser: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        path: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'url-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    private org;
+    run(): Promise<OrgOpenOutput>;
+    private buildFrontdoorUrl;
+}
+export interface OrgOpenOutput {
+    url: string;
+    username: string;
+    orgId: string;
+}

package/lib/commands/{force/org → org}/open.js

@@ -1,71 +1,78 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrgOpenCommand = 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_1 = require("os");
-const command_1 = require("@salesforce/command");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrgOpenCommand = void 0;
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const open = require("open");
-const utils_1 = require("../../../shared/utils");
+const utils_1 = require("../../shared/utils");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'open');
 const sharedMessages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'messages');
-class OrgOpenCommand extends command_1.SfdxCommand {
+class OrgOpenCommand extends sf_plugins_core_1.SfCommand {
     async run() {
-        const frontDoorUrl = await this.buildFrontdoorUrl();
-        const url = this.flags.path ? `${frontDoorUrl}&retURL=${this.flags.path}` : frontDoorUrl;
+        const { flags } = await this.parse(OrgOpenCommand);
+        this.org = flags['target-org'];
+        const frontDoorUrl = await this.buildFrontdoorUrl(flags['api-version']);
+        const url = flags.path ? `${frontDoorUrl}&retURL=${flags.path}` : frontDoorUrl;
         const orgId = this.org.getOrgId();
+        // TODO: better typings in sfdx-core for orgs read from auth files
         const username = this.org.getUsername();
         const output = { orgId, url, username };
         const containerMode = new kit_1.Env().getBoolean('SFDX_CONTAINER_MODE');
         // security warning only for --json OR --urlonly OR containerMode
-        if (this.flags.urlonly || this.flags.json || containerMode) {
-            this.ux.warn(sharedMessages.getMessage('SecurityWarning'));
-            this.ux.log('');
+        if (flags['url-only'] || flags.json || containerMode) {
+            this.warn(sharedMessages.getMessage('SecurityWarning'));
+            this.log('');
         }
         if (containerMode) {
             // instruct the user that they need to paste the URL into the browser
-            this.ux.styledHeader('Action Required!');
-            this.ux.log(messages.getMessage('containerAction', [orgId, url]));
+            this.styledHeader('Action Required!');
+            this.log(messages.getMessage('containerAction', [orgId, url]));
             return output;
         }
-        if (this.flags.urlonly) {
+        if (flags['url-only']) {
             // this includes the URL
-            this.ux.log(messages.getMessage('humanSuccess', [orgId, username, url]));
+            this.logSuccess(messages.getMessage('humanSuccess', [orgId, username, url]));
             return output;
         }
-        this.ux.log(messages.getMessage('humanSuccessNoUrl', [orgId, username]));
+        this.logSuccess(messages.getMessage('humanSuccessNoUrl', [orgId, username]));
         // we actually need to open the org
         try {
-            this.ux.startSpinner(messages.getMessage('domainWaiting'));
+            this.spinner.start(messages.getMessage('domainWaiting'));
             const sfdcUrl = new core_1.SfdcUrl(url);
             await sfdcUrl.checkLightningDomain();
+            this.spinner.stop();
         }
         catch (err) {
             if (err instanceof Error) {
-                if (err.message?.includes('timeout')) {
-                    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)[1]}.lightning.force.com`;
+                if (err.message.includes('timeout')) {
+                    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.[1]}.lightning.force.com`;
                     const timeout = new kit_1.Duration(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240), kit_1.Duration.Unit.SECONDS);
-                    this.logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
+                    const logger = await core_1.Logger.child(this.constructor.name);
+                    logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
                     throw new core_1.SfError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError');
                 }
                 throw core_1.SfError.wrap(err);
             }
             throw err;
         }
-        const openOptions = typeof this.flags.browser === 'string' ? { app: { name: open.apps[this.flags.browser] } } : {};
+        const openOptions = flags.browser
+            ? // assertion can be removed once oclif option flag typings are fixed
+                { app: { name: open.apps[flags.browser] } }
+            : {};
         await (0, utils_1.openUrl)(url, openOptions);
         return output;
     }
-    async buildFrontdoorUrl() {
+    async buildFrontdoorUrl(version) {
         await this.org.refreshAuth(); // we need a live accessToken for the frontdoor url
-        const conn = this.org.getConnection();
+        const conn = this.org.getConnection(version);
         const accessToken = conn.accessToken;
         const instanceUrl = this.org.getField(core_1.Org.Fields.INSTANCE_URL);
         const instanceUrlClean = instanceUrl.replace(/\/$/, '');
@@ -73,25 +80,32 @@ class OrgOpenCommand extends command_1.SfdxCommand {
     }
 }
 exports.OrgOpenCommand = OrgOpenCommand;
+OrgOpenCommand.summary = messages.getMessage('summary');
 OrgOpenCommand.description = messages.getMessage('description');
-OrgOpenCommand.examples = messages.getMessage('examples').split(os_1.EOL);
-OrgOpenCommand.requiresUsername = true;
-OrgOpenCommand.flagsConfig = {
-    browser: command_1.flags.string({
+OrgOpenCommand.examples = messages.getMessages('examples');
+OrgOpenCommand.aliases = ['force:org:open'];
+OrgOpenCommand.depreprecateAliases = true;
+OrgOpenCommand.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    browser: sf_plugins_core_1.Flags.string({
         char: 'b',
-        description: messages.getMessage('browser'),
+        summary: messages.getMessage('flags.browser.summary'),
         options: ['chrome', 'edge', 'firefox'],
-        exclusive: ['urlonly'],
+        exclusive: ['url-only'],
     }),
-    path: command_1.flags.string({
+    path: sf_plugins_core_1.Flags.string({
         char: 'p',
-        description: messages.getMessage('cliPath'),
+        summary: messages.getMessage('flags.path.summary'),
         env: 'FORCE_OPEN_URL',
         parse: (input) => Promise.resolve(encodeURIComponent(decodeURIComponent(input))),
     }),
-    urlonly: command_1.flags.boolean({
+    'url-only': sf_plugins_core_1.Flags.boolean({
         char: 'r',
-        description: messages.getMessage('urlonly'),
+        summary: messages.getMessage('flags.url-only.summary'),
+        aliases: ['urlonly'],
+        deprecateAliases: true,
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=open.js.map

package/lib/commands/org/open.js.map

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

package/lib/commands/org/resume/sandbox.d.ts

@@ -0,0 +1,26 @@
+import { Org, SandboxProcessObject } from '@salesforce/core';
+import { Duration } from '@salesforce/kit';
+import * as Interfaces from '@oclif/core/lib/interfaces';
+import { SandboxCommandBase } from '../../../shared/sandboxCommandBase';
+export default class ResumeSandbox extends SandboxCommandBase<SandboxProcessObject> {
+    static summary: string;
+    static description: string;
+    static examples: string[];
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
+    static flags: {
+        wait: Interfaces.OptionFlag<Duration | undefined>;
+        name: Interfaces.OptionFlag<string | undefined>;
+        'job-id': Interfaces.OptionFlag<string | undefined>;
+        'use-most-recent': Interfaces.BooleanFlag<boolean>;
+        'target-org': Interfaces.OptionFlag<Org | undefined>;
+    };
+    static readonly state = "beta";
+    private flags;
+    run(): Promise<SandboxProcessObject>;
+    protected getCheckSandboxStatusParams(): string[];
+    private createResumeSandboxRequest;
+    private resumeSandbox;
+    private buildSandboxRequestCacheEntry;
+    private verifyIfAuthExists;
+}

package/lib/commands/org/resume/sandbox.js

@@ -0,0 +1,199 @@
+"use strict";
+/*
+ * Copyright (c) 2022, 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 });
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const kit_1 = require("@salesforce/kit");
+const sandboxCommandBase_1 = require("../../../shared/sandboxCommandBase");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'resume.sandbox');
+class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
+    async run() {
+        this.sandboxRequestConfig = await this.getSandboxRequestConfig();
+        this.flags = (await this.parse(ResumeSandbox)).flags;
+        this.debug('Resume started with args %s ', this.flags);
+        return this.resumeSandbox();
+    }
+    getCheckSandboxStatusParams() {
+        return [
+            this.config.bin,
+            ...(this.latestSandboxProgressObj ? [this.latestSandboxProgressObj.Id] : []),
+            ...(this.flags['target-org']?.getUsername() ? [this.flags['target-org'].getUsername()] : []),
+        ];
+    }
+    createResumeSandboxRequest() {
+        if (this.flags['use-most-recent'] && this.sandboxRequestConfig) {
+            const latestEntry = this.sandboxRequestConfig.getLatestEntry();
+            if (latestEntry) {
+                const [, sandboxRequestData] = latestEntry;
+                if (sandboxRequestData) {
+                    return { SandboxName: sandboxRequestData.sandboxProcessObject?.SandboxName };
+                }
+            }
+        }
+        // build resume sandbox request from data provided
+        return {
+            ...Object.assign({}, this.flags.name ? { SandboxName: this.flags.name } : {}),
+            ...Object.assign({}, this.flags['job-id'] ? { SandboxProcessObjId: this.flags['job-id'] } : {}),
+        };
+    }
+    async resumeSandbox() {
+        this.sandboxRequestData = this.buildSandboxRequestCacheEntry();
+        const prodOrgUsername = this.sandboxRequestData.prodOrgUsername;
+        if (!this.sandboxRequestData.sandboxProcessObject.SandboxName) {
+            if (!this.flags['name'] && !this.flags['job-id']) {
+                throw messages.createError('error.NoSandboxNameOrJobId');
+            }
+        }
+        this.prodOrg = await core_1.Org.create({ aliasOrUsername: prodOrgUsername });
+        this.flags['target-org'] = this.prodOrg;
+        const lifecycle = core_1.Lifecycle.getInstance();
+        this.registerLifecycleListeners(lifecycle, {
+            isAsync: false,
+            alias: this.sandboxRequestData.alias,
+            setDefault: this.sandboxRequestData.setDefault,
+            prodOrg: this.prodOrg,
+            tracksSource: this.sandboxRequestData.tracksSource,
+        });
+        if (this.latestSandboxProgressObj &&
+            (await this.verifyIfAuthExists({
+                prodOrg: this.prodOrg,
+                sandboxName: this.sandboxRequestData.sandboxProcessObject.SandboxName,
+                jobId: this.flags['job-id'],
+                lifecycle,
+            }))) {
+            return this.latestSandboxProgressObj;
+        }
+        const sandboxReq = this.createResumeSandboxRequest();
+        if (this.flags.wait?.seconds && this.flags.wait.seconds > 0) {
+            this.spinner.start('Resume Create');
+        }
+        this.debug('Calling create with ResumeSandboxRequest: %s ', sandboxReq);
+        try {
+            return await this.prodOrg.resumeSandbox(sandboxReq, {
+                wait: this.flags.wait ?? kit_1.Duration.seconds(0),
+                interval: kit_1.Duration.seconds(30),
+            });
+        }
+        catch (err) {
+            this.spinner.stop();
+            if (this.latestSandboxProgressObj && this.pollingTimeOut) {
+                void lifecycle.emit(core_1.SandboxEvents.EVENT_ASYNC_RESULT, undefined);
+                process.exitCode = 68;
+                return this.latestSandboxProgressObj;
+            }
+            else if (this.latestSandboxProgressObj &&
+                err instanceof core_1.SfError &&
+                err.name === 'SandboxCreateNotCompleteError') {
+                process.exitCode = 68;
+                return this.latestSandboxProgressObj;
+            }
+            throw err;
+        }
+    }
+    buildSandboxRequestCacheEntry() {
+        let sandboxRequestCacheEntry;
+        if (this.sandboxRequestConfig && this.flags['use-most-recent']) {
+            const latest = this.sandboxRequestConfig.getLatestEntry();
+            const [name, entry] = latest ?? [undefined, undefined];
+            if (!name) {
+                throw messages.createError('error.LatestSandboxRequestNotFound');
+            }
+            sandboxRequestCacheEntry = entry;
+        }
+        else if (this.sandboxRequestConfig && this.flags.name) {
+            sandboxRequestCacheEntry = this.sandboxRequestConfig.get(this.flags.name) || sandboxRequestCacheEntry;
+        }
+        else if (this.flags['job-id'] && this.sandboxRequestConfig) {
+            const entries = this.sandboxRequestConfig.entries();
+            const sce = entries.find(([, e]) => e?.sandboxProcessObject?.Id === this.flags['job-id'])?.[1];
+            sandboxRequestCacheEntry = sce;
+        }
+        return {
+            ...(sandboxRequestCacheEntry ?? {
+                sandboxProcessObject: { SandboxName: this.flags.name },
+                sandboxRequest: {},
+                setDefault: false,
+            }),
+            prodOrgUsername: sandboxRequestCacheEntry?.prodOrgUsername ?? this.flags['target-org']?.getUsername(),
+        };
+    }
+    async verifyIfAuthExists({ prodOrg, sandboxName, jobId, lifecycle, }) {
+        const sandboxProcessObject = await getSandboxProcessObject(prodOrg, sandboxName, jobId);
+        const sandboxUsername = `${prodOrg.getUsername()}.${sandboxProcessObject.SandboxName}`;
+        const exists = await (await core_1.StateAggregator.getInstance()).orgs.exists(sandboxUsername);
+        if (exists) {
+            this.latestSandboxProgressObj = sandboxProcessObject;
+            const resultEvent = {
+                sandboxProcessObj: this.latestSandboxProgressObj,
+                sandboxRes: { authUserName: sandboxUsername },
+            };
+            await lifecycle.emit(core_1.SandboxEvents.EVENT_RESULT, resultEvent);
+            return true;
+        }
+        return false;
+    }
+}
+exports.default = ResumeSandbox;
+ResumeSandbox.summary = messages.getMessage('summary');
+ResumeSandbox.description = messages.getMessage('description');
+ResumeSandbox.examples = messages.getMessages('examples');
+ResumeSandbox.aliases = ['env:resume:sandbox'];
+ResumeSandbox.deprecateAliases = true;
+ResumeSandbox.flags = {
+    wait: sf_plugins_core_1.Flags.duration({
+        char: 'w',
+        summary: messages.getMessage('flags.wait.summary'),
+        description: messages.getMessage('flags.wait.description'),
+        min: 0,
+        unit: 'minutes',
+        helpValue: '<minutes>',
+        defaultValue: 0,
+    }),
+    name: sf_plugins_core_1.Flags.string({
+        char: 'n',
+        summary: messages.getMessage('flags.name.summary'),
+        parse: (name) => {
+            if (name.length > 10) {
+                throw messages.createError('error.SandboxNameLength', [name]);
+            }
+            return Promise.resolve(name);
+        },
+        exclusive: ['job-id'],
+    }),
+    'job-id': sf_plugins_core_1.Flags.salesforceId({
+        startsWith: '0GR',
+        char: 'i',
+        summary: messages.getMessage('flags.id.summary'),
+        description: messages.getMessage('flags.id.description'),
+        exclusive: ['name'],
+    }),
+    'use-most-recent': sf_plugins_core_1.Flags.boolean({
+        char: 'l',
+        summary: messages.getMessage('flags.use-most-recent.summary'),
+    }),
+    'target-org': sf_plugins_core_1.Flags.optionalOrg({
+        char: 'o',
+        summary: messages.getMessage('flags.targetOrg.summary'),
+        description: messages.getMessage('flags.targetOrg.description'),
+    }),
+};
+ResumeSandbox.state = 'beta';
+const getSandboxProcessObject = async (prodOrg, sandboxName, jobId) => {
+    const where = sandboxName ? `SandboxName='${sandboxName}'` : `Id='${jobId}'`;
+    const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} AND Status != 'D'`;
+    try {
+        return await prodOrg.getConnection().singleRecordQuery(queryStr, {
+            tooling: true,
+        });
+    }
+    catch (err) {
+        throw messages.createError('error.NoSandboxRequestFound');
+    }
+};
+//# sourceMappingURL=sandbox.js.map

package/lib/commands/org/resume/sandbox.js.map

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

package/lib/commands/org/resume/scratch.d.ts

@@ -0,0 +1,14 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { ScratchCreateResponse } from '../../../shared/orgTypes';
+export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
+    static readonly flags: {
+        'job-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'use-most-recent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<ScratchCreateResponse>;
+}