Merge pull request #292 from salesforcecli/bm/W-10675890

fix: try to create local config first

Author: shetzel

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

@@ -262,16 +262,21 @@ export class Create extends SfdxCommand {
   }
 
   private async setAliasAndDefaultUsername(username: string): Promise<void> {
+    const aliases = await Aliases.create(Aliases.getDefaultOptions());
     if (this.flags.setalias) {
-      const alias = await Aliases.create(Aliases.getDefaultOptions());
-      alias.set(this.flags.setalias, username);
-      const result = await alias.write();
-      this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
+      await aliases.updateValue(this.flags.setalias, username);
+      this.logger.debug('Set Alias: %s result: %s', this.flags.setalias);
     }
     if (this.flags.setdefaultusername) {
-      const globalConfig: Config = this.configAggregator.getGlobalConfig();
-      globalConfig.set(Config.DEFAULT_USERNAME, username);
-      const result = await globalConfig.write();
+      let config: Config;
+      try {
+        config = await Config.create({ isGlobal: false });
+      } catch {
+        config = await Config.create({ isGlobal: true });
+      }
+      const value = aliases.getKeysByValue(username)[0] || username;
+      const result = config.set(Config.DEFAULT_USERNAME, value);
+      await config.write();
       this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
     }
   }

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

@@ -184,7 +184,7 @@ describe('org:create', () => {
         '--type',
         'scratch',
         '--setalias',
-        'sandboxAlias',
+        'scratchOrgAlias',
         '--setdefaultusername',
         '--definitionfile',
         definitionfile,
@@ -198,7 +198,8 @@ describe('org:create', () => {
         ...CREATE_RESULT,
         username: 'newScratchUsername',
       });
-      const aliasStub = stubMethod(sandbox, Aliases.prototype, 'set');
+      const updateValueStub = stubMethod(sandbox, Aliases.prototype, 'updateValue');
+      const getKeysByValueStub = stubMethod(sandbox, Aliases.prototype, 'getKeysByValue').returns([]);
       const configStub = stubMethod(sandbox, Config.prototype, 'set');
       await command.runIt();
       expect(prodOrg.firstCall.args[0]).to.deep.equal({
@@ -216,10 +217,55 @@ describe('org:create', () => {
         retry: 0,
         orgConfig: {},
       });
-      expect(aliasStub.firstCall.args).to.deep.equal(['sandboxAlias', 'newScratchUsername']);
+      expect(updateValueStub.firstCall.args).to.deep.equal(['scratchOrgAlias', 'newScratchUsername']);
+      expect(getKeysByValueStub.firstCall.args).to.deep.equal(['newScratchUsername']);
       expect(configStub.firstCall.args).to.deep.equal(['defaultusername', 'newScratchUsername']);
     });
 
+    it('will set alias as default', async () => {
+      const definitionfile = 'myScratchDef.json';
+      const command = createCommand([
+        '--type',
+        'scratch',
+        '--setalias',
+        'scratchOrgAlias',
+        '--setdefaultusername',
+        '--definitionfile',
+        definitionfile,
+        '-u',
+        'testProdOrg',
+      ]);
+
+      scratchOrgCreateStub.restore();
+      stubMethod(sandbox, Org, 'create').resolves(Org.prototype);
+      const prodOrg = stubMethod(sandbox, Org.prototype, 'scratchOrgCreate').resolves({
+        ...CREATE_RESULT,
+        username: 'newScratchUsername',
+      });
+      const updateValueStub = stubMethod(sandbox, Aliases.prototype, 'updateValue');
+      const getKeysByValueStub = stubMethod(sandbox, Aliases.prototype, 'getKeysByValue').returns(['scratchOrgAlias']);
+      const configStub = stubMethod(sandbox, Config.prototype, 'set');
+      await command.runIt();
+      expect(prodOrg.firstCall.args[0]).to.deep.equal({
+        apiversion: undefined,
+        clientSecret: undefined,
+        connectedAppConsumerKey: undefined,
+        definitionfile,
+        durationDays: undefined,
+        noancestors: undefined,
+        nonamespace: undefined,
+        wait: {
+          quantity: 6,
+          unit: 0,
+        },
+        retry: 0,
+        orgConfig: {},
+      });
+      expect(updateValueStub.firstCall.args).to.deep.equal(['scratchOrgAlias', 'newScratchUsername']);
+      expect(getKeysByValueStub.firstCall.args).to.deep.equal(['newScratchUsername']);
+      expect(configStub.firstCall.args).to.deep.equal(['defaultusername', 'scratchOrgAlias']);
+    });
+
     it('will test json output', async () => {
       const definitionfile = 'myScratchDef.json';
       const command = createCommand(['--type', 'scratch', '--definitionfile', definitionfile, '-u', 'testProdOrg']);