Merge remote-tracking branch 'origin/main' into sm/bin-to-messages

mshanemc · mshanemc · commit 22a653774b53 · 2023-05-15T09:38:14.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## [2.8.6](https://github.com/salesforcecli/plugin-org/compare/2.8.5...2.8.6) (2023-05-15)
+
+
+### Bug Fixes
+
+* scratch org create/resume Id should be orgId, not SOI Id ([d783c8c](https://github.com/salesforcecli/plugin-org/commit/d783c8c566ece2f313347d475cb3bf58b032ebd8))
+
+
+
+## [2.8.5](https://github.com/salesforcecli/plugin-org/compare/2.8.4...2.8.5) (2023-05-14)
+
+
+### Bug Fixes
+
+* **deps:** bump @salesforce/core from 3.36.0 to 3.36.1 ([f6d4085](https://github.com/salesforcecli/plugin-org/commit/f6d40850756dc3a7d14716f09415bdf8a9a74f3b))
+
+
+
+## [2.8.4](https://github.com/salesforcecli/plugin-org/compare/2.8.3...2.8.4) (2023-05-14)
+
+
+### Bug Fixes
+
+* **deps:** bump @salesforce/source-deploy-retrieve from 8.0.7 to 8.4.0 ([cdb0f23](https://github.com/salesforcecli/plugin-org/commit/cdb0f23c94169ec6ae100c293d734a1ef2edbc21))
+
+
+
+## [2.8.3](https://github.com/salesforcecli/plugin-org/compare/2.8.2...2.8.3) (2023-05-14)
+
+
+### Bug Fixes
+
+* **deps:** bump @salesforce/sf-plugins-core from 2.4.0 to 2.4.2 ([5c7b0a2](https://github.com/salesforcecli/plugin-org/commit/5c7b0a23b48e9b34b1b243c9b5d702f51ca67a05))
+
+
+
 ## [2.8.2](https://github.com/salesforcecli/plugin-org/compare/2.8.1...2.8.2) (2023-05-07)
 
 
diff --git a/package.json b/package.json
@@ -1,26 +1,26 @@
 {
   "name": "@salesforce/plugin-org",
   "description": "Commands to interact with Salesforce orgs",
-  "version": "2.8.2",
+  "version": "2.8.6",
   "author": "Salesforce",
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^2.8.4",
-    "@salesforce/core": "^3.36.0",
+    "@salesforce/core": "^3.36.1",
     "@salesforce/kit": "^1.9.2",
-    "@salesforce/sf-plugins-core": "^2.4.0",
-    "@salesforce/source-deploy-retrieve": "^8.0.7",
+    "@salesforce/sf-plugins-core": "^2.4.2",
+    "@salesforce/source-deploy-retrieve": "^8.4.0",
     "open": "^8.4.2",
     "tslib": "^2"
   },
   "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.2.9",
-    "@salesforce/plugin-source": "^2.10.4",
+    "@salesforce/plugin-command-reference": "^2.4.4",
+    "@salesforce/plugin-source": "^2.10.8",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "1.4.6",
     "@swc/core": "1.3.39",
diff --git a/src/commands/org/create/scratch.ts b/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);
diff --git a/src/commands/org/resume/scratch.ts b/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 };
   }
 }
diff --git a/test/nut/async-create-resume.nut.ts b/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));
diff --git a/test/nut/scratchCreate.nut.ts b/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('%s@nut.org');
diff --git a/yarn.lock b/yarn.lock
@@ -695,7 +695,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.0.7", "@oclif/core@^2.3.0", "@oclif/core@^2.4.0", "@oclif/core@^2.6.3", "@oclif/core@^2.8.0", "@oclif/core@^2.8.2", "@oclif/core@^2.8.4", "@oclif/core@^2.8.5":
+"@oclif/core@^2.0.7", "@oclif/core@^2.3.0", "@oclif/core@^2.4.0", "@oclif/core@^2.8.0", "@oclif/core@^2.8.2", "@oclif/core@^2.8.4", "@oclif/core@^2.8.5":
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.5.tgz#7964057bbee5e91dae8b35e030e767f38e50a19e"
   integrity sha512-316DLfrHQDYmWDriI4Woxk9y1wVUrPN1sZdbQLHdOdlTA9v/twe7TdHpWOriEypfl6C85NWEJKc1870yuLtjrQ==
@@ -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"
@@ -916,10 +916,10 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.7.0"
 
-"@salesforce/core@^3.32.12", "@salesforce/core@^3.34.6", "@salesforce/core@^3.34.8", "@salesforce/core@^3.35.0", "@salesforce/core@^3.36.0":
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.36.0.tgz#cbff147d888eee0b921e368c1fdc1a1a3c2eacab"
-  integrity sha512-LOeSJgozf5B1S8C98/K3afewRsathfEm+HrXxaFXJjITFfIhxqcIDB5xC1cw0VikfRUlq7dQocmVsvezcK0Ghw==
+"@salesforce/core@^3.32.12", "@salesforce/core@^3.34.8", "@salesforce/core@^3.36.0", "@salesforce/core@^3.36.1":
+  version "3.36.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.36.1.tgz#053a5e1079b9749b62e461e6ac3e630b5689694a"
+  integrity sha512-kcjyr9bj35nnL8Bqv8U39xeho3CrZYXJiS/X5X1eEHVNZLd9zckrmKrh1V7z8ElCFpsJrewT989SJsdvi9kE8w==
   dependencies:
     "@salesforce/bunyan" "^2.0.0"
     "@salesforce/kit" "^1.9.2"
@@ -982,7 +982,7 @@
     typescript "^4.1.3"
     wireit "^0.9.5"
 
-"@salesforce/kit@^1.8.2", "@salesforce/kit@^1.9.0", "@salesforce/kit@^1.9.2":
+"@salesforce/kit@^1.8.2", "@salesforce/kit@^1.9.2":
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.9.2.tgz#d232f135428363cdfe2649cb99a94bc2eb0a12fd"
   integrity sha512-kjZvjFNP6njhAiEa/ErdLXSDWZKafHYJyKCKz1wnSFmDM8TOpKHCCVw5cQo87ZQr8OqxqwUDIAlSBLyMzKi4Lg==
@@ -991,10 +991,10 @@
     shx "^0.3.3"
     tslib "^2.5.0"
 
-"@salesforce/plugin-command-reference@^2.2.9":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-2.4.1.tgz#eb004d17728908ab2f7fd9554ee06f89258f300b"
-  integrity sha512-4MWvZSb8wSwY4N1hL3E7qyH9ONJ/tGcOtmqTdtwypp7r/GkapnezfwiQcexkhlwrDqUhkCG2h+r3YW/kUryGiA==
+"@salesforce/plugin-command-reference@^2.4.4":
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-2.4.4.tgz#afe00a2e961bb76e7dff12eeb4334683293778af"
+  integrity sha512-BIIgnOqzrF6K+8H42a2LGyKCTd0b/XcBPUDAaHyg43JqoNWTtjM1O/jY9uYqevu8qGgS+f1aKic46+p+uTt/Hg==
   dependencies:
     "@oclif/core" "^2.0.7"
     "@salesforce/core" "^3.32.12"
@@ -1008,18 +1008,18 @@
     mkdirp "^1.0.4"
     tslib "^2"
 
-"@salesforce/plugin-source@^2.10.4":
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.10.4.tgz#8ae50a434f26544462e1b9e3495a96859711e713"
-  integrity sha512-gyQwj4e04Pyij33eiWdrAdSVHOj2V0d6z1lZRNCSbdZk+OhGpUCiTE7sCmtN8b//aKYGRJWjP5usBMivc/jylw==
+"@salesforce/plugin-source@^2.10.8":
+  version "2.10.8"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.10.8.tgz#49f832a4f98a53f64a6341b73b3a06f27658ffc0"
+  integrity sha512-wNyx9JqUQtAGidLWg6djGvud1fjHA+aQt+3VpUhgZDl/dxUAgzaG9SVUcWmcq0eCdtafuYXNFIWWktnrfmKduQ==
   dependencies:
-    "@oclif/core" "^2.6.3"
+    "@oclif/core" "^2.8.2"
     "@salesforce/apex-node" "^1.6.0"
-    "@salesforce/core" "^3.34.6"
-    "@salesforce/kit" "^1.9.0"
-    "@salesforce/sf-plugins-core" "^2.2.7"
+    "@salesforce/core" "^3.36.0"
+    "@salesforce/kit" "^1.9.2"
+    "@salesforce/sf-plugins-core" "^2.4.0"
     "@salesforce/source-deploy-retrieve" "^8.0.1"
-    "@salesforce/source-tracking" "^3.1.0"
+    "@salesforce/source-tracking" "^3.1.2"
     chalk "^4.1.2"
     got "^11.8.6"
     proxy-agent "^5.0.0"
@@ -1036,28 +1036,29 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.1.tgz#2d1bfdcf593caaa04cd4b3e6fe621097ff7f28fe"
   integrity sha512-MRqU+tn8w5IFvZ0Lm9YKLgxYxr2MQMI+fXXsTrwfUnijsps+ybF9IOTu6MOMxxl2vCUkO8XDjA435wXlWSLI6g==
 
-"@salesforce/sf-plugins-core@^2.0.1", "@salesforce/sf-plugins-core@^2.2.7", "@salesforce/sf-plugins-core@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.4.0.tgz#625aa3601c0ea3c27abba9fe510ded6e9fd82546"
-  integrity sha512-IOcWeljHB2byDDIn3J18c4MIURHOJ8fQ0TkKVQ9t3rIITj/I/QOwB2yYloGntFvvsFMnDV3NS+IL+rOuq6iRxg==
+"@salesforce/sf-plugins-core@^2.0.1", "@salesforce/sf-plugins-core@^2.4.0", "@salesforce/sf-plugins-core@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.4.2.tgz#86329d8df9a8704a58db8989a31414376fdcf79e"
+  integrity sha512-X2KuYhC0vQN53j+10dDch3MbDAQMsldgyW8m8UrKcya12puJcyVv41PHw5XhrPk532/dFu8iCDjQ4tl2Pq4/RA==
   dependencies:
-    "@oclif/core" "^2.8.2"
-    "@salesforce/core" "^3.35.0"
+    "@oclif/core" "^2.8.5"
+    "@salesforce/core" "^3.36.0"
     "@salesforce/kit" "^1.9.2"
     "@salesforce/ts-types" "^1.7.3"
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/source-deploy-retrieve@^8.0.1", "@salesforce/source-deploy-retrieve@^8.0.7":
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-8.0.7.tgz#8dcc2375395e04acec8f5f8340fa9a2d7a11577e"
-  integrity sha512-mFRq59nI2uFx1WKSge9VIEEIYjKOsQ7TQhhRDpPmGayTttHk8bmLb4/+MhQQwM/zykcxBG1c+tO81x8fvgrW1A==
+"@salesforce/source-deploy-retrieve@^8.0.1", "@salesforce/source-deploy-retrieve@^8.4.0":
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-8.4.0.tgz#10cadb7a02dc4657c5b941161b30a5017dabd788"
+  integrity sha512-eAOuhmbNAMoJdvhdzF1cBtqNIG/WhLR/GRCA89wevvPLidCdzMNzNGPUQWO0N+PSVWskRbbNeZG3n9ws4SV1vA==
   dependencies:
     "@salesforce/core" "^3.36.0"
     "@salesforce/kit" "^1.9.2"
     "@salesforce/ts-types" "^1.7.2"
     archiver "^5.3.1"
-    fast-xml-parser "^4.1.4"
+    fast-levenshtein "^3.0.0"
+    fast-xml-parser "^4.2.2"
     got "^11.8.6"
     graceful-fs "^4.2.11"
     ignore "^5.2.4"
@@ -1067,14 +1068,14 @@
     proxy-from-env "^1.1.0"
     unzipper "0.10.11"
 
-"@salesforce/source-tracking@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-3.1.1.tgz#a25b6693c24c7288c35151826616dfb8175f9275"
-  integrity sha512-ivnw1eBzRwTqhLu+lZnU3sasHvEgf0FoUgFDMRgSEs+c2PVmXIhhF/uYbN2mUdhlwcPY1sMKJZ2C4pM26DhSyg==
+"@salesforce/source-tracking@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-3.1.2.tgz#a922820eb6e144b60feb30e669000e41ee6ea6ea"
+  integrity sha512-8TV1El0gzhMbyoqd1beFhJtyBeOspI4J2tHP0lFMs5DfAO2W8PiQtm4uCwo/Ldi2u1s3JGfCN8FFaW5GyI93FQ==
   dependencies:
-    "@salesforce/core" "^3.34.6"
+    "@salesforce/core" "^3.36.1"
     "@salesforce/kit" "^1.9.2"
-    "@salesforce/source-deploy-retrieve" "^8.0.1"
+    "@salesforce/source-deploy-retrieve" "^8.4.0"
     graceful-fs "^4.2.11"
     isomorphic-git "1.23.0"
     ts-retry-promise "^0.7.0"
@@ -3423,10 +3424,10 @@ fast-levenshtein@^3.0.0:
   dependencies:
     fastest-levenshtein "^1.0.7"
 
-fast-xml-parser@^4.1.4:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.0.tgz#6db2ba33b95b8b4af93f94fe024d4b4d02a50855"
-  integrity sha512-+zVQv4aVTO+o8oRUyRL7PjgeVo1J6oP8Cw2+a8UTZQcj5V0yUK5T63gTN0ldgiHDPghUjKc4OpT6SwMTwnOQug==
+fast-xml-parser@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.2.tgz#cb7310d1e9cf42d22c687b0fae41f3c926629368"
+  integrity sha512-DLzIPtQqmvmdq3VUKR7T6omPK/VCRNqgFlGtbESfyhcH2R4I8EzK1/K6E8PkRCK2EabWrUHK32NjYRbEFnnz0Q==
   dependencies:
     strnum "^1.0.5"
 

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {`
`190`	`190`	`this.logSuccess(messages.getMessage('success'));`
`191`	`191`	`}`
`192`	`192`
`193`		`- return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo.Id };`
	`193`	`+ return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };`
`194`	`194`	`} catch (error) {`
`195`	`195`	`if (error instanceof SfError && error.name === 'ScratchOrgInfoTimeoutError') {`
`196`	`196`	`this.spinner.stop(lastStatus);`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {`
`70`	`70`
`71`	`71`	`this.log();`
`72`	`72`	`this.logSuccess(messages.getMessage('success'));`
`73`		`- return { username, scratchOrgInfo, authFields, warnings, orgId: scratchOrgInfo?.Id };`
	`73`	`+ return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };`
`74`	`74`	`}`
`75`	`75`	`}`