Merge remote-tracking branch 'origin/main' into sm/new-logger

.github/workflows/perf.yml

@@ -2,7 +2,7 @@
 name: perf-tests
 on:
   push:
-    branches-ignore: [main]
+    branches-ignore: [main, gh-pages]
   workflow_dispatch:
 
 # linux will finish ahead of windows, but prevent other branches/commits from hitting simultaneously
@@ -22,7 +22,6 @@ jobs:
         with:
           cache: yarn
       - run: yarn install
-      # build is necessary because transport references /lib
       - run: yarn build
       - run: npm run test:perf | tee test/perf/output.txt
 

.mocharc.json

@@ -4,5 +4,5 @@
   "watch-files": ["src", "test"],
   "recursive": true,
   "reporter": "spec",
-  "timeout": 10000
+  "timeout": 20000
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.3.3",
+  "version": "4.3.5",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -48,7 +48,7 @@
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "^2.0.0-beta.25",
+    "jsforce": "^2.0.0-beta.27",
     "jsonwebtoken": "9.0.0",
     "jszip": "3.10.1",
     "pino": "^8.14.1",

src/config/configAggregator.ts

@@ -80,8 +80,8 @@ export class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Op
 
   // Initialized in loadProperties
   private allowedProperties!: ConfigPropertyMeta[];
-  private localConfig?: Config;
-  private globalConfig: Config;
+  private readonly localConfig?: Config;
+  private readonly globalConfig: Config;
   private envVars: Dictionary<string> = {};
 
   /**
@@ -334,6 +334,19 @@ export class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Op
     return this.config;
   }
 
+  public async unsetByValue(key: string): Promise<void> {
+    const hasLocalWrites = this.localConfig
+      ?.getKeysByValue(key)
+      .map((k) => this.localConfig?.unset(k))
+      .some(Boolean);
+    if (hasLocalWrites) await this.localConfig?.write();
+    const hasGlobalWrites = this.globalConfig
+      ?.getKeysByValue(key)
+      .map((k) => this.globalConfig?.unset(k))
+      .some(Boolean);
+    if (hasGlobalWrites) await this.globalConfig?.write();
+  }
+
   /**
    * Get the config properties that are environment variables.
    */
@@ -412,8 +425,7 @@ export class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Op
     configs.push(this.envVars);
 
     const json: JsonMap = {};
-    const reduced = configs.filter(isJsonMap).reduce((acc: JsonMap, el: AnyJson) => merge(acc, el), json);
-    return reduced;
+    return configs.filter(isJsonMap).reduce((acc: JsonMap, el: AnyJson) => merge(acc, el), json);
   }
 }
 

src/org/org.ts

@@ -507,6 +507,16 @@ export class Org extends AsyncOptionalCreatable<Org.Options> {
    * Will delete 'this' instance remotely and any files locally
    */
   public async delete(): Promise<void> {
+    const username = ensureString(this.getUsername());
+
+    // unset any aliases referencing this org
+    const stateAgg = await StateAggregator.getInstance();
+    const existingAliases = stateAgg.aliases.getAll(username);
+    await stateAgg.aliases.unsetValuesAndSave(existingAliases);
+
+    // unset any configs referencing this org
+    [...existingAliases, username].flatMap((name) => this.configAggregator.unsetByValue(name));
+
     if (await this.isSandbox()) {
       await this.deleteSandbox();
     } else {
@@ -1132,6 +1142,7 @@ export class Org extends AsyncOptionalCreatable<Org.Options> {
     try {
       const devHubConn = devHub.getConnection();
       const username = this.getUsername();
+
       const activeScratchOrgRecordId = (
         await devHubConn.singleRecordQuery<{ Id: string }>(
           `SELECT Id FROM ActiveScratchOrg WHERE SignupUsername='${username}'`

test/unit/org/orgTest.ts

@@ -329,6 +329,42 @@ describe('Org Tests', () => {
           }
         });
 
+        it('should unset the alias and any configs', async () => {
+          const dev = await createOrgViaAuthInfo(testData.username);
+          const configAgg = await ConfigAggregator.create();
+
+          const orgTestData = new MockTestOrgData();
+          const org = await createOrgViaAuthInfo(orgTestData.username, orgTestData);
+          const username = ensureString(org.getUsername());
+          $$.setConfigStubContents('Config', { contents: { [OrgConfigProperties.TARGET_ORG]: username } });
+
+          await configAgg.reload();
+          const stateAggregator = await StateAggregator.getInstance();
+
+          expect(configAgg.getConfig()['target-org']).to.equal(username);
+
+          await stateAggregator.aliases.setAndSave('deleteThisAlias', username);
+          expect(stateAggregator.aliases.getUsername('deleteThisAlias')).to.equal(username);
+
+          const devHubQuery = stubMethod($$.SANDBOX, Connection.prototype, 'singleRecordQuery').resolves({
+            Id: orgTestData.orgId,
+          });
+          const devHubDelete = stubMethod($$.SANDBOX, Org.prototype, 'destroyScratchOrg').resolves();
+          $$.SANDBOX.stub(org, 'getDevHubOrg').resolves(dev);
+
+          await org.delete();
+          expect(configAgg.getConfig()['target-org']).to.equal(undefined);
+
+          expect(stateAggregator.aliases.get(username)).to.be.null;
+          expect(devHubQuery.calledOnce).to.be.true;
+          expect(devHubQuery.firstCall.args[0]).to.equal(
+            `SELECT Id FROM ActiveScratchOrg WHERE SignupUsername='${orgTestData.username}'`
+          );
+
+          expect(devHubDelete.calledOnce).to.be.true;
+          expect(devHubDelete.firstCall.args[1]).to.equal(orgTestData.orgId);
+        });
+
         it('should handle SingleRecordQueryErrors.NoRecords errors', async () => {
           const dev = await createOrgViaAuthInfo();
 

yarn.lock

@@ -3021,10 +3021,10 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsforce@^2.0.0-beta.25:
-  version "2.0.0-beta.25"
-  resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.25.tgz#120a3999babf96ae18ab8f1232003d56588a9ca5"
-  integrity sha512-ZtzwJErI4SSJYWrGAw0mHEHPZRB4Idz0RiXHakCtEgEjEWt6JIDR4sNbWRHUzWHdEO4O61z2YSBvdOuag1hkWg==
+jsforce@^2.0.0-beta.27:
+  version "2.0.0-beta.27"
+  resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.27.tgz#ba822b18b77bea4529491060a9b07bc1009735ac"
+  integrity sha512-d9dDWWeHwayRKPo8FJBAIUyk8sNXGSHwdUjR6al3yK0YKci27Jc1XfNaQTxEAuymHQJVaCb1gxTKqmA4uznFdQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@babel/runtime-corejs3" "^7.12.5"