@salesforce/plugin-org 2.10.9 → 2.10.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -15
- package/lib/commands/org/resume/sandbox.js +3 -3
- package/lib/commands/org/resume/sandbox.js.map +1 -1
- package/lib/shared/orgListUtil.js +15 -10
- package/lib/shared/orgListUtil.js.map +1 -1
- package/lib/shared/sandboxCommandBase.d.ts +1 -0
- package/lib/shared/sandboxCommandBase.js +26 -0
- package/lib/shared/sandboxCommandBase.js.map +1 -1
- package/messages/sandboxbase.md +5 -1
- package/oclif.manifest.json +1 -1
- package/package.json +9 -9
package/README.md
CHANGED
|
@@ -160,7 +160,7 @@ FLAG DESCRIPTIONS
|
|
|
160
160
|
for a number of minutes, the client exits. Specify a longer wait time if timeouts occur frequently.
|
|
161
161
|
```
|
|
162
162
|
|
|
163
|
-
_See code: [src/commands/force/org/clone.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
163
|
+
_See code: [src/commands/force/org/clone.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/force/org/clone.ts)_
|
|
164
164
|
|
|
165
165
|
## `sf force:org:create`
|
|
166
166
|
|
|
@@ -208,7 +208,7 @@ EXAMPLES
|
|
|
208
208
|
$ sf force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg
|
|
209
209
|
```
|
|
210
210
|
|
|
211
|
-
_See code: [src/commands/force/org/create.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
211
|
+
_See code: [src/commands/force/org/create.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/force/org/create.ts)_
|
|
212
212
|
|
|
213
213
|
## `sf force:org:delete`
|
|
214
214
|
|
|
@@ -240,7 +240,7 @@ EXAMPLES
|
|
|
240
240
|
$ sf force:org:delete -u MyOrgAlias -p
|
|
241
241
|
```
|
|
242
242
|
|
|
243
|
-
_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
243
|
+
_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/force/org/delete.ts)_
|
|
244
244
|
|
|
245
245
|
## `sf force:org:status`
|
|
246
246
|
|
|
@@ -278,7 +278,7 @@ EXAMPLES
|
|
|
278
278
|
$ sf force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg
|
|
279
279
|
```
|
|
280
280
|
|
|
281
|
-
_See code: [src/commands/force/org/status.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
281
|
+
_See code: [src/commands/force/org/status.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/force/org/status.ts)_
|
|
282
282
|
|
|
283
283
|
## `sf org:create:sandbox`
|
|
284
284
|
|
|
@@ -383,7 +383,7 @@ FLAG DESCRIPTIONS
|
|
|
383
383
|
sandbox.
|
|
384
384
|
```
|
|
385
385
|
|
|
386
|
-
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
386
|
+
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/create/sandbox.ts)_
|
|
387
387
|
|
|
388
388
|
## `sf org:create:scratch`
|
|
389
389
|
|
|
@@ -536,7 +536,7 @@ FLAG DESCRIPTIONS
|
|
|
536
536
|
Omit this flag to have Salesforce generate a unique username for your org.
|
|
537
537
|
```
|
|
538
538
|
|
|
539
|
-
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
539
|
+
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/create/scratch.ts)_
|
|
540
540
|
|
|
541
541
|
## `sf org:delete:sandbox`
|
|
542
542
|
|
|
@@ -578,7 +578,7 @@ EXAMPLES
|
|
|
578
578
|
$ sf org:delete:sandbox --target-org my-sandbox --no-prompt
|
|
579
579
|
```
|
|
580
580
|
|
|
581
|
-
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
581
|
+
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/delete/sandbox.ts)_
|
|
582
582
|
|
|
583
583
|
## `sf org:delete:scratch`
|
|
584
584
|
|
|
@@ -620,7 +620,7 @@ EXAMPLES
|
|
|
620
620
|
$ sf org:delete:scratch --target-org my-scratch-org --no-prompt
|
|
621
621
|
```
|
|
622
622
|
|
|
623
|
-
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
623
|
+
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/delete/scratch.ts)_
|
|
624
624
|
|
|
625
625
|
## `sf org:display`
|
|
626
626
|
|
|
@@ -663,7 +663,7 @@ EXAMPLES
|
|
|
663
663
|
$ sf org:display --target-org TestOrg1 --verbose
|
|
664
664
|
```
|
|
665
665
|
|
|
666
|
-
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
666
|
+
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/display.ts)_
|
|
667
667
|
|
|
668
668
|
## `sf org:list`
|
|
669
669
|
|
|
@@ -701,7 +701,7 @@ EXAMPLES
|
|
|
701
701
|
$ sf org:list --clean
|
|
702
702
|
```
|
|
703
703
|
|
|
704
|
-
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
704
|
+
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/list.ts)_
|
|
705
705
|
|
|
706
706
|
## `sf org:list:metadata`
|
|
707
707
|
|
|
@@ -765,7 +765,7 @@ FLAG DESCRIPTIONS
|
|
|
765
765
|
Examples of metadata types that use folders are Dashboard, Document, EmailTemplate, and Report.
|
|
766
766
|
```
|
|
767
767
|
|
|
768
|
-
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
768
|
+
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/list/metadata.ts)_
|
|
769
769
|
|
|
770
770
|
## `sf org:list:metadata-types`
|
|
771
771
|
|
|
@@ -818,7 +818,7 @@ FLAG DESCRIPTIONS
|
|
|
818
818
|
Override the api version used for api requests made by this command
|
|
819
819
|
```
|
|
820
820
|
|
|
821
|
-
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
821
|
+
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/list/metadata-types.ts)_
|
|
822
822
|
|
|
823
823
|
## `sf org:open`
|
|
824
824
|
|
|
@@ -879,7 +879,7 @@ EXAMPLES
|
|
|
879
879
|
$ sf org:open --source-path force-app/main/default/flexipages/Hello.flexipage-meta.xml
|
|
880
880
|
```
|
|
881
881
|
|
|
882
|
-
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
882
|
+
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/open.ts)_
|
|
883
883
|
|
|
884
884
|
## `sf org:resume:sandbox`
|
|
885
885
|
|
|
@@ -941,7 +941,7 @@ FLAG DESCRIPTIONS
|
|
|
941
941
|
returns the job ID. To resume checking the sandbox creation, rerun this command.
|
|
942
942
|
```
|
|
943
943
|
|
|
944
|
-
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
944
|
+
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/resume/sandbox.ts)_
|
|
945
945
|
|
|
946
946
|
## `sf org:resume:scratch`
|
|
947
947
|
|
|
@@ -987,6 +987,6 @@ FLAG DESCRIPTIONS
|
|
|
987
987
|
The job ID is valid for 24 hours after you start the scratch org creation.
|
|
988
988
|
```
|
|
989
989
|
|
|
990
|
-
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.
|
|
990
|
+
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/2.10.11/src/commands/org/resume/scratch.ts)_
|
|
991
991
|
|
|
992
992
|
<!-- commandsstop -->
|
|
@@ -32,7 +32,7 @@ class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
|
|
|
32
32
|
if (latestEntry) {
|
|
33
33
|
const [, sandboxRequestData] = latestEntry;
|
|
34
34
|
if (sandboxRequestData) {
|
|
35
|
-
return {
|
|
35
|
+
return { SandboxProcessObjId: sandboxRequestData.sandboxProcessObject?.Id };
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
}
|
|
@@ -64,7 +64,7 @@ class ResumeSandbox extends sandboxCommandBase_1.SandboxCommandBase {
|
|
|
64
64
|
(await this.verifyIfAuthExists({
|
|
65
65
|
prodOrg: this.prodOrg,
|
|
66
66
|
sandboxName: this.sandboxRequestData.sandboxProcessObject.SandboxName,
|
|
67
|
-
jobId: this.flags['job-id'],
|
|
67
|
+
jobId: this.flags['job-id'] ?? this.sandboxRequestData.sandboxProcessObject.Id,
|
|
68
68
|
lifecycle,
|
|
69
69
|
}))) {
|
|
70
70
|
return this.latestSandboxProgressObj;
|
|
@@ -184,7 +184,7 @@ ResumeSandbox.flags = {
|
|
|
184
184
|
}),
|
|
185
185
|
};
|
|
186
186
|
const getSandboxProcessObject = async (prodOrg, sandboxName, jobId) => {
|
|
187
|
-
const where =
|
|
187
|
+
const where = jobId ? `Id='${jobId}'` : `SandboxName='${sandboxName}'`;
|
|
188
188
|
const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE ${where} AND Status != 'D'`;
|
|
189
189
|
try {
|
|
190
190
|
return await prodOrg.getConnection().singleRecordQuery(queryStr, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/sandbox.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAoD;AACpD,2CAY0B;AAC1B,yCAA2C;AAE3C,2EAAwE;AAExE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AAEnF,MAAqB,aAAc,SAAQ,uCAAwC;IA8C1E,KAAK,CAAC,GAAG;QACd,IAAI,CAAC,oBAAoB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjE,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAES,2BAA2B;QACnC,OAAO;YACL,IAAI,CAAC,MAAM,CAAC,GAAG;YACf,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5E,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACvG,CAAC;IACJ,CAAC;IAEO,0BAA0B;QAChC,IAAI,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,CAAC;YAC/D,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,EAAE,kBAAkB,CAAC,GAAG,WAAW,CAAC;gBAC3C,IAAI,kBAAkB,EAAE;oBACtB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -239,19 +239,11 @@ class OrgListUtil {
|
|
|
239
239
|
return 'Connected';
|
|
240
240
|
}
|
|
241
241
|
catch (err) {
|
|
242
|
-
|
|
243
|
-
const logger = await OrgListUtil.retrieveLogger();
|
|
244
|
-
logger.trace(`error refreshing auth for org: ${org.getUsername()}`);
|
|
245
|
-
logger.trace(error);
|
|
246
|
-
return (error.code ?? error.message);
|
|
242
|
+
return authErrorHandler(err, org.getUsername());
|
|
247
243
|
}
|
|
248
244
|
}
|
|
249
245
|
catch (err) {
|
|
250
|
-
|
|
251
|
-
const logger = await OrgListUtil.retrieveLogger();
|
|
252
|
-
logger.trace(`error refreshing auth for org: ${username}`);
|
|
253
|
-
logger.trace(error);
|
|
254
|
-
return (error.code ?? error.message ?? 'Unknown');
|
|
246
|
+
return authErrorHandler(err, username);
|
|
255
247
|
}
|
|
256
248
|
}
|
|
257
249
|
}
|
|
@@ -279,4 +271,17 @@ const removeRestrictedInfoFromConfig = (config, properties = ['refreshToken', 'c
|
|
|
279
271
|
const sandboxFilter = (org) => Boolean(org.isSandbox);
|
|
280
272
|
const regularOrgFilter = (org) => !org.isSandbox && !org.isDevHub;
|
|
281
273
|
const devHubFilter = (org) => Boolean(org.isDevHub);
|
|
274
|
+
const authErrorHandler = async (err, username) => {
|
|
275
|
+
const error = err;
|
|
276
|
+
const logger = await OrgListUtil.retrieveLogger();
|
|
277
|
+
logger.trace(`error refreshing auth for org: ${username}`);
|
|
278
|
+
logger.trace(error);
|
|
279
|
+
// Orgs under maintenace return html as the error message.
|
|
280
|
+
if (error.message.includes('maintenance'))
|
|
281
|
+
return 'Down (Maintenance)';
|
|
282
|
+
// handle other potential html responses
|
|
283
|
+
if (error.message.includes('<html>'))
|
|
284
|
+
return 'Bad Response';
|
|
285
|
+
return (error.code ?? error.message);
|
|
286
|
+
};
|
|
282
287
|
//# sourceMappingURL=orgListUtil.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAsC;AACtC,kCAAkC;AAElC,2CAS0B;AAC1B,mDAAgD;AAEhD,6CAA2C;AAC3C,mCAA6C;AA4B7C,MAAa,WAAW;IAGf,MAAM,CAAC,KAAK,CAAC,cAAc;QAChC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvB,WAAW,CAAC,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SACxD;QACD,OAAO,WAAW,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,+CAA+C,CACjE,aAAuB,EACvB,cAAc,GAAG,KAAK;QAEtB,MAAM,QAAQ,GAAe,MAAM,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEnD,8CAA8C;QAC9C,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtD,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACvC,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACtC,mDAAmD;oBACnD,MAAM,CAAC,eAAe,GAAG,MAAM,WAAW,CAAC,wCAAwC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACrG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,eAAe,KAAK,WAAW,EAAE;wBAC9D,0GAA0G;wBAC1G,MAAM,CAAC,QAAQ,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;qBACjF;iBACF;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CACH;YAED,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC;SACjD,CAAC,CAAC;QAEH,OAAO;YACL,cAAc;YACd,WAAW;YACX,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC;YAC/C,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAC9C,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC;SAC7C,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,kBAAkB,CACpC,WAAwC;QAExC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC1D,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,qBAAqB,CAAC,GAAG,CACvB,MAAM,CAAC,cAAc,EACrB,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1F,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,CACtB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE,EAAE,CACjE,WAAW,CAAC,gCAAgC,CAAC,cAAc,EAAE,MAAM,CAAC,CACrE,CACF,CACF,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEvE,OAAO,WAAW,CAAC,oBAAoB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAmB;QACnD,yCAAyC;QACzC,iDAAiD;QACjD,MAAM,EAAE,CAAC,KAAK,CAAC,aAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAErD,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAgB,EAAE,EAAE,CACnF,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CACpC,CAAC;QAEF,MAAM,QAAQ,GAAgC,MAAM,OAAO,CAAC,GAAG,CAC7D,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC/B,IAAI;gBACF,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAChD,MAAM,IAAI,GAAG,MAAM,eAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;gBAE9D,MAAM,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC;gBAExC,6CAA6C;gBAC7C,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,IAAI,CAAC;iBACb;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;gBAErC,MAAM,WAAW,GAAG,GAAG,KAAK,OAAO,CAAC;gBACpC,0IAA0I;gBAC1I,IAAI,KAAK,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,8FAA8F;gBAC9F,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;oBACtC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAA,WAAI,EAAC,aAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAE9F,CAAC;oBACF,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;oBAC3C,IAAI,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;wBAC3D,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,GAAG,GAAG,KAAgB,CAAC;gBAC7B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,WAAW,CAAC,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA,mBAAkB,CAAA,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAqB;QACjD,MAAM,gBAAgB,GAAG,MAAM,uBAAgB,CAAC,MAAM,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAA2D,EAAE;YACxF,sCAAsC;YACtC,IAAI,YAA8B,CAAC;YACnC,IAAI;gBACF,+FAA+F;gBAC/F,YAAY,GAAG,8BAA8B,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAqB,CAAC,CAAC;aAC7F;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,oBAAoB,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAC1D,YAAY,GAAG,8BAA8B,CAAC,QAAQ,CAAC,SAAS,EAAsB,CAAC,CAAC;aACzF;YAED,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAA,0BAAkB,EAAC,YAAY,CAAC,QAAQ,CAAC;gBACzC,EAAE,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,aAAM,CAAC,QAAQ,EAAE,GAAG,YAAY,CAAC,QAAQ,OAAO,CAAC,CAAC;aAChE,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,mBAAmB,CAAC,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC;gBACpE,QAAQ,EAAE,QAAQ,CAAC,KAAK;gBACxB,KAAK;aACN,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,OAAO;YACL,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,IAAI,MAAM,CAAgC;YAClG,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC,CAAC;SAC1E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAClD,cAAsB,EACtB,aAAuB;QAEvB,MAAM,MAAM,GAAG;YACb,aAAa;YACb,SAAS;YACT,QAAQ;YACR,gBAAgB;YAChB,WAAW;YACX,SAAS;YACT,oBAAoB;YACpB,gBAAgB;SACjB,CAAC;QAEF,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI;iBACpB,OAAO,CAAC,gBAAgB,CAAC;iBACzB,IAAI,CAAyB,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxB,GAAG,GAAG;gBACN,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE;aAClC,CAAC,CAAC,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,QAAQ,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC;YACnF,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACtC,eAAgE,EAChE,IAAiC;QAEjC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEpF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,cAAc,EAA2C,EAAE;YACnF,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC/D,OAAO,cAAc;gBACnB,CAAC,CAAC;oBACE,GAAG,cAAc;oBACjB,cAAc,EAAE,cAAc,CAAC,cAAc;oBAC7C,SAAS,EAAE,cAAc,CAAC,SAAS,CAAC,QAAQ;oBAC5C,WAAW,EAAE,cAAc,CAAC,WAAW;oBACvC,WAAW,EAAE,cAAc,CAAC,WAAW;oBACvC,QAAQ,EAAE,cAAc,CAAC,WAAW;oBACpC,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,cAAc,EAAE,cAAc,CAAC,cAAc;oBAC7C,SAAS,EAAE,cAAc,CAAC,MAAM,KAAK,SAAS;oBAC9C,SAAS,EAAE,cAAc,CAAC,SAAS;iBACpC;gBACH,CAAC,CAAC,cAAc,cAAc,CAAC,QAAQ,0BAA0B,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAa,CAAC;QACpF,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;YAClD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAqC,CAAC;IACpG,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,QAAgB;QAC7D,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5D,uEAAuE;YACvE,OAAO,MAAM,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC7C;QAAC,MAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,QAAgB;QAC3E,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,UAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE5D,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;gBAC7C,OAAO;aACR;YAED,IAAI;gBACF,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;gBACxB,OAAO,WAAW,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,EAAY,CAAC,CAAC;aAC3D;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACxC;IACH,CAAC;CACF;AA9RD,kCA8RC;AAEM,MAAM,yBAAyB,GAAG,CAAC,GAAmC,EAAW,EAAE,CACxF,QAAQ,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC;AADhC,QAAA,yBAAyB,6BACO;AAE7C,gCAAgC;AAChC,MAAM,mBAAmB,GAAG,CAC1B,OAAyB,EACzB,MAAwB,EACwB,EAAE;IAClD,6DAA6D;IAC7D,MAAM,gBAAgB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3E,OAAO;QACL,GAAG,OAAO;QACV,uBAAuB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,0BAAmB,CAAC,cAAc,CAAC,CAAC;QAC/G,iBAAiB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,0BAAmB,CAAC,UAAU,CAAC,CAAC;KACtG,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,8BAA8B,GAAG,CACrC,MAAwB,EACxB,aAAuB,CAAC,cAAc,EAAE,cAAc,CAAC,EACrC,EAAE,CAAC,IAAA,UAAI,EAA0D,MAAM,EAAE,UAAU,CAAC,CAAC;AAEzG,MAAM,aAAa,GAAG,CAAC,GAAqB,EAAW,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACjF,MAAM,gBAAgB,GAAG,CAAC,GAAqB,EAAW,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC7F,MAAM,YAAY,GAAG,CAAC,GAAqB,EAAW,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAE/E,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAY,EAAE,QAAgB,EAAmB,EAAE;IACjF,MAAM,KAAK,GAAG,GAAc,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC;IAClD,MAAM,CAAC,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;IAC3D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,0DAA0D;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;QAAE,OAAO,oBAAoB,CAAC;IACvE,wCAAwC;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,cAAc,CAAC;IAC5D,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAW,CAAC;AACjD,CAAC,CAAC"}
|
|
@@ -28,6 +28,7 @@ export declare abstract class SandboxCommandBase<T> extends SfCommand<T> {
|
|
|
28
28
|
protected updateStage(stage: string | undefined, state: State): void;
|
|
29
29
|
protected updateSandboxRequestData(): void;
|
|
30
30
|
protected saveSandboxProgressConfig(): void;
|
|
31
|
+
protected finally(_: Error | undefined): Promise<any>;
|
|
31
32
|
private removeSandboxProgressConfig;
|
|
32
33
|
protected abstract getCheckSandboxStatusParams(): string[];
|
|
33
34
|
}
|
|
@@ -114,6 +114,20 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
114
114
|
this.updateProgress(results, options.isAsync);
|
|
115
115
|
this.reportResults(results);
|
|
116
116
|
});
|
|
117
|
+
lifecycle.on(core_1.SandboxEvents.EVENT_MULTIPLE_SBX_PROCESSES, async (results) => {
|
|
118
|
+
const [resumingProcess, ...otherSbxProcesses] = results;
|
|
119
|
+
const sbxProcessIds = otherSbxProcesses.map((sbxProcess) => sbxProcess.Id);
|
|
120
|
+
const sbxProcessStatuses = otherSbxProcesses.map((sbxProcess) => sbxProcess.Status);
|
|
121
|
+
this.warn(messages.getMessage('warning.MultipleMatchingSandboxProcesses', [
|
|
122
|
+
otherSbxProcesses[0].SandboxName,
|
|
123
|
+
sbxProcessIds.toString(),
|
|
124
|
+
sbxProcessStatuses.toString(),
|
|
125
|
+
resumingProcess.Id,
|
|
126
|
+
sbxProcessIds[0],
|
|
127
|
+
this.prodOrg?.getUsername(),
|
|
128
|
+
]));
|
|
129
|
+
return Promise.resolve();
|
|
130
|
+
});
|
|
117
131
|
}
|
|
118
132
|
reportResults(results) {
|
|
119
133
|
this.log();
|
|
@@ -157,6 +171,18 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
157
171
|
this.sandboxRequestConfig.writeSync();
|
|
158
172
|
}
|
|
159
173
|
}
|
|
174
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
175
|
+
async finally(_) {
|
|
176
|
+
const lifecycle = core_1.Lifecycle.getInstance();
|
|
177
|
+
lifecycle.removeAllListeners('POLLING_TIME_OUT');
|
|
178
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_RESUME);
|
|
179
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_ASYNC_RESULT);
|
|
180
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_STATUS);
|
|
181
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_AUTH);
|
|
182
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_RESULT);
|
|
183
|
+
lifecycle.removeAllListeners(core_1.SandboxEvents.EVENT_MULTIPLE_SBX_PROCESSES);
|
|
184
|
+
return super.finally(_);
|
|
185
|
+
}
|
|
160
186
|
removeSandboxProgressConfig() {
|
|
161
187
|
if (this.latestSandboxProgressObj?.SandboxName) {
|
|
162
188
|
this.sandboxRequestConfig.unset(this.latestSandboxProgressObj.SandboxName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxCommandBase.js","sourceRoot":"","sources":["../../src/shared/sandboxCommandBase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sandboxCommandBase.js","sourceRoot":"","sources":["../../src/shared/sandboxCommandBase.ts"],"names":[],"mappings":"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"}
|
package/messages/sandboxbase.md
CHANGED
|
@@ -14,4 +14,8 @@ If the org is ready, checking the status also authorizes the org for use with Sa
|
|
|
14
14
|
|
|
15
15
|
# warning.ClientTimeoutWaitingForSandboxCreate
|
|
16
16
|
|
|
17
|
-
The wait time for the sandbox creation has been exhausted.
|
|
17
|
+
The wait time for the sandbox creation has been exhausted. See the results below for more information.
|
|
18
|
+
|
|
19
|
+
# warning.MultipleMatchingSandboxProcesses
|
|
20
|
+
|
|
21
|
+
We found multiple sandbox processes for "%s" in a resumable state. We're ignoring the sandbox process ID(s) "%s" in status(es) "%s" and using the most recent process ID "%s". To resume a different sandbox process, use that unique sandbox process ID with the command. For example, "sf org resume sandbox --job-id %s -o %s".
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-org",
|
|
3
3
|
"description": "Commands to interact with Salesforce orgs",
|
|
4
|
-
"version": "2.10.
|
|
4
|
+
"version": "2.10.11",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"@oclif/core": "^2.15.0",
|
|
10
|
-
"@salesforce/core": "^5.
|
|
10
|
+
"@salesforce/core": "^5.3.4",
|
|
11
11
|
"@salesforce/kit": "^3.0.9",
|
|
12
12
|
"@salesforce/sf-plugins-core": "^3.1.22",
|
|
13
13
|
"@salesforce/source-deploy-retrieve": "^9.7.13",
|
|
@@ -19,15 +19,15 @@
|
|
|
19
19
|
"@salesforce/cli-plugins-testkit": "^4.3.6",
|
|
20
20
|
"@salesforce/dev-config": "^4.0.1",
|
|
21
21
|
"@salesforce/dev-scripts": "^5.10.0",
|
|
22
|
-
"@salesforce/plugin-command-reference": "^3.0.
|
|
23
|
-
"@salesforce/plugin-source": "^2.10.
|
|
22
|
+
"@salesforce/plugin-command-reference": "^3.0.38",
|
|
23
|
+
"@salesforce/plugin-source": "^2.10.38",
|
|
24
24
|
"@salesforce/prettier-config": "^0.0.3",
|
|
25
|
-
"@salesforce/ts-sinon": "1.4.
|
|
25
|
+
"@salesforce/ts-sinon": "1.4.17",
|
|
26
26
|
"@swc/core": "1.3.39",
|
|
27
27
|
"@types/shelljs": "^0.8.12",
|
|
28
28
|
"@typescript-eslint/eslint-plugin": "^5.61.0",
|
|
29
29
|
"@typescript-eslint/parser": "^5.61.0",
|
|
30
|
-
"chai": "^4.3.
|
|
30
|
+
"chai": "^4.3.10",
|
|
31
31
|
"eslint": "^8.49.0",
|
|
32
32
|
"eslint-config-prettier": "^8.10.0",
|
|
33
33
|
"eslint-config-salesforce": "^2.0.2",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"mocha": "^10.2.0",
|
|
42
42
|
"moment": "^2.29.1",
|
|
43
43
|
"nyc": "^15.1.0",
|
|
44
|
-
"oclif": "^3.17.
|
|
44
|
+
"oclif": "^3.17.2",
|
|
45
45
|
"prettier": "^2.8.8",
|
|
46
46
|
"pretty-quick": "^3.1.0",
|
|
47
47
|
"shelljs": "^0.8.5",
|
|
@@ -236,7 +236,7 @@
|
|
|
236
236
|
}
|
|
237
237
|
},
|
|
238
238
|
"sfdx": {
|
|
239
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.10.
|
|
240
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.10.
|
|
239
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.10.11.crt",
|
|
240
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.10.11.sig"
|
|
241
241
|
}
|
|
242
242
|
}
|