@salesforce/plugin-org 2.2.24 → 2.3.0

package/README.md

@@ -74,6 +74,10 @@ sfdx plugins:link .
 sfdx plugins
 ```
 
+### Sandbox NUTs
+
+Sandboxes are pretty slow, and there's a constraint to how many we can have. So if your changes might impact sandboxes, and you want to check those in the real world, run the [SandboxNuts](https://github.com/salesforcecli/plugin-org/actions/workflows/sandboxNuts.yml) Github Action.
+
 ## Commands
 
 <!-- commands -->

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

@@ -1,13 +1,25 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
-export declare class OrgCloneCommand extends SfdxCommand {
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { SandboxProcessObject } from '@salesforce/core';
+export declare class OrgCloneCommand extends SfCommand<SandboxProcessObject> {
     static readonly examples: string[];
+    static readonly summary: string;
     static readonly description: string;
-    static readonly requiresProject = false;
-    static readonly requiresUsername = true;
-    static readonly varargs = true;
+    static readonly strict = false;
+    static state: string;
+    static deprecationOptions: {
+        to: string;
+        version: string;
+    };
     static readonly SANDBOXDEF_SRC_SANDBOXNAME = "SourceSandboxName";
-    static readonly flagsConfig: FlagsConfig;
-    run(): Promise<unknown>;
-    private createSandboxRequest;
-    private readJsonDefFile;
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        type: import("@oclif/core/lib/interfaces").OptionFlag<"sandbox", import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        definitionfile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        setdefaultusername: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        setalias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<SandboxProcessObject>;
 }

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

@@ -7,129 +7,98 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgCloneCommand = void 0;
-const os_1 = require("os");
-const fs = require("fs");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
-const kit_1 = require("@salesforce/kit");
-const utils_1 = require("../../../shared/utils");
+const sandboxRequest_1 = require("../../../shared/sandboxRequest");
 const sandboxReporter_1 = require("../../../shared/sandboxReporter");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-org', 'clone');
-class OrgCloneCommand extends command_1.SfdxCommand {
+class OrgCloneCommand extends sf_plugins_core_1.SfCommand {
     async run() {
+        const { flags, args, argv } = await this.parse(OrgCloneCommand);
+        const logger = await core_1.Logger.child(this.constructor.name);
+        const varargs = (0, sf_plugins_core_1.parseVarArgs)(args, argv);
         const lifecycle = core_1.Lifecycle.getInstance();
-        if (this.flags.type === core_1.OrgTypes.Sandbox) {
-            // eslint-disable-next-line @typescript-eslint/require-await
-            lifecycle.on(core_1.SandboxEvents.EVENT_ASYNC_RESULT, async (results) => {
-                // Keep all console output in the command
-                this.ux.log(messages.getMessage('commandSuccess', [results.Id, results.SandboxName]));
-            });
-            // 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));
-            });
+        if (flags.type === core_1.OrgTypes.Sandbox) {
+            lifecycle.on(core_1.SandboxEvents.EVENT_ASYNC_RESULT, async (results) => 
+            // Keep all console output in the command
+            Promise.resolve(this.log(messages.getMessage('commandSuccess', [results.Id, results.SandboxName]))));
+            lifecycle.on(core_1.SandboxEvents.EVENT_STATUS, async (results) => Promise.resolve(this.log(sandboxReporter_1.SandboxReporter.sandboxProgress(results))));
             lifecycle.on(core_1.SandboxEvents.EVENT_RESULT, async (results) => {
                 const { sandboxReadyForUse, data } = sandboxReporter_1.SandboxReporter.logSandboxProcessResult(results);
-                this.ux.log(sandboxReadyForUse);
-                this.ux.styledHeader('Sandbox Org Cloning Status');
-                this.ux.table(data, {
+                this.log(sandboxReadyForUse);
+                this.styledHeader('Sandbox Org Cloning Status');
+                this.table(data, {
                     key: { header: 'Name' },
                     value: { header: 'Value' },
                 });
                 if (results?.sandboxRes?.authUserName) {
-                    if (this.flags.setalias) {
+                    if (flags.setalias) {
                         const stateAggregator = await core_1.StateAggregator.getInstance();
-                        stateAggregator.aliases.set(this.flags.setalias, results.sandboxRes.authUserName);
+                        stateAggregator.aliases.set(flags.setalias, results.sandboxRes.authUserName);
                         const result = stateAggregator.aliases.getAll();
-                        this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+                        logger.debug('Set Alias: %s result: %s', flags.setalias, result);
                     }
-                    if (this.flags.setdefaultusername) {
+                    if (flags.setdefaultusername) {
                         const globalConfig = this.configAggregator.getGlobalConfig();
                         globalConfig.set(core_1.OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
                         const result = await globalConfig.write();
-                        this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
+                        logger.debug('Set defaultUsername: %s result: %s', flags.setdefaultusername, result);
                     }
                 }
             });
-            const { sandboxReq, srcSandboxName } = this.createSandboxRequest();
-            this.logger.debug('Calling clone with SandboxRequest: %s and SandboxName: %s ', sandboxReq, srcSandboxName);
-            const wait = this.flags.wait;
-            return this.org.cloneSandbox(sandboxReq, srcSandboxName, { wait });
+            const { sandboxReq, srcSandboxName } = await (0, sandboxRequest_1.createSandboxRequest)(true, flags.definitionfile, logger, varargs);
+            logger.debug('Calling clone with SandboxRequest: %s and SandboxName: %s ', sandboxReq, srcSandboxName);
+            flags['target-org'].getConnection(flags['api-version']);
+            return flags['target-org'].cloneSandbox(sandboxReq, srcSandboxName, { wait: flags.wait });
         }
         else {
             throw new core_1.SfError(messages.getMessage('commandOrganizationTypeNotSupport', [core_1.OrgTypes.Sandbox]), messages.getMessage('commandOrganizationTypeNotSupportAction', [core_1.OrgTypes.Sandbox]));
         }
     }
-    createSandboxRequest() {
-        this.logger.debug('Clone started with args %s ', this.flags);
-        this.logger.debug('Clone Varargs: %s ', this.varargs);
-        let sandboxDefFileContents = this.readJsonDefFile();
-        let capitalizedVarArgs = {};
-        if (sandboxDefFileContents) {
-            sandboxDefFileContents = (0, utils_1.lowerToUpper)(sandboxDefFileContents);
-        }
-        if (this.varargs) {
-            capitalizedVarArgs = (0, utils_1.lowerToUpper)(this.varargs);
-        }
-        // varargs override file input
-        const sandboxReq = { SandboxName: undefined, ...sandboxDefFileContents, ...capitalizedVarArgs };
-        this.logger.debug('SandboxRequest after merging DefFile and Varargs: %s ', sandboxReq);
-        // try to find the source sandbox name either from the definition file or the commandline arg
-        // NOTE the name and the case "SourceSandboxName" must match exactly
-        const srcSandboxName = sandboxReq[OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME];
-        if (srcSandboxName) {
-            // we have to delete this property from the sandboxRequest object,
-            // because sandboxRequest object represent the POST request to create SandboxInfo bpo,
-            // sandboxInfo does not have a column named  SourceSandboxName, this field will be converted to sourceId in the clone call below
-            delete sandboxReq[OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME];
-        }
-        else {
-            // error - we need SourceSandboxName to know which sandbox to clone from
-            throw new core_1.SfError(messages.getMessage('missingSourceSandboxName', [OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME]), messages.getMessage('missingSourceSandboxNameAction', [OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME]));
-        }
-        return { sandboxReq, srcSandboxName };
-    }
-    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'));
-        }
-    }
 }
 exports.OrgCloneCommand = OrgCloneCommand;
-OrgCloneCommand.examples = messages.getMessage('examples').split(os_1.EOL);
+OrgCloneCommand.examples = messages.getMessages('examples');
+OrgCloneCommand.summary = messages.getMessage('summary');
 OrgCloneCommand.description = messages.getMessage('description');
-OrgCloneCommand.requiresProject = false;
-OrgCloneCommand.requiresUsername = true;
-OrgCloneCommand.varargs = true;
+OrgCloneCommand.strict = false;
+OrgCloneCommand.state = 'deprecated';
+OrgCloneCommand.deprecationOptions = {
+    to: 'org:create:sandbox',
+    version: '60.0',
+};
 OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME = 'SourceSandboxName';
-OrgCloneCommand.flagsConfig = {
-    type: command_1.flags.enum({
+OrgCloneCommand.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    type: sf_plugins_core_1.Flags.custom({
+        options: ['sandbox'],
+    })({
         char: 't',
-        description: messages.getMessage('flags.type'),
+        summary: messages.getMessage('flags.type'),
         required: true,
-        options: ['sandbox'],
     }),
-    definitionfile: command_1.flags.filepath({
+    definitionfile: sf_plugins_core_1.Flags.file({
         char: 'f',
-        description: messages.getMessage('flags.definitionfile'),
+        exists: true,
+        summary: messages.getMessage('flags.definitionfile'),
     }),
-    setdefaultusername: command_1.flags.boolean({
+    setdefaultusername: sf_plugins_core_1.Flags.boolean({
         char: 's',
-        description: messages.getMessage('flags.setdefaultusername'),
+        summary: messages.getMessage('flags.setdefaultusername'),
     }),
-    setalias: command_1.flags.string({
+    setalias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        description: messages.getMessage('flags.setalias'),
+        summary: messages.getMessage('flags.setalias'),
     }),
-    wait: command_1.flags.minutes({
+    wait: sf_plugins_core_1.Flags.duration({
+        unit: 'minutes',
         char: 'w',
-        description: messages.getMessage('flags.wait'),
-        longDescription: messages.getMessage('flagsLong.wait'),
-        min: kit_1.Duration.minutes(2),
-        default: kit_1.Duration.minutes(6),
+        summary: messages.getMessage('flags.wait'),
+        description: messages.getMessage('flagsLong.wait'),
+        min: 2,
+        defaultValue: 6,
     }),
+    loglevel: sf_plugins_core_1.loglevel,
 };
 //# sourceMappingURL=clone.js.map

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

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

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

@@ -1,5 +1,6 @@
-import { FlagsConfig, SfdxCommand } from '@salesforce/command';
-import { AuthFields, SandboxProcessObject, ScratchOrgInfo } from '@salesforce/core';
+import { Interfaces } from '@oclif/core';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { AuthFields, OrgTypes, SandboxProcessObject, ScratchOrgInfo } from '@salesforce/core';
 export interface ScratchOrgProcessObject {
     username?: string;
     scratchOrgInfo: ScratchOrgInfo;
@@ -7,20 +8,34 @@ export interface ScratchOrgProcessObject {
     warnings: string[];
     orgId: string;
 }
-export declare class Create extends SfdxCommand {
+export type CreateResult = ScratchOrgProcessObject | SandboxProcessObject;
+export declare class Create extends SfCommand<CreateResult> {
+    static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
-    static readonly supportsDevhubUsername = true;
-    static readonly supportsUsername = true;
-    static readonly varargs = true;
-    static readonly aliases: string[];
-    static readonly flagsConfig: FlagsConfig;
-    protected readonly lifecycleEventNames: string[];
+    static readonly strict = false;
+    static readonly flags: {
+        'target-org': Interfaces.OptionFlag<import("@salesforce/core").Org | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'target-dev-hub': Interfaces.OptionFlag<import("@salesforce/core").Org | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        type: Interfaces.OptionFlag<OrgTypes, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        definitionfile: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        nonamespace: Interfaces.BooleanFlag<boolean>;
+        noancestors: Interfaces.BooleanFlag<boolean>;
+        clientid: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        setdefaultusername: Interfaces.BooleanFlag<boolean>;
+        setalias: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        wait: Interfaces.OptionFlag<import("@salesforce/kit").Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        durationdays: Interfaces.OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        retry: Interfaces.OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     private sandboxAuth?;
-    run(): Promise<SandboxProcessObject | ScratchOrgProcessObject>;
+    private logger;
+    private varArgs;
+    private flags;
+    run(): Promise<CreateResult>;
     private validateSandboxFlags;
-    private createSandboxRequest;
     private createSandbox;
-    private readJsonDefFile;
     private createScratchOrg;
 }

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

@@ -7,23 +7,24 @@
  */
 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 sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
-const utils_1 = require("../../../shared/utils");
+const sandboxRequest_1 = require("../../../shared/sandboxRequest");
 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 {
+class Create extends sf_plugins_core_1.SfCommand {
     constructor() {
         super(...arguments);
-        this.lifecycleEventNames = ['postorgcreate'];
+        this.varArgs = {};
     }
     async run() {
-        this.logger.debug('Create started with args %s ', this.flags);
-        if (this.flags.type === core_1.OrgTypes.Sandbox) {
+        const { flags, args, argv } = await this.parse(Create);
+        this.flags = flags;
+        this.varArgs = (0, sf_plugins_core_1.parseVarArgs)(args, argv);
+        this.logger = await core_1.Logger.child(this.constructor.name);
+        this.logger.debug('Create started with args %s ', flags);
+        if (flags.type === core_1.OrgTypes.Sandbox) {
             this.validateSandboxFlags();
             return this.createSandbox();
         }
@@ -33,70 +34,40 @@ class Create extends command_1.SfdxCommand {
         }
     }
     validateSandboxFlags() {
-        if (!this.flags.targetusername) {
-            throw new core_1.SfError(messages.getMessage('requiresUsername'));
-        }
         if (this.flags.retry !== 0) {
             throw new core_1.SfError(messages.getMessage('retryIsNotValidForSandboxes'), 'retryIsNotValidForSandboxes');
         }
         if (this.flags.clientid) {
-            this.ux.warn(messages.getMessage('clientIdNotSupported', [this.flags.clientid]));
+            this.warn(messages.getMessage('clientIdNotSupported', [this.flags.clientid]));
         }
         if (this.flags.nonamespace) {
-            this.ux.warn(messages.getMessage('noNamespaceNotSupported', [this.flags.nonamespace]));
+            this.warn(messages.getMessage('noNamespaceNotSupported', [this.flags.nonamespace]));
         }
         if (this.flags.noancestors) {
-            this.ux.warn(messages.getMessage('noAncestorsNotSupported', [this.flags.noancestors]));
+            this.warn(messages.getMessage('noAncestorsNotSupported', [this.flags.noancestors]));
         }
         if (this.flags.durationdays) {
-            this.ux.warn(messages.getMessage('durationDaysNotSupported', [this.flags.durationdays]));
+            this.warn(messages.getMessage('durationDaysNotSupported', [this.flags.durationdays]));
         }
     }
-    createSandboxRequest() {
-        this.logger.debug('Create Varargs: %s ', this.varargs);
-        let sandboxDefFileContents = this.readJsonDefFile();
-        let capitalizedVarArgs = {};
-        if (sandboxDefFileContents) {
-            sandboxDefFileContents = (0, utils_1.lowerToUpper)(sandboxDefFileContents);
-        }
-        if (this.varargs) {
-            capitalizedVarArgs = (0, utils_1.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 new core_1.SfError(messages.getMessage('missingLicenseType'));
-        }
-        return sandboxReq;
-    }
     async createSandbox() {
-        const prodOrg = await core_1.Org.create({ aliasOrUsername: this.flags.targetusername });
+        if (!this.flags['target-org']) {
+            throw new core_1.SfError(messages.getMessage('requiresUsername'));
+        }
         const lifecycle = core_1.Lifecycle.getInstance();
+        const username = this.flags['target-org'].getUsername();
         // 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_ASYNC_RESULT, async (results) => Promise.resolve(this.log(messages.getMessage('sandboxSuccess', [results.Id, results.SandboxName, username]))));
+        lifecycle.on(core_1.SandboxEvents.EVENT_STATUS, async (results) => Promise.resolve(this.log(sandboxReporter_1.SandboxReporter.sandboxProgress(results))));
         lifecycle.on(core_1.SandboxEvents.EVENT_AUTH, async (results) => {
             this.sandboxAuth = results;
+            return Promise.resolve();
         });
         lifecycle.on(core_1.SandboxEvents.EVENT_RESULT, async (results) => {
             const { sandboxReadyForUse, data } = sandboxReporter_1.SandboxReporter.logSandboxProcessResult(results);
-            this.ux.log(sandboxReadyForUse);
-            this.ux.styledHeader('Sandbox Org Creation Status');
-            this.ux.table(data, {
+            this.log(sandboxReadyForUse);
+            this.styledHeader('Sandbox Org Creation Status');
+            this.table(data, {
                 key: { header: 'Name' },
                 value: { header: 'Value' },
             });
@@ -115,11 +86,11 @@ class Create extends command_1.SfdxCommand {
                 }
             }
         });
-        const sandboxReq = this.createSandboxRequest();
+        const { sandboxReq } = await (0, sandboxRequest_1.createSandboxRequest)(false, this.flags.definitionfile, this.logger, this.varArgs);
         this.logger.debug('Calling create with SandboxRequest: %s ', sandboxReq);
         const wait = this.flags.wait;
         try {
-            return await prodOrg.createSandbox(sandboxReq, { wait });
+            return await this.flags['target-org'].createSandbox(sandboxReq, { wait });
         }
         catch (e) {
             // guaranteed to be SfdxError from core;
@@ -144,31 +115,24 @@ class Create extends command_1.SfdxCommand {
             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 createScratchOrg() {
         this.logger.debug('OK, will do scratch org creation');
-        if (!this.hubOrg) {
+        if (!this.flags['target-dev-hub']) {
             throw new core_1.SfError(messages.getMessage('RequiresDevhubUsernameError'));
         }
         // Ensure we have an org config input source.
-        if (!this.flags.definitionfile && Object.keys(this.varargs).length === 0) {
+        if (!this.flags.definitionfile && Object.keys(this.varArgs).length === 0) {
             throw new core_1.SfError(messages.getMessage('noConfig'));
         }
         this.logger.debug('validation complete');
         // 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.
-        const secret = this.flags.clientid
-            ? await this.ux.prompt(messages.getMessage('secretPrompt'), {
-                type: 'mask',
-            })
-            : undefined;
+        const { clientSecret } = this.flags.clientid
+            ? await this.prompt([
+                { name: 'clientSecret', type: 'mask', message: messages.getMessage('secretPrompt') },
+            ])
+            : { clientSecret: undefined };
         const createCommandOptions = {
             connectedAppConsumerKey: this.flags.clientid,
             durationDays: this.flags.durationdays,
@@ -176,22 +140,28 @@ class Create extends command_1.SfdxCommand {
             noancestors: this.flags.noancestors,
             wait: this.flags.wait,
             retry: this.flags.retry,
-            apiversion: this.flags.apiversion,
+            apiversion: this.flags['api-version'],
             definitionfile: this.flags.definitionfile,
-            orgConfig: this.varargs,
-            clientSecret: secret,
+            orgConfig: this.varArgs,
+            clientSecret,
             setDefault: this.flags.setdefaultusername === true,
             alias: this.flags.setalias,
             tracksSource: true,
         };
-        const { username, scratchOrgInfo, authFields, warnings } = await this.hubOrg.scratchOrgCreate(createCommandOptions);
+        const { username, scratchOrgInfo, authFields, warnings } = await this.flags['target-dev-hub'].scratchOrgCreate(createCommandOptions);
+        if (!scratchOrgInfo) {
+            throw new core_1.SfError('No scratch org info returned from scratchOrgCreate');
+        }
+        if (!authFields || !authFields.orgId) {
+            throw new core_1.SfError('Information missing from authFields');
+        }
         await core_1.Lifecycle.getInstance().emit('scratchOrgInfo', scratchOrgInfo);
-        this.logger.debug(`orgConfig.loginUrl: ${authFields.loginUrl}`);
-        this.logger.debug(`orgConfig.instanceUrl: ${authFields.instanceUrl}`);
-        this.ux.log(messages.getMessage('scratchOrgCreateSuccess', [authFields.orgId, username]));
+        this.logger.debug(`orgConfig.loginUrl: ${authFields?.loginUrl}`);
+        this.logger.debug(`orgConfig.instanceUrl: ${authFields?.instanceUrl}`);
+        this.log(messages.getMessage('scratchOrgCreateSuccess', [authFields?.orgId, username]));
         if (warnings.length > 0) {
             warnings.forEach((warning) => {
-                this.ux.warn(warning);
+                this.warn(warning);
             });
         }
         return {
@@ -199,66 +169,77 @@ class Create extends command_1.SfdxCommand {
             scratchOrgInfo,
             authFields,
             warnings,
-            orgId: authFields.orgId,
+            orgId: authFields?.orgId,
         };
     }
 }
 exports.Create = Create;
+Create.summary = messages.getMessage('summary');
 Create.description = messages.getMessage('description');
-Create.examples = messages.getMessage('examples').split(os.EOL);
-Create.supportsDevhubUsername = true;
-Create.supportsUsername = true;
-Create.varargs = true;
-Create.aliases = ['force:org:beta:create'];
-Create.flagsConfig = {
-    type: command_1.flags.enum({
-        char: 't',
-        description: messages.getMessage('flags.type'),
+Create.examples = messages.getMessages('examples');
+// waiting for oclif bug fix around missing config.id.
+// public static state = 'deprecated';
+// public static deprecationOptions = {
+//   message: messages.getMessage('deprecation'),
+// };
+// needed to allow varargs
+Create.strict = false;
+Create.flags = {
+    'target-org': sf_plugins_core_1.optionalOrgFlagWithDeprecations,
+    'target-dev-hub': sf_plugins_core_1.optionalHubFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    type: sf_plugins_core_1.Flags.custom({
         options: [core_1.OrgTypes.Scratch, core_1.OrgTypes.Sandbox],
+    })({
+        char: 't',
+        summary: messages.getMessage('flags.type'),
         default: core_1.OrgTypes.Scratch,
     }),
-    definitionfile: command_1.flags.filepath({
+    definitionfile: sf_plugins_core_1.Flags.file({
+        exists: true,
         char: 'f',
-        description: messages.getMessage('flags.definitionFile'),
+        summary: messages.getMessage('flags.definitionFile'),
     }),
-    nonamespace: command_1.flags.boolean({
+    nonamespace: sf_plugins_core_1.Flags.boolean({
         char: 'n',
-        description: messages.getMessage('flags.noNamespace'),
+        summary: messages.getMessage('flags.noNamespace'),
     }),
-    noancestors: command_1.flags.boolean({
+    noancestors: sf_plugins_core_1.Flags.boolean({
         char: 'c',
-        description: messages.getMessage('flags.noAncestors'),
+        summary: messages.getMessage('flags.noAncestors'),
     }),
-    clientid: command_1.flags.string({
+    clientid: sf_plugins_core_1.Flags.string({
         char: 'i',
-        description: messages.getMessage('flags.clientId'),
+        summary: messages.getMessage('flags.clientId'),
     }),
-    setdefaultusername: command_1.flags.boolean({
+    setdefaultusername: sf_plugins_core_1.Flags.boolean({
         char: 's',
-        description: messages.getMessage('flags.setDefaultUsername'),
+        summary: messages.getMessage('flags.setDefaultUsername'),
     }),
-    setalias: command_1.flags.string({
+    setalias: sf_plugins_core_1.Flags.string({
         char: 'a',
-        description: messages.getMessage('flags.setAlias'),
+        summary: messages.getMessage('flags.setAlias'),
     }),
-    wait: command_1.flags.minutes({
+    wait: sf_plugins_core_1.Flags.duration({
+        unit: 'minutes',
         char: 'w',
-        description: messages.getMessage('flags.wait'),
+        summary: messages.getMessage('flags.wait'),
         min: 6,
-        default: kit_1.Duration.minutes(6),
+        defaultValue: 6,
     }),
-    durationdays: command_1.flags.integer({
+    durationdays: sf_plugins_core_1.Flags.integer({
         char: 'd',
-        description: messages.getMessage('flags.durationDays'),
+        summary: messages.getMessage('flags.durationDays'),
         min: 1,
         max: 30,
         default: 7,
     }),
-    retry: command_1.flags.number({
+    retry: sf_plugins_core_1.Flags.integer({
         hidden: true,
         default: 0,
         max: 10,
-        description: messages.getMessage('flags.retry'),
+        summary: messages.getMessage('flags.retry'),
     }),
 };
 //# sourceMappingURL=create.js.map