fix: use newer core scratchOrgCreate

Author: mshanemc

src/commands/force/org/beta/create.ts

@@ -25,8 +25,8 @@ import {
   SandboxUserAuthResponse,
   SfError,
   StatusEvent,
-  ScratchOrgRequest,
   ScratchOrgInfo,
+  ScratchOrgRequest,
 } from '@salesforce/core';
 import { OrgCreateResult } from '../../../../shared/orgHooks';
 import { SandboxReporter } from '../../../../shared/sandboxReporter';
@@ -260,25 +260,6 @@ export class Create extends SfdxCommand {
     }
   }
 
-  private async setAliasAndDefaultUsername(username: string): Promise<void> {
-    const stateAggregator = await StateAggregator.getInstance();
-    if (this.flags.setalias) {
-      stateAggregator.aliases.set(this.flags.setalias, username);
-      this.logger.debug('Set Alias: %s result: %s', this.flags.setalias);
-    }
-    if (this.flags.setdefaultusername) {
-      let config: Config;
-      try {
-        config = await Config.create({ isGlobal: false });
-      } catch {
-        config = await Config.create({ isGlobal: true });
-      }
-      const value = stateAggregator.aliases.get(username) || username;
-      const result = config.set(OrgConfigProperties.TARGET_ORG, value);
-      await config.write();
-      this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
-    }
-  }
   private async createScratchOrg(): Promise<ScratchOrgProcessObject> {
     this.logger.debug('OK, will do scratch org creation');
     if (!this.hubOrg) {
@@ -291,15 +272,14 @@ export class Create extends SfdxCommand {
 
     this.logger.debug('validation complete');
 
-    let secret: string;
-    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',
-      });
-    }
+    // 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 createCommandOptions: ScratchOrgRequest = {
       connectedAppConsumerKey: this.flags.clientid as string,
@@ -312,14 +292,15 @@ export class Create extends SfdxCommand {
       definitionfile: this.flags.definitionfile as string,
       orgConfig: this.varargs,
       clientSecret: secret,
+      setDefault: (this.flags.setdefaultusername as boolean) === true,
+      alias: this.flags.setalias as string | undefined,
+      tracksSource: true,
     };
 
     const { username, scratchOrgInfo, authFields, warnings } = await this.hubOrg.scratchOrgCreate(createCommandOptions);
 
     await Lifecycle.getInstance().emit('scratchOrgInfo', scratchOrgInfo);
 
-    await this.setAliasAndDefaultUsername(username);
-
     // emit postorgcreate event for hook
     const postOrgCreateHookInfo: OrgCreateResult = [authFields].map((element) => ({
       accessToken: element.accessToken,

test/commands/force/org/scratchOrgCreate.test.ts

@@ -4,7 +4,7 @@
  * 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
  */
-import { Config, StateAggregator, SfError, Messages, Org, SfProject } from '@salesforce/core';
+import { SfError, Messages, Org, SfProject } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import * as sinon from 'sinon';
 import { expect } from '@salesforce/command/lib/test';
@@ -44,8 +44,6 @@ describe('org:create', () => {
   let uxLogStub: sinon.SinonStub;
   let uxWarnStub: sinon.SinonStub;
   let promptStub: sinon.SinonStub;
-  let aliasGetStub: sinon.SinonStub;
-  let aliasSetStub: sinon.SinonSpy;
   let cmd: TestCreate;
 
   class TestCreate extends Create {
@@ -109,6 +107,7 @@ describe('org:create', () => {
       const prodOrg = stubMethod(sandbox, Org.prototype, 'scratchOrgCreate').resolves(CREATE_RESULT);
       await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        alias: undefined,
         apiversion: undefined,
         clientSecret: undefined,
         connectedAppConsumerKey: undefined,
@@ -120,6 +119,8 @@ describe('org:create', () => {
           unit: 0,
         },
         retry: 0,
+        setDefault: false,
+        tracksSource: true,
         definitionfile: 'myScratchDef.json',
         orgConfig: {
           licenseType: 'LicenseFromVarargs',
@@ -161,6 +162,7 @@ describe('org:create', () => {
       const prodOrg = stubMethod(sandbox, Org.prototype, 'scratchOrgCreate').resolves(CREATE_RESULT);
       await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        alias: undefined,
         apiversion: undefined,
         clientSecret,
         connectedAppConsumerKey,
@@ -173,6 +175,8 @@ describe('org:create', () => {
           unit: 0,
         },
         retry: 0,
+        setDefault: false,
+        tracksSource: true,
         orgConfig: {},
       });
       expect(promptStub.callCount).to.equal(1);
@@ -201,17 +205,9 @@ describe('org:create', () => {
         ...CREATE_RESULT,
         username: 'newScratchUsername',
       });
-      aliasGetStub = sinon.stub().returns('');
-      aliasSetStub = sinon.spy();
-      stubMethod(sandbox, StateAggregator, 'getInstance').returns({
-        aliases: {
-          get: aliasGetStub,
-          set: aliasSetStub,
-        },
-      });
-      const configStub = stubMethod(sandbox, Config.prototype, 'set');
       await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        alias: 'scratchOrgAlias',
         apiversion: undefined,
         clientSecret: undefined,
         connectedAppConsumerKey: undefined,
@@ -224,11 +220,10 @@ describe('org:create', () => {
           unit: 0,
         },
         retry: 0,
+        setDefault: true,
+        tracksSource: true,
         orgConfig: {},
       });
-      expect(aliasSetStub.firstCall.args).to.deep.equal(['scratchOrgAlias', 'newScratchUsername']);
-      expect(aliasGetStub.firstCall.args).to.deep.equal(['newScratchUsername']);
-      expect(configStub.firstCall.args).to.deep.equal(['target-org', 'newScratchUsername']);
     });
 
     it('will set alias as default', async () => {
@@ -252,18 +247,9 @@ describe('org:create', () => {
         username: 'newScratchUsername',
       });
 
-      aliasGetStub = sinon.stub().returns('scratchOrgAlias');
-      aliasSetStub = sinon.spy();
-      stubMethod(sandbox, StateAggregator, 'getInstance').returns({
-        aliases: {
-          get: aliasGetStub,
-          set: aliasSetStub,
-        },
-      });
-
-      const configStub = stubMethod(sandbox, Config.prototype, 'set');
       await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        alias: 'scratchOrgAlias',
         apiversion: undefined,
         clientSecret: undefined,
         connectedAppConsumerKey: undefined,
@@ -277,10 +263,9 @@ describe('org:create', () => {
         },
         retry: 0,
         orgConfig: {},
+        setDefault: true,
+        tracksSource: true,
       });
-      expect(aliasSetStub.firstCall.args).to.deep.equal(['scratchOrgAlias', 'newScratchUsername']);
-      expect(aliasGetStub.firstCall.args).to.deep.equal(['newScratchUsername']);
-      expect(configStub.firstCall.args).to.deep.equal(['target-org', 'scratchOrgAlias']);
     });
 
     it('will test json output', async () => {
@@ -295,6 +280,7 @@ describe('org:create', () => {
       });
       const result = await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        alias: undefined,
         apiversion: undefined,
         clientSecret: undefined,
         connectedAppConsumerKey: undefined,
@@ -307,6 +293,8 @@ describe('org:create', () => {
           unit: 0,
         },
         retry: 0,
+        tracksSource: true,
+        setDefault: false,
         orgConfig: {},
       });
       expect(result).to.have.keys(['username', 'authFields', 'scratchOrgInfo', 'warnings', 'orgId']);