@salesforce/plugin-org 4.5.11-dev.0 → 4.6.0
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 +14 -14
- package/lib/commands/org/create/sandbox.js +13 -0
- package/lib/commands/org/create/sandbox.js.map +1 -1
- package/lib/commands/org/create/scratch.js +15 -46
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/refresh/sandbox.js +12 -0
- package/lib/commands/org/refresh/sandbox.js.map +1 -1
- package/lib/commands/org/resume/scratch.js +9 -43
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/shared/sandboxRequest.d.ts +17 -4
- package/lib/shared/sandboxRequest.js +29 -2
- package/lib/shared/sandboxRequest.js.map +1 -1
- package/lib/shared/scratchOrgOutput.d.ts +9 -0
- package/lib/shared/scratchOrgOutput.js +36 -0
- package/lib/shared/scratchOrgOutput.js.map +1 -0
- package/messages/clone.md +16 -0
- package/oclif.manifest.json +1 -1
- package/package.json +5 -7
package/README.md
CHANGED
|
@@ -229,7 +229,7 @@ FLAG DESCRIPTIONS
|
|
|
229
229
|
sandbox.
|
|
230
230
|
```
|
|
231
231
|
|
|
232
|
-
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
232
|
+
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/create/sandbox.ts)_
|
|
233
233
|
|
|
234
234
|
## `sf org create scratch`
|
|
235
235
|
|
|
@@ -383,7 +383,7 @@ FLAG DESCRIPTIONS
|
|
|
383
383
|
Omit this flag to have Salesforce generate a unique username for your org.
|
|
384
384
|
```
|
|
385
385
|
|
|
386
|
-
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
386
|
+
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/create/scratch.ts)_
|
|
387
387
|
|
|
388
388
|
## `sf org delete sandbox`
|
|
389
389
|
|
|
@@ -429,7 +429,7 @@ EXAMPLES
|
|
|
429
429
|
$ sf org delete sandbox --target-org my-sandbox --no-prompt
|
|
430
430
|
```
|
|
431
431
|
|
|
432
|
-
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
432
|
+
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/delete/sandbox.ts)_
|
|
433
433
|
|
|
434
434
|
## `sf org delete scratch`
|
|
435
435
|
|
|
@@ -473,7 +473,7 @@ EXAMPLES
|
|
|
473
473
|
$ sf org delete scratch --target-org my-scratch-org --no-prompt
|
|
474
474
|
```
|
|
475
475
|
|
|
476
|
-
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
476
|
+
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/delete/scratch.ts)_
|
|
477
477
|
|
|
478
478
|
## `sf org disable tracking`
|
|
479
479
|
|
|
@@ -512,7 +512,7 @@ EXAMPLES
|
|
|
512
512
|
$ sf org disable tracking
|
|
513
513
|
```
|
|
514
514
|
|
|
515
|
-
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
515
|
+
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/disable/tracking.ts)_
|
|
516
516
|
|
|
517
517
|
## `sf org display`
|
|
518
518
|
|
|
@@ -557,7 +557,7 @@ EXAMPLES
|
|
|
557
557
|
$ sf org display --target-org TestOrg1 --verbose
|
|
558
558
|
```
|
|
559
559
|
|
|
560
|
-
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
560
|
+
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/display.ts)_
|
|
561
561
|
|
|
562
562
|
## `sf org enable tracking`
|
|
563
563
|
|
|
@@ -599,7 +599,7 @@ EXAMPLES
|
|
|
599
599
|
$ sf org enable tracking
|
|
600
600
|
```
|
|
601
601
|
|
|
602
|
-
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
602
|
+
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/enable/tracking.ts)_
|
|
603
603
|
|
|
604
604
|
## `sf org list`
|
|
605
605
|
|
|
@@ -638,7 +638,7 @@ EXAMPLES
|
|
|
638
638
|
$ sf org list --clean
|
|
639
639
|
```
|
|
640
640
|
|
|
641
|
-
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
641
|
+
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/list.ts)_
|
|
642
642
|
|
|
643
643
|
## `sf org list metadata`
|
|
644
644
|
|
|
@@ -705,7 +705,7 @@ FLAG DESCRIPTIONS
|
|
|
705
705
|
Examples of metadata types that use folders are Dashboard, Document, EmailTemplate, and Report.
|
|
706
706
|
```
|
|
707
707
|
|
|
708
|
-
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
708
|
+
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/list/metadata.ts)_
|
|
709
709
|
|
|
710
710
|
## `sf org list metadata-types`
|
|
711
711
|
|
|
@@ -760,7 +760,7 @@ FLAG DESCRIPTIONS
|
|
|
760
760
|
Override the api version used for api requests made by this command
|
|
761
761
|
```
|
|
762
762
|
|
|
763
|
-
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
763
|
+
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/list/metadata-types.ts)_
|
|
764
764
|
|
|
765
765
|
## `sf org open`
|
|
766
766
|
|
|
@@ -832,7 +832,7 @@ EXAMPLES
|
|
|
832
832
|
$ sf org open --source-file force-app/main/default/flows/Hello.flow-meta.xml
|
|
833
833
|
```
|
|
834
834
|
|
|
835
|
-
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
835
|
+
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/open.ts)_
|
|
836
836
|
|
|
837
837
|
## `sf org refresh sandbox`
|
|
838
838
|
|
|
@@ -909,7 +909,7 @@ FLAG DESCRIPTIONS
|
|
|
909
909
|
By default, a sandbox auto-activates after a refresh. Use this flag to control sandbox activation manually.
|
|
910
910
|
```
|
|
911
911
|
|
|
912
|
-
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
912
|
+
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/refresh/sandbox.ts)_
|
|
913
913
|
|
|
914
914
|
## `sf org resume sandbox`
|
|
915
915
|
|
|
@@ -972,7 +972,7 @@ FLAG DESCRIPTIONS
|
|
|
972
972
|
returns the job ID. To resume checking the sandbox creation, rerun this command.
|
|
973
973
|
```
|
|
974
974
|
|
|
975
|
-
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
975
|
+
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/resume/sandbox.ts)_
|
|
976
976
|
|
|
977
977
|
## `sf org resume scratch`
|
|
978
978
|
|
|
@@ -1019,6 +1019,6 @@ FLAG DESCRIPTIONS
|
|
|
1019
1019
|
The job ID is valid for 24 hours after you start the scratch org creation.
|
|
1020
1020
|
```
|
|
1021
1021
|
|
|
1022
|
-
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.
|
|
1022
|
+
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.6.0/src/commands/org/resume/scratch.ts)_
|
|
1023
1023
|
|
|
1024
1024
|
<!-- commandsstop -->
|
|
@@ -124,9 +124,22 @@ export default class CreateSandbox extends SandboxCommandBase {
|
|
|
124
124
|
const { sandboxReq } = !this.flags.clone
|
|
125
125
|
? await requestFunctions.createSandboxRequest(false, this.flags['definition-file'], undefined, requestOptions)
|
|
126
126
|
: await requestFunctions.createSandboxRequest(true, this.flags['definition-file'], undefined, requestOptions);
|
|
127
|
+
let apexId;
|
|
128
|
+
let groupId;
|
|
129
|
+
// Determine which value to use
|
|
130
|
+
if (sandboxReq.ApexClassName) {
|
|
131
|
+
apexId = await requestFunctions.getApexClassIdByName(this.flags['target-org'].getConnection(), sandboxReq.ApexClassName); // convert name to ID
|
|
132
|
+
delete sandboxReq.ApexClassName;
|
|
133
|
+
}
|
|
134
|
+
if (sandboxReq.ActivationUserGroupName) {
|
|
135
|
+
groupId = await requestFunctions.getUserGroupIdByName(this.flags['target-org'].getConnection(), sandboxReq.ActivationUserGroupName);
|
|
136
|
+
delete sandboxReq.ActivationUserGroupName;
|
|
137
|
+
}
|
|
127
138
|
return {
|
|
128
139
|
...sandboxReq,
|
|
129
140
|
...(this.flags.clone ? { SourceId: await this.getSourceId() } : {}),
|
|
141
|
+
...(apexId ? { ApexClassId: apexId } : {}),
|
|
142
|
+
...(groupId ? { ActivationUserGroupId: groupId } : {}),
|
|
130
143
|
};
|
|
131
144
|
}
|
|
132
145
|
async createSandbox() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/create/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAkB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE/F,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAA0B,MAAM,uCAAuC,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AAEnF,MAAM,eAAe,GAAG,GAAa,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAI1E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,kBAA0C;IAC5E,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,CAAU,OAAO,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACjD,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,MAAM,CAAC,KAAK,GAAG;QACpB,+CAA+C;QAC/C,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC;YAC5B,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;YAC5D,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC;SACrE,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;SACzD,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;SAC5D,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC1D,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,SAAS,EAAE,WAAW;YACtB,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC;YAC9B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC3D,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,SAAS,EAAE,WAAW;YACtB,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC3D,SAAS,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC;SACrC,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC1D,KAAK,EAAE,CAAC,IAAY,EAAmB,EAAE;gBACvC,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;oBACrB,MAAM,QAAQ,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChE,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;SACF,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC3D,SAAS,EAAE,CAAC,cAAc,CAAC;SAC5B,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,MAAM,CAAqB;YAC/C,OAAO,EAAE,eAAe,EAAE;SAC3B,CAAC,CAAC;YACD,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC;YAC9B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACvD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC/D,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;SACvD,CAAC;QACF,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;YAC7D,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC;YACrE,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IACM,KAAK,CAAwD;IAE9D,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,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,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,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAY;SACjD,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,yFAAyF;QACzF,MAAM,cAAc,GAAG;YACrB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxG,CAAC;QACF,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK;YACtC,CAAC,CAAC,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC;YAC9G,CAAC,CAAC,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/create/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,11 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
8
|
-
import { Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, SfError, } from '@salesforce/core';
|
|
7
|
+
import { Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, SfError, } from '@salesforce/core';
|
|
9
8
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
10
9
|
import { Duration } from '@salesforce/kit';
|
|
11
|
-
import terminalLink from 'terminal-link';
|
|
12
10
|
import { buildScratchOrgRequest } from '../../../shared/scratchOrgRequest.js';
|
|
11
|
+
import { buildStatus } from '../../../shared/scratchOrgOutput.js';
|
|
13
12
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
14
13
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'create_scratch');
|
|
15
14
|
const definitionFileHelpGroupName = 'Definition File Override';
|
|
@@ -150,54 +149,24 @@ export default class OrgCreateScratch extends SfCommand {
|
|
|
150
149
|
throw new SfError('No instance URL found for the dev hub');
|
|
151
150
|
}
|
|
152
151
|
const createCommandOptions = await buildScratchOrgRequest(flags, flags['client-id'] ? await this.secretPrompt({ message: messages.getMessage('prompt.secret') }) : undefined);
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
bold: true,
|
|
164
|
-
},
|
|
165
|
-
{
|
|
166
|
-
label: 'OrgId',
|
|
167
|
-
type: 'dynamic-key-value',
|
|
168
|
-
get: (data) => data?.scratchOrgInfo?.ScratchOrg,
|
|
169
|
-
bold: true,
|
|
170
|
-
color: 'cyan',
|
|
171
|
-
},
|
|
172
|
-
{
|
|
173
|
-
label: 'Username',
|
|
174
|
-
type: 'dynamic-key-value',
|
|
175
|
-
get: (data) => data?.scratchOrgInfo?.SignupUsername,
|
|
176
|
-
bold: true,
|
|
177
|
-
color: 'cyan',
|
|
178
|
-
},
|
|
179
|
-
{
|
|
180
|
-
label: 'Alias',
|
|
181
|
-
type: 'static-key-value',
|
|
182
|
-
get: (data) => data?.alias,
|
|
183
|
-
},
|
|
184
|
-
],
|
|
185
|
-
});
|
|
186
|
-
lifecycle.on(scratchOrgLifecycleEventName, async (data) => {
|
|
187
|
-
mso.skipTo(data.stage, data);
|
|
188
|
-
if (data.stage === 'done') {
|
|
189
|
-
mso.stop();
|
|
190
|
-
}
|
|
191
|
-
return Promise.resolve();
|
|
192
|
-
});
|
|
152
|
+
let lastStatus;
|
|
153
|
+
if (!flags.async) {
|
|
154
|
+
lifecycle.on(scratchOrgLifecycleEventName, async (data) => {
|
|
155
|
+
lastStatus = buildStatus(data, baseUrl);
|
|
156
|
+
this.spinner.status = lastStatus;
|
|
157
|
+
return Promise.resolve();
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
this.log();
|
|
161
|
+
this.spinner.start(flags.async ? 'Requesting Scratch Org (will not wait for completion because --async)' : 'Creating Scratch Org');
|
|
193
162
|
try {
|
|
194
163
|
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgCreate(createCommandOptions);
|
|
164
|
+
this.spinner.stop(lastStatus);
|
|
195
165
|
if (!scratchOrgInfo) {
|
|
196
166
|
throw new SfError('The scratch org did not return with any information');
|
|
197
167
|
}
|
|
168
|
+
this.log();
|
|
198
169
|
if (flags.async) {
|
|
199
|
-
mso.skipTo('done', { scratchOrgInfo });
|
|
200
|
-
mso.stop();
|
|
201
170
|
this.info(messages.getMessage('action.resume', [this.config.bin, scratchOrgInfo.Id]));
|
|
202
171
|
}
|
|
203
172
|
else {
|
|
@@ -206,8 +175,8 @@ export default class OrgCreateScratch extends SfCommand {
|
|
|
206
175
|
return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
|
|
207
176
|
}
|
|
208
177
|
catch (error) {
|
|
209
|
-
mso.error();
|
|
210
178
|
if (error instanceof SfError && error.name === 'ScratchOrgInfoTimeoutError') {
|
|
179
|
+
this.spinner.stop(lastStatus);
|
|
211
180
|
const scratchOrgInfoId = error.data.scratchOrgInfoId;
|
|
212
181
|
const resumeMessage = messages.getMessage('action.resume', [this.config.bin, scratchOrgInfoId]);
|
|
213
182
|
this.info(resumeMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,6 +160,16 @@ export default class RefreshSandbox extends SandboxCommandBase {
|
|
|
160
160
|
if (!defFileContent?.SandboxName && !sbxName) {
|
|
161
161
|
throw messages.createError('error.NoSandboxName');
|
|
162
162
|
}
|
|
163
|
+
let apexId;
|
|
164
|
+
let groupId;
|
|
165
|
+
if (defFileContent.ApexClassName) {
|
|
166
|
+
apexId = await requestFunctions.getApexClassIdByName(this.flags['target-org'].getConnection(), defFileContent.ApexClassName); // convert name to ID
|
|
167
|
+
delete defFileContent.ApexClassName;
|
|
168
|
+
}
|
|
169
|
+
if (defFileContent.ActivationUserGroupName) {
|
|
170
|
+
groupId = await requestFunctions.getUserGroupIdByName(this.flags['target-org'].getConnection(), defFileContent.ActivationUserGroupName);
|
|
171
|
+
delete defFileContent.ActivationUserGroupName;
|
|
172
|
+
}
|
|
163
173
|
// Warn if sandbox name is in `--name` and `--definition-file` flags and they differ.
|
|
164
174
|
if (defFileContent?.SandboxName && sbxName && sbxName !== defFileContent?.SandboxName) {
|
|
165
175
|
this.warn(messages.createWarning('warning.ConflictingSandboxNames', [sbxName, defFileContent?.SandboxName]));
|
|
@@ -184,6 +194,8 @@ export default class RefreshSandbox extends SandboxCommandBase {
|
|
|
184
194
|
sandboxInfo = Object.assign(sandboxInfo, defFileContent, {
|
|
185
195
|
SandboxName: sbxName,
|
|
186
196
|
AutoActivate: !this.flags['no-auto-activate'],
|
|
197
|
+
...(apexId ? { ApexClassId: apexId } : {}),
|
|
198
|
+
...(groupId ? { ActivationUserGroupId: groupId } : {}),
|
|
187
199
|
});
|
|
188
200
|
return sandboxInfo;
|
|
189
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/refresh/sandbox.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../../src/commands/org/refresh/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,8 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { strict as assert } from 'node:assert';
|
|
8
8
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
9
|
-
import { Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName,
|
|
10
|
-
import
|
|
11
|
-
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
9
|
+
import { Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName, scratchOrgResume, SfError, } from '@salesforce/core';
|
|
10
|
+
import { buildStatus } from '../../../shared/scratchOrgOutput.js';
|
|
12
11
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
13
12
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'resume_scratch');
|
|
14
13
|
export default class OrgResumeScratch extends SfCommand {
|
|
@@ -41,56 +40,23 @@ export default class OrgResumeScratch extends SfCommand {
|
|
|
41
40
|
throw messages.createError('error.NoRecentJobId');
|
|
42
41
|
// oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
|
|
43
42
|
assert(jobId);
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
const mso = new MultiStageOutput({
|
|
47
|
-
stages: scratchOrgLifecycleStages,
|
|
48
|
-
title: 'Resuming Scratch Org',
|
|
49
|
-
data: { alias: cached?.alias },
|
|
50
|
-
jsonEnabled: this.jsonEnabled(),
|
|
51
|
-
postStagesBlock: [
|
|
52
|
-
{
|
|
53
|
-
label: 'Request Id',
|
|
54
|
-
type: 'dynamic-key-value',
|
|
55
|
-
get: (data) => data?.scratchOrgInfo?.Id && terminalLink(data.scratchOrgInfo.Id, `${hubBaseUrl}/${data.scratchOrgInfo.Id}`),
|
|
56
|
-
bold: true,
|
|
57
|
-
},
|
|
58
|
-
{
|
|
59
|
-
label: 'OrgId',
|
|
60
|
-
type: 'dynamic-key-value',
|
|
61
|
-
get: (data) => data?.scratchOrgInfo?.ScratchOrg,
|
|
62
|
-
bold: true,
|
|
63
|
-
color: 'cyan',
|
|
64
|
-
},
|
|
65
|
-
{
|
|
66
|
-
label: 'Username',
|
|
67
|
-
type: 'dynamic-key-value',
|
|
68
|
-
get: (data) => data?.scratchOrgInfo?.SignupUsername,
|
|
69
|
-
bold: true,
|
|
70
|
-
color: 'cyan',
|
|
71
|
-
},
|
|
72
|
-
{
|
|
73
|
-
label: 'Alias',
|
|
74
|
-
type: 'static-key-value',
|
|
75
|
-
get: (data) => data?.alias,
|
|
76
|
-
},
|
|
77
|
-
],
|
|
78
|
-
});
|
|
43
|
+
const hubBaseUrl = cache.get(jobId)?.hubBaseUrl;
|
|
44
|
+
let lastStatus;
|
|
79
45
|
lifecycle.on(scratchOrgLifecycleEventName, async (data) => {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
mso.stop();
|
|
83
|
-
}
|
|
46
|
+
lastStatus = buildStatus(data, hubBaseUrl);
|
|
47
|
+
this.spinner.status = lastStatus;
|
|
84
48
|
return Promise.resolve();
|
|
85
49
|
});
|
|
50
|
+
this.log();
|
|
51
|
+
this.spinner.start('Creating Scratch Org');
|
|
86
52
|
try {
|
|
87
53
|
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId);
|
|
54
|
+
this.spinner.stop(lastStatus);
|
|
88
55
|
this.log();
|
|
89
56
|
this.logSuccess(messages.getMessage('success'));
|
|
90
57
|
return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
|
|
91
58
|
}
|
|
92
59
|
catch (e) {
|
|
93
|
-
mso.error();
|
|
94
60
|
if (cache.keys() && e instanceof Error && e.name === 'CacheMissError') {
|
|
95
61
|
// we have something in the cache, but it didn't match what the user passed in
|
|
96
62
|
throw messages.createError('error.jobIdMismatch', [jobId]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EACL,SAAS,EACT,QAAQ,EACR,eAAe,EAEf,4BAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EACL,SAAS,EACT,QAAQ,EACR,eAAe,EAEf,4BAA4B,EAC5B,gBAAgB,EAChB,OAAO,GACR,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AAEnF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAgC;IACrE,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACjD,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IACxC,MAAM,CAAU,KAAK,GAAG;QAC7B,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;YACpD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YAC5D,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;YACzC,UAAU,EAAE,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;YAC7D,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SAC1C,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChF,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,iBAAiB,CAAC;YAAE,MAAM,QAAQ,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAE1F,0HAA0H;QAC1H,MAAM,CAAC,KAAK,CAAC,CAAC;QACd,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;QAChD,IAAI,UAA8B,CAAC;QAEnC,SAAS,CAAC,EAAE,CAA2B,4BAA4B,EAAE,KAAK,EAAE,IAAI,EAAiB,EAAE;YACjG,UAAU,GAAG,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC;YACjC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAE3C,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACzF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9B,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;YAChD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QACtF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBACtE,8EAA8E;gBAC9E,MAAM,QAAQ,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC"}
|
|
@@ -1,16 +1,29 @@
|
|
|
1
|
-
import { Logger, SandboxInfo, SandboxRequest } from '@salesforce/core';
|
|
1
|
+
import { Logger, SandboxInfo, SandboxRequest, Connection } from '@salesforce/core';
|
|
2
2
|
export declare const generateSboxName: () => Promise<string>;
|
|
3
|
-
export declare function readSandboxDefFile(defFile: string): Partial<SandboxInfo
|
|
3
|
+
export declare function readSandboxDefFile(defFile: string): Partial<SandboxInfo & {
|
|
4
|
+
ApexClassName?: string;
|
|
5
|
+
ActivationUserGroupName?: string;
|
|
6
|
+
}>;
|
|
4
7
|
export declare function createSandboxRequest(isClone: true, definitionFile: string | undefined, logger?: Logger | undefined, properties?: Record<string, string | undefined>): Promise<{
|
|
5
|
-
sandboxReq: SandboxRequest
|
|
8
|
+
sandboxReq: SandboxRequest & {
|
|
9
|
+
ApexClassName: string | undefined;
|
|
10
|
+
ActivationUserGroupName: string | undefined;
|
|
11
|
+
};
|
|
6
12
|
srcSandboxName: string;
|
|
7
13
|
}>;
|
|
8
14
|
export declare function createSandboxRequest(isClone: false, definitionFile: string | undefined, logger?: Logger | undefined, properties?: Record<string, string | undefined>): Promise<{
|
|
9
|
-
sandboxReq: SandboxRequest
|
|
15
|
+
sandboxReq: SandboxRequest & {
|
|
16
|
+
ApexClassName: string | undefined;
|
|
17
|
+
ActivationUserGroupName: string | undefined;
|
|
18
|
+
};
|
|
10
19
|
}>;
|
|
20
|
+
export declare function getApexClassIdByName(conn: Connection, className: string): Promise<string | undefined>;
|
|
21
|
+
export declare function getUserGroupIdByName(conn: Connection, groupName: string): Promise<string | undefined>;
|
|
11
22
|
declare const _default: {
|
|
12
23
|
createSandboxRequest: typeof createSandboxRequest;
|
|
13
24
|
generateSboxName: () => Promise<string>;
|
|
14
25
|
readSandboxDefFile: typeof readSandboxDefFile;
|
|
26
|
+
getApexClassIdByName: typeof getApexClassIdByName;
|
|
27
|
+
getUserGroupIdByName: typeof getUserGroupIdByName;
|
|
15
28
|
};
|
|
16
29
|
export default _default;
|
|
@@ -20,8 +20,15 @@ export const generateSboxName = async () => {
|
|
|
20
20
|
// Reads the sandbox definition file and converts properties to CapCase.
|
|
21
21
|
export function readSandboxDefFile(defFile) {
|
|
22
22
|
const fileContent = fs.readFileSync(defFile, 'utf-8');
|
|
23
|
-
const parsedContent = JSON.parse(fileContent);
|
|
24
|
-
|
|
23
|
+
const parsedContent = lowerToUpper(JSON.parse(fileContent));
|
|
24
|
+
// validate input
|
|
25
|
+
if (parsedContent.ApexClassName && parsedContent.ApexClassId) {
|
|
26
|
+
throw cloneMessages.createError('error.bothApexClassIdAndNameProvided');
|
|
27
|
+
}
|
|
28
|
+
if (parsedContent.ActivationUserGroupId && parsedContent.ActivationUserGroupName) {
|
|
29
|
+
throw cloneMessages.createError('error.bothUserGroupIdAndNameProvided');
|
|
30
|
+
}
|
|
31
|
+
return parsedContent;
|
|
25
32
|
}
|
|
26
33
|
export async function createSandboxRequest(isClone = false, definitionFile, logger, properties) {
|
|
27
34
|
if (!logger) {
|
|
@@ -54,9 +61,29 @@ export async function createSandboxRequest(isClone = false, definitionFile, logg
|
|
|
54
61
|
return { sandboxReq };
|
|
55
62
|
}
|
|
56
63
|
}
|
|
64
|
+
export async function getApexClassIdByName(conn, className) {
|
|
65
|
+
try {
|
|
66
|
+
const result = (await conn.singleRecordQuery(`SELECT Id FROM ApexClass WHERE Name = '${className}'`)).Id;
|
|
67
|
+
return result;
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
throw cloneMessages.createError('error.apexClassQueryFailed', [className], [], err);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
export async function getUserGroupIdByName(conn, groupName) {
|
|
74
|
+
try {
|
|
75
|
+
const result = (await conn.singleRecordQuery(`SELECT id FROM Group WHERE NAME = '${groupName}'`)).Id;
|
|
76
|
+
return result;
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
throw cloneMessages.createError('error.userGroupQueryFailed', [groupName], [], err);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
57
82
|
export default {
|
|
58
83
|
createSandboxRequest,
|
|
59
84
|
generateSboxName,
|
|
60
85
|
readSandboxDefFile,
|
|
86
|
+
getApexClassIdByName,
|
|
87
|
+
getUserGroupIdByName,
|
|
61
88
|
};
|
|
62
89
|
//# sourceMappingURL=sandboxRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxRequest.js","sourceRoot":"","sources":["../../src/shared/sandboxRequest.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,MAAM,EAA+B,QAAQ,EAAE,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"sandboxRequest.js","sourceRoot":"","sources":["../../src/shared/sandboxRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ScratchOrgLifecycleEvent } from '@salesforce/core';
|
|
2
|
+
export declare const buildStatus: (data: ScratchOrgLifecycleEvent, baseUrl: string) => string;
|
|
3
|
+
export declare const formatStage: (currentStage: ScratchOrgLifecycleEvent["stage"]) => string;
|
|
4
|
+
export declare const formatRequest: (baseUrl: string, id?: string) => string;
|
|
5
|
+
export declare const formatUsername: (username?: string) => string;
|
|
6
|
+
export declare const formatOrgId: (id?: string) => string;
|
|
7
|
+
export declare const formatCurrentStage: (stage: string) => string;
|
|
8
|
+
export declare const formatCompletedStage: (stage: string) => string;
|
|
9
|
+
export declare const formatFutureStage: (stage: string) => string;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2020, salesforce.com, inc.
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
import { scratchOrgLifecycleStages } from '@salesforce/core';
|
|
8
|
+
import ansis from 'ansis';
|
|
9
|
+
import { capitalCase } from 'change-case';
|
|
10
|
+
import { StandardColors } from '@salesforce/sf-plugins-core';
|
|
11
|
+
const boldBlue = (input) => ansis.rgb(81, 176, 235).bold(input);
|
|
12
|
+
const boldPurple = (input) => ansis.rgb(157, 129, 221).bold(input);
|
|
13
|
+
export const buildStatus = (data, baseUrl) => `
|
|
14
|
+
RequestId: ${formatRequest(baseUrl, data.scratchOrgInfo?.Id)}
|
|
15
|
+
OrgId: ${formatOrgId(data.scratchOrgInfo?.ScratchOrg)}
|
|
16
|
+
Username: ${formatUsername(data.scratchOrgInfo?.SignupUsername)}
|
|
17
|
+
${formatStage(data.stage)}`;
|
|
18
|
+
export const formatStage = (currentStage) => scratchOrgLifecycleStages
|
|
19
|
+
.map((stage, stageIndex) => {
|
|
20
|
+
// current stage
|
|
21
|
+
if (currentStage === stage)
|
|
22
|
+
return formatCurrentStage(stage);
|
|
23
|
+
// completed stages
|
|
24
|
+
if (scratchOrgLifecycleStages.indexOf(currentStage) > stageIndex)
|
|
25
|
+
return formatCompletedStage(stage);
|
|
26
|
+
// future stage
|
|
27
|
+
return formatFutureStage(stage);
|
|
28
|
+
})
|
|
29
|
+
.join('\n');
|
|
30
|
+
export const formatRequest = (baseUrl, id) => `${id ? `${ansis.bold(id)} (${baseUrl}/${id})` : ''}`;
|
|
31
|
+
export const formatUsername = (username) => `${username ? `${boldBlue(username)} ` : ''}`;
|
|
32
|
+
export const formatOrgId = (id) => `${id ? `${boldBlue(id)} ` : ''}`;
|
|
33
|
+
export const formatCurrentStage = (stage) => boldPurple(capitalCase(stage));
|
|
34
|
+
export const formatCompletedStage = (stage) => StandardColors.success.bold(`✓ ${capitalCase(stage)}`);
|
|
35
|
+
export const formatFutureStage = (stage) => StandardColors.info(capitalCase(stage));
|
|
36
|
+
//# sourceMappingURL=scratchOrgOutput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scratchOrgOutput.js","sourceRoot":"","sources":["../../src/shared/scratchOrgOutput.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAA4B,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChF,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAA8B,EAAE,OAAe,EAAU,EAAE,CAAC;aAC3E,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;SACnD,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC;YACzC,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC;EAC7D,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;AAE5B,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,YAA+C,EAAU,EAAE,CACrF,yBAAyB;KACtB,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;IACzB,gBAAgB;IAChB,IAAI,YAAY,KAAK,KAAK;QAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC7D,mBAAmB;IACnB,IAAI,yBAAyB,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,UAAU;QAAE,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACrG,eAAe;IACf,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAEhB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAW,EAAU,EAAE,CACpE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,OAAO,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAiB,EAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC3G,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAW,EAAU,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAEtF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACtH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC"}
|
package/messages/clone.md
CHANGED
|
@@ -5,3 +5,19 @@ Specify a value for %s in a definition file or on the command line.
|
|
|
5
5
|
# missingSourceSandboxNameAction
|
|
6
6
|
|
|
7
7
|
To indicate which sandbox org you want to clone, specify %s in a definition file or as a command line argument.
|
|
8
|
+
|
|
9
|
+
# error.bothApexClassIdAndNameProvided
|
|
10
|
+
|
|
11
|
+
You can't specify both `apexClassId` and `apexClassName` in the definition file at the same time.
|
|
12
|
+
|
|
13
|
+
# error.bothUserGroupIdAndNameProvided
|
|
14
|
+
|
|
15
|
+
You can't specify both `ActivationUserGroupId` and `ActivationUserGroupName` in the definition file at the same time.
|
|
16
|
+
|
|
17
|
+
# error.userGroupQueryFailed
|
|
18
|
+
|
|
19
|
+
Unable to find the ID of the activation user group "%s" that's defined in the definition file.
|
|
20
|
+
|
|
21
|
+
# error.apexClassQueryFailed
|
|
22
|
+
|
|
23
|
+
Unable to find the ID of the Apex class "%s" that's defined in the definition file.
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,21 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-org",
|
|
3
3
|
"description": "Commands to interact with Salesforce orgs",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.6.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/core": "^4.0.16",
|
|
9
|
-
"@
|
|
10
|
-
"@salesforce/core": "^8.5.5",
|
|
9
|
+
"@salesforce/core": "^8.6.1",
|
|
11
10
|
"@salesforce/kit": "^3.2.3",
|
|
12
11
|
"@salesforce/sf-plugins-core": "^11.3.7",
|
|
13
12
|
"@salesforce/source-deploy-retrieve": "^12.7.1",
|
|
14
13
|
"ansis": "^3.2.0",
|
|
15
14
|
"change-case": "^5.4.4",
|
|
16
15
|
"is-wsl": "^3.1.0",
|
|
17
|
-
"open": "^10.1.0"
|
|
18
|
-
"terminal-link": "^3.0.0"
|
|
16
|
+
"open": "^10.1.0"
|
|
19
17
|
},
|
|
20
18
|
"devDependencies": {
|
|
21
19
|
"@oclif/plugin-command-snapshot": "^5.2.15",
|
|
@@ -235,7 +233,7 @@
|
|
|
235
233
|
"exports": "./lib/index.js",
|
|
236
234
|
"type": "module",
|
|
237
235
|
"sfdx": {
|
|
238
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.
|
|
239
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.
|
|
236
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.6.0.crt",
|
|
237
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.6.0.sig"
|
|
240
238
|
}
|
|
241
239
|
}
|