chore: do not use deprecated config vars [sb-nuts]

Author: cristiand391

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

@@ -24,7 +24,6 @@ import {
   SandboxRequest,
   SandboxUserAuthResponse,
   SfError,
-  SfdxPropertyKeys,
   StatusEvent,
   ScratchOrgRequest,
   ScratchOrgInfo,
@@ -215,7 +214,7 @@ export class Create extends SfdxCommand {
         }
         if (this.flags.setdefaultusername) {
           const globalConfig: Config = this.configAggregator.getGlobalConfig();
-          globalConfig.set(SfdxPropertyKeys.DEFAULT_USERNAME, results.sandboxRes.authUserName);
+          globalConfig.set(OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
           const result = await globalConfig.write();
           this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
         }
@@ -242,7 +241,7 @@ export class Create extends SfdxCommand {
         }
         if (this.flags.setdefaultusername && this.sandboxAuth) {
           const globalConfig: Config = this.configAggregator.getGlobalConfig();
-          globalConfig.set(SfdxPropertyKeys.DEFAULT_USERNAME, this.sandboxAuth.authUserName);
+          globalConfig.set(OrgConfigProperties.TARGET_ORG, this.sandboxAuth.authUserName);
           const result = await globalConfig.write();
           this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
         }

src/commands/force/org/clone.ts

@@ -14,7 +14,7 @@ import {
   Lifecycle,
   Messages,
   OrgTypes,
-  SfdxPropertyKeys,
+  OrgConfigProperties,
   StateAggregator,
   SandboxEvents,
   SandboxRequest,
@@ -96,7 +96,7 @@ export class OrgCloneCommand extends SfdxCommand {
           }
           if (this.flags.setdefaultusername) {
             const globalConfig: Config = this.configAggregator.getGlobalConfig();
-            globalConfig.set(SfdxPropertyKeys.DEFAULT_USERNAME, results.sandboxRes.authUserName);
+            globalConfig.set(OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
             const result = await globalConfig.write();
             this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
           }

src/commands/force/org/status.ts

@@ -13,7 +13,7 @@ import {
   Messages,
   StateAggregator,
   SandboxEvents,
-  SfdxPropertyKeys,
+  OrgConfigProperties,
   StatusEvent,
   ResultEvent,
   SandboxProcessObject,
@@ -78,7 +78,7 @@ export class OrgStatusCommand extends SfdxCommand {
         }
         if (this.flags.setdefaultusername) {
           const globalConfig: Config = this.configAggregator.getGlobalConfig();
-          globalConfig.set(SfdxPropertyKeys.DEFAULT_USERNAME, results.sandboxRes.authUserName);
+          globalConfig.set(OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
           const result = await globalConfig.write();
           this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
         }

test/commands/force/org/clone.test.ts

@@ -10,7 +10,7 @@ import {
   StateAggregator,
   SandboxEvents,
   SfdxConfigAggregator,
-  SfdxPropertyKeys,
+  OrgConfigProperties,
 } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import * as sinon from 'sinon';
@@ -217,7 +217,7 @@ describe('org:clone', () => {
     expect(aliasSetStub.callCount).to.be.equal(1);
     expect(aliasSetStub.firstCall.args[0]).to.be.equal(sandboxalias);
     expect(aliasSetStub.firstCall.args[1]).to.be.equal(authUserName);
-    expect(configSetStub.firstCall.args[0]).to.be.equal(SfdxPropertyKeys.DEFAULT_USERNAME);
+    expect(configSetStub.firstCall.args[0]).to.be.equal(OrgConfigProperties.TARGET_ORG);
     expect(configSetStub.firstCall.args[1]).to.be.equal(authUserName);
     expect(onStub.firstCall.firstArg).to.be.equal(SandboxEvents.EVENT_ASYNC_RESULT);
     expect(onStub.secondCall.firstArg).to.be.equal(SandboxEvents.EVENT_STATUS);

test/commands/force/org/sandboxCreate.test.ts

@@ -336,7 +336,7 @@ describe('org:create', () => {
           },
         ]);
         expect(aliasSetStub.firstCall.args).to.deep.equal(['sandboxAlias', 'newSandboxUsername']);
-        expect(configStub.firstCall.args).to.deep.equal(['defaultusername', 'newSandboxUsername']);
+        expect(configStub.firstCall.args).to.deep.equal(['target-org', 'newSandboxUsername']);
       });
 
       const sandboxRes: SandboxUserAuthResponse = {

test/commands/force/org/status.test.ts

@@ -7,7 +7,7 @@
 
 import {
   Org,
-  SfdxPropertyKeys,
+  OrgConfigProperties,
   SfdxConfigAggregator,
   StateAggregator,
   ConfigAggregator,
@@ -139,7 +139,7 @@ describe('org:status', () => {
 
   it('will set default username', async () => {
     const res = await runStatusCommand(['--sandboxname', sanboxname, '--setdefaultusername']);
-    expect(configSetStub.firstCall.args[0]).to.be.equal(SfdxPropertyKeys.DEFAULT_USERNAME);
+    expect(configSetStub.firstCall.args[0]).to.be.equal(OrgConfigProperties.TARGET_ORG);
     expect(configSetStub.firstCall.args[1]).to.be.equal(authUserName);
     expect(configWriteStub.calledOnce).to.be.true;
     expect(onStub.secondCall.firstArg).to.be.equal(SandboxEvents.EVENT_RESULT);