Merge pull request #591 from salesforcecli/phale/W-12587837

fix: license-type should not be needed when cloning a sandbox

Author: WillieRuemmele

package.json

@@ -14,7 +14,7 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^3.3.4",
+    "@oclif/plugin-command-snapshot": "^3.3.6",
     "@salesforce/cli-plugins-testkit": "^3.2.23",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.1.1",
@@ -115,7 +115,7 @@
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",
-    "test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
+    "test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000",
     "test:nuts:legacy": "nyc mocha \"./test/nut/legacy/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
     "test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel --jobs 10",
     "test:only": "wireit",

src/commands/org/create/sandbox.ts

@@ -136,10 +136,14 @@ export default class CreateSandbox extends SandboxCommandBase<SandboxProcessObje
 
   private async createSandboxRequest(): Promise<SandboxRequest> {
     // reuse the existing sandbox request generator, with this command's flags as the varargs
-    const { sandboxReq } = await createSandboxRequest(false, this.flags['definition-file'], undefined, {
+    const requestOptions = {
       ...(this.flags.name ? { SandboxName: this.flags.name } : {}),
+      ...(this.flags.clone ? { SourceSandboxName: this.flags.clone } : {}),
       ...(!this.flags.clone && this.flags['license-type'] ? { LicenseType: this.flags['license-type'] } : {}),
-    });
+    };
+    const { sandboxReq } = !this.flags.clone
+      ? await createSandboxRequest(false, this.flags['definition-file'], undefined, requestOptions)
+      : await createSandboxRequest(true, this.flags['definition-file'], undefined, requestOptions);
     return {
       ...sandboxReq,
       ...(this.flags.clone ? { SourceId: await this.getSourceId() } : {}),

src/commands/org/list.ts

@@ -51,7 +51,6 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
 
   private flags!: Interfaces.InferredFlags<typeof OrgListCommand.flags>;
 
-  // eslint-disable-next-line sf-plugin/should-parse-flags
   public async run(): Promise<OrgListResult> {
     const [{ flags }, fileNames] = await Promise.all([this.parse(OrgListCommand), getAuthFileNames()]);
     this.flags = flags;

src/commands/org/resume/scratch.ts

@@ -30,6 +30,7 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
   public static readonly flags = {
     'job-id': Flags.salesforceId({
       char: 'i',
+      length: 'both',
       summary: messages.getMessage('flags.job-id.summary'),
       description: messages.getMessage('flags.job-id.description'),
       exactlyOne: ['use-most-recent', 'job-id'],

test/nut/listAndDisplay.nut.ts

@@ -6,6 +6,7 @@
  */
 
 import { join } from 'path';
+import * as os from 'os';
 import { expect, config, assert } from 'chai';
 import { TestSession } from '@salesforce/cli-plugins-testkit';
 import { execCmd } from '@salesforce/cli-plugins-testkit';
@@ -91,7 +92,7 @@ describe('Org Command NUT', () => {
 
   describe('List Orgs', () => {
     it('should list all orgs', () => {
-      const listResult = execCmd<OrgListResult>('force:org:list --json', { ensureExitCode: 0 }).jsonOutput?.result;
+      const listResult = execCmd<OrgListResult>('org:list --json', { ensureExitCode: 0 }).jsonOutput?.result;
       assert(listResult);
       expect(listResult).to.have.property('nonScratchOrgs');
       expect(listResult.nonScratchOrgs).to.have.length(1);
@@ -121,8 +122,8 @@ describe('Org Command NUT', () => {
         JSON.stringify(listResult.nonScratchOrgs[0])
       );
     });
-    it('should list orgs - skipconnectionstatus', () => {
-      const listResult = execCmd<OrgListResult>('force:org:list --skipconnectionstatus --json', { ensureExitCode: 0 })
+    it('should list orgs - skip-connection-status', () => {
+      const listResult = execCmd<OrgListResult>('org:list --skip-connection-status --json', { ensureExitCode: 0 })
         .jsonOutput?.result;
       assert(listResult);
       const nonScratchOrgs = listResult.nonScratchOrgs[0];
@@ -136,25 +137,25 @@ describe('Org Command NUT', () => {
       );
     });
     it('should list orgs in a human readable form', () => {
-      const lines = execCmd('force:org:list', { ensureExitCode: 0 }).shellOutput.stdout.split('\n');
+      const lines = execCmd('org:list', { ensureExitCode: 0 }).shellOutput.stdout.split(os.EOL);
       verifyHumanResults(lines, defaultUsername, aliasedUsername);
     });
     it('should list additional information with --verbose', () => {
-      const lines = execCmd('force:org:list --verbose', { ensureExitCode: 0 }).shellOutput.stdout.split('\n');
+      const lines = execCmd('org:list --verbose', { ensureExitCode: 0 }).shellOutput.stdout.split(os.EOL);
       verifyHumanResults(lines, defaultUsername, aliasedUsername, true);
     });
   });
   describe('Org Display', () => {
     it('should display org information for default username', () => {
-      const result = execCmd<OrgListResult>('force:org:display --json', { ensureExitCode: 0 }).jsonOutput?.result;
+      const result = execCmd<OrgListResult>('org:display --json', { ensureExitCode: 0 }).jsonOutput?.result;
       expect(result).to.be.ok;
       expect(result).to.include({
         devHubId: hubOrgUsername,
         username: defaultUsername,
       });
     });
     it('should display scratch org information for alias', () => {
-      const result = execCmd<OrgListResult>(`force:org:display -u ${aliasedUsername} --json`, { ensureExitCode: 0 })
+      const result = execCmd<OrgListResult>(`org:display -u ${aliasedUsername} --json`, { ensureExitCode: 0 })
         .jsonOutput?.result;
       expect(result).to.be.ok;
       expect(result).to.include({
@@ -163,16 +164,16 @@ describe('Org Command NUT', () => {
       });
     });
     it('should display human readable org information for default username', () => {
-      const lines = execCmd<OrgDisplayReturn>('force:org:display', { ensureExitCode: 0 }).shellOutput.stdout.split(
-        '\n'
-      );
+      const result = execCmd<OrgDisplayReturn>('org:display', { ensureExitCode: 0 }).shellOutput;
+      const stdout = result.stdout;
+      const lines = stdout.split(os.EOL);
       expect(lines.length).to.have.greaterThan(0);
       const usernameLine = lines.find((line) => line.includes('Username'));
       expect(usernameLine).to.include(defaultUsername);
     });
     it('should display human readable scratch org information for alias', () => {
-      const lines = execCmd(`force:org:display -u ${aliasedUsername}`, { ensureExitCode: 0 }).shellOutput.stdout.split(
-        '\n'
+      const lines = execCmd(`force:org:display -o ${aliasedUsername}`, { ensureExitCode: 0 }).shellOutput.stdout.split(
+        os.EOL
       );
       expect(lines.length).to.have.greaterThan(0);
       const usernameLine = lines.find((line) => line.includes('Username'));
@@ -181,15 +182,15 @@ describe('Org Command NUT', () => {
   });
   describe('Org Open', () => {
     it('should produce the URL for an org in json', () => {
-      const result = execCmd<OrgOpenOutput>(`force:org:open -u ${defaultUsername} --urlonly --json`, {
+      const result = execCmd<OrgOpenOutput>(`org:open -o ${defaultUsername} --url-only --json`, {
         ensureExitCode: 0,
       }).jsonOutput?.result;
       expect(result).to.be.ok;
       expect(result).to.include({ orgId: defaultUserOrgId, username: defaultUsername });
     });
     it('should produce the URL with given path for an org in json', () => {
       const result = execCmd<OrgOpenOutput>(
-        `force:org:open -u ${aliasedUsername} --urlonly --path "foo/bar/baz" --json`,
+        `force:org:open -o ${aliasedUsername} --urlonly --path "foo/bar/baz" --json`,
         {
           ensureExitCode: 0,
         }