Merge pull request #675 from salesforcecli/sm/scratch-org-id

Sm/scratch-org-id

Author: WillieRuemmele

package.json

@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.14",
-    "@salesforce/cli-plugins-testkit": "^3.3.5",
+    "@salesforce/cli-plugins-testkit": "^3.3.6",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.3.1",
     "@salesforce/plugin-command-reference": "^2.4.4",
@@ -234,4 +234,4 @@
       "output": []
     }
   }
-}
+}

src/commands/org/create/scratch.ts

@@ -190,7 +190,7 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
         this.logSuccess(messages.getMessage('success'));
       }
 
-      return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo.Id };
+      return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
     } catch (error) {
       if (error instanceof SfError && error.name === 'ScratchOrgInfoTimeoutError') {
         this.spinner.stop(lastStatus);

src/commands/org/resume/scratch.ts

@@ -70,6 +70,6 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
 
     this.log();
     this.logSuccess(messages.getMessage('success'));
-    return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo?.Id };
+    return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
   }
 }

test/nut/async-create-resume.nut.ts

@@ -21,8 +21,8 @@ describe('env:create:scratch async/resume', () => {
   let soiId: string;
   let username: string;
 
-  const asyncKeys = ['username', 'orgId', 'scratchOrgInfo', 'warnings'];
-  const completeKeys = [...asyncKeys, 'authFields'];
+  const asyncKeys = ['username', 'scratchOrgInfo', 'warnings'];
+  const completeKeys = [...asyncKeys, 'authFields', 'orgId'];
 
   const readCacheFile = async (): Promise<Record<string, CachedOptions>> =>
     JSON.parse(await fs.promises.readFile(cacheFilePath, 'utf8')) as unknown as Record<string, CachedOptions>;
@@ -74,6 +74,7 @@ describe('env:create:scratch async/resume', () => {
         if (resp.status === 0) {
           done = true;
           expect(resp.result).to.have.all.keys(completeKeys);
+          expect(resp.result.orgId).to.match(/^00D.{15}/);
         } else if (resp.name === 'StillInProgressError') {
           // eslint-disable-next-line no-await-in-loop
           await sleep(Duration.seconds(30));

test/nut/scratchCreate.nut.ts

@@ -69,6 +69,7 @@ describe('env create scratch NUTs', () => {
       }).jsonOutput?.result;
       expect(resp).to.have.all.keys(keys);
       assert(resp?.username);
+      expect(resp?.orgId).to.match(/^00D.{15}/);
       const stateAggregator = await StateAggregator.create();
       expect(await stateAggregator.orgs.read(resp.username)).to.have.property('tracksSource', true);
       StateAggregator.clearInstance();
@@ -81,6 +82,7 @@ describe('env create scratch NUTs', () => {
         }
       ).jsonOutput?.result;
       expect(resp).to.have.all.keys(keys);
+      expect(resp?.orgId).to.match(/^00D.{15}/);
     });
     it('creates an org from config file with "override" flags ', () => {
       const expectedUsername = genUniqueString('%[email protected]');

yarn.lock

@@ -901,10 +901,10 @@
     mv "~2"
     safe-json-stringify "~1"
 
-"@salesforce/cli-plugins-testkit@^3.3.5":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-3.3.5.tgz#72866456936f013446cb406129a9fef4fa32fe3e"
-  integrity sha512-aFNYYqXnXwAwSJ4LtQm0f2XJFurIeZtQguWzQ+1+CV3heoO7z2rQUHTNU+Uknu2JxSF47HEpPthx8v6LEfKk+g==
+"@salesforce/cli-plugins-testkit@^3.3.6":
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-3.3.6.tgz#89c17e87a58e1d0bd6006b65568a6883a17e7e5b"
+  integrity sha512-40o363ISrdX1FNyt0YLBouQMMMySXS0YLhozTqSjtZDHZn/9gfcVH1LOz9XsOUd1C4SwnVnVjHH2bdVfHzxRWA==
   dependencies:
     "@salesforce/core" "^3.34.8"
     "@salesforce/kit" "^1.9.2"