fix: clear globalInfo instance after every possible touchpoint

salesforcecli · Jun 2, 2022 · ca7dc01 · ca7dc01
1 parent 91264d4
commit ca7dc01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/hubAuth.ts b/src/hubAuth.ts
@@ -9,7 +9,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as shell from 'shelljs';
 import { debug } from 'debug';
-import { AuthFields } from '@salesforce/core';
+import { AuthFields, GlobalInfo } from '@salesforce/core';
 import { env } from '@salesforce/kit';
 
 // this seems to be a known eslint error for enums
@@ -94,6 +94,8 @@ export const testkitHubAuth = (homeDir: string, authStrategy: AuthStrategy = get
       )} -f ${jwtKey} -r ${env.getString('TESTKIT_HUB_INSTANCE', DEFAULT_INSTANCE_URL)}`,
       execOpts
     ) as shell.ShellString;
+    GlobalInfo.clearInstance();
+
     if (results.code !== 0) {
       throw new Error(
         `jwt:grant for org ${env.getString(
@@ -110,6 +112,7 @@ export const testkitHubAuth = (homeDir: string, authStrategy: AuthStrategy = get
     const tmpUrl = prepareForAuthUrl(homeDir);
 
     const shellOutput = shell.exec(`sfdx auth:sfdxurl:store -d -f ${tmpUrl}`, execOpts) as shell.ShellString;
+    GlobalInfo.clearInstance();
     logger(shellOutput);
     if (shellOutput.code !== 0) {
       throw new Error(
@@ -185,6 +188,8 @@ export const transferExistingAuthToEnv = (authStrategy: AuthStrategy = getAuthSt
     const displayContents = JSON.parse(
       shell.exec(`sfdx force:org:display -u ${devhub} --verbose --json`, execOpts) as string
     ) as OrgDisplayResult;
+    GlobalInfo.clearInstance();
+
     logger(`found ${displayContents.result.sfdxAuthUrl}`);
     env.setString('TESTKIT_AUTH_URL', displayContents.result.sfdxAuthUrl);
     return;

diff --git a/src/testSession.ts b/src/testSession.ts
@@ -8,6 +8,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { RetryConfig } from 'ts-retry-promise';
 import { debug, Debugger } from 'debug';
+import { GlobalInfo } from '@salesforce/core';
 import { AsyncOptionalCreatable, Duration, env, parseJson, sleep } from '@salesforce/kit';
 import { AnyJson, getString, Optional } from '@salesforce/ts-types';
 import { createSandbox, SinonStub } from 'sinon';
@@ -249,6 +250,7 @@ export class TestSession extends AsyncOptionalCreatable<TestSessionOptions> {
         }
         this.debug('Deleted org result=', rv.stdout);
       }
+      GlobalInfo.clearInstance();
     }
   }
 
@@ -344,6 +346,8 @@ export class TestSession extends AsyncOptionalCreatable<TestSessionOptions> {
         await this.sleep(timeout);
       }
     }
+    // there may be globalInfo touches from org:create or other setup commands run
+    GlobalInfo.clearInstance();
   }
 
   private async sleep(duration: Duration): Promise<void> {