@salesforce/plugin-org 4.1.14 → 4.1.16
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 +18 -16
- package/lib/commands/org/create/scratch.d.ts +1 -2
- package/lib/commands/org/create/scratch.js +4 -5
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/resume/scratch.d.ts +1 -1
- package/lib/commands/org/resume/scratch.js +21 -10
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/messages/delete_sandbox.md +1 -1
- package/messages/delete_scratch.md +1 -1
- package/messages/resume_scratch.md +4 -0
- package/oclif.manifest.json +3 -3
- package/package.json +6 -6
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.1.
|
|
232
|
+
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/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.1.
|
|
386
|
+
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/create/scratch.ts)_
|
|
387
387
|
|
|
388
388
|
## `sf org delete sandbox`
|
|
389
389
|
|
|
@@ -394,7 +394,8 @@ USAGE
|
|
|
394
394
|
$ sf org delete sandbox -o <value> [--json] [--flags-dir <value>] [-p]
|
|
395
395
|
|
|
396
396
|
FLAGS
|
|
397
|
-
-o, --target-org=<value> (required)
|
|
397
|
+
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
398
|
+
configuration variable is already set.
|
|
398
399
|
-p, --no-prompt Don't prompt the user to confirm the deletion.
|
|
399
400
|
|
|
400
401
|
GLOBAL FLAGS
|
|
@@ -428,7 +429,7 @@ EXAMPLES
|
|
|
428
429
|
$ sf org delete sandbox --target-org my-sandbox --no-prompt
|
|
429
430
|
```
|
|
430
431
|
|
|
431
|
-
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
432
|
+
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/delete/sandbox.ts)_
|
|
432
433
|
|
|
433
434
|
## `sf org delete scratch`
|
|
434
435
|
|
|
@@ -439,7 +440,8 @@ USAGE
|
|
|
439
440
|
$ sf org delete scratch -o <value> [--json] [--flags-dir <value>] [-p]
|
|
440
441
|
|
|
441
442
|
FLAGS
|
|
442
|
-
-o, --target-org=<value> (required)
|
|
443
|
+
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
444
|
+
configuration variable is already set.
|
|
443
445
|
-p, --no-prompt Don't prompt the user to confirm the deletion.
|
|
444
446
|
|
|
445
447
|
GLOBAL FLAGS
|
|
@@ -471,7 +473,7 @@ EXAMPLES
|
|
|
471
473
|
$ sf org delete scratch --target-org my-scratch-org --no-prompt
|
|
472
474
|
```
|
|
473
475
|
|
|
474
|
-
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
476
|
+
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/delete/scratch.ts)_
|
|
475
477
|
|
|
476
478
|
## `sf org disable tracking`
|
|
477
479
|
|
|
@@ -510,7 +512,7 @@ EXAMPLES
|
|
|
510
512
|
$ sf org disable tracking
|
|
511
513
|
```
|
|
512
514
|
|
|
513
|
-
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
515
|
+
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/disable/tracking.ts)_
|
|
514
516
|
|
|
515
517
|
## `sf org display`
|
|
516
518
|
|
|
@@ -555,7 +557,7 @@ EXAMPLES
|
|
|
555
557
|
$ sf org display --target-org TestOrg1 --verbose
|
|
556
558
|
```
|
|
557
559
|
|
|
558
|
-
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
560
|
+
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/display.ts)_
|
|
559
561
|
|
|
560
562
|
## `sf org enable tracking`
|
|
561
563
|
|
|
@@ -597,7 +599,7 @@ EXAMPLES
|
|
|
597
599
|
$ sf org enable tracking
|
|
598
600
|
```
|
|
599
601
|
|
|
600
|
-
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
602
|
+
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/enable/tracking.ts)_
|
|
601
603
|
|
|
602
604
|
## `sf org list`
|
|
603
605
|
|
|
@@ -636,7 +638,7 @@ EXAMPLES
|
|
|
636
638
|
$ sf org list --clean
|
|
637
639
|
```
|
|
638
640
|
|
|
639
|
-
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
641
|
+
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/list.ts)_
|
|
640
642
|
|
|
641
643
|
## `sf org list metadata`
|
|
642
644
|
|
|
@@ -703,7 +705,7 @@ FLAG DESCRIPTIONS
|
|
|
703
705
|
Examples of metadata types that use folders are Dashboard, Document, EmailTemplate, and Report.
|
|
704
706
|
```
|
|
705
707
|
|
|
706
|
-
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
708
|
+
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/list/metadata.ts)_
|
|
707
709
|
|
|
708
710
|
## `sf org list metadata-types`
|
|
709
711
|
|
|
@@ -758,7 +760,7 @@ FLAG DESCRIPTIONS
|
|
|
758
760
|
Override the api version used for api requests made by this command
|
|
759
761
|
```
|
|
760
762
|
|
|
761
|
-
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
763
|
+
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/list/metadata-types.ts)_
|
|
762
764
|
|
|
763
765
|
## `sf org open`
|
|
764
766
|
|
|
@@ -830,7 +832,7 @@ EXAMPLES
|
|
|
830
832
|
$ sf org open --source-file force-app/main/default/flows/Hello.flow-meta.xml
|
|
831
833
|
```
|
|
832
834
|
|
|
833
|
-
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
835
|
+
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/open.ts)_
|
|
834
836
|
|
|
835
837
|
## `sf org refresh sandbox`
|
|
836
838
|
|
|
@@ -907,7 +909,7 @@ FLAG DESCRIPTIONS
|
|
|
907
909
|
By default, a sandbox auto-activates after a refresh. Use this flag to control sandbox activation manually.
|
|
908
910
|
```
|
|
909
911
|
|
|
910
|
-
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
912
|
+
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/refresh/sandbox.ts)_
|
|
911
913
|
|
|
912
914
|
## `sf org resume sandbox`
|
|
913
915
|
|
|
@@ -970,7 +972,7 @@ FLAG DESCRIPTIONS
|
|
|
970
972
|
returns the job ID. To resume checking the sandbox creation, rerun this command.
|
|
971
973
|
```
|
|
972
974
|
|
|
973
|
-
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
975
|
+
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/resume/sandbox.ts)_
|
|
974
976
|
|
|
975
977
|
## `sf org resume scratch`
|
|
976
978
|
|
|
@@ -1017,6 +1019,6 @@ FLAG DESCRIPTIONS
|
|
|
1017
1019
|
The job ID is valid for 24 hours after you start the scratch org creation.
|
|
1018
1020
|
```
|
|
1019
1021
|
|
|
1020
|
-
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.
|
|
1022
|
+
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/4.1.16/src/commands/org/resume/scratch.ts)_
|
|
1021
1023
|
|
|
1022
1024
|
<!-- commandsstop -->
|
|
@@ -2,8 +2,7 @@ import { Org } from '@salesforce/core';
|
|
|
2
2
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import { Duration } from '@salesforce/kit';
|
|
4
4
|
import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
|
|
5
|
-
export
|
|
6
|
-
export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
|
|
5
|
+
export default class OrgCreateScratch extends SfCommand<ScratchCreateResponse> {
|
|
7
6
|
static readonly summary: string;
|
|
8
7
|
static readonly description: string;
|
|
9
8
|
static readonly examples: string[];
|
|
@@ -4,16 +4,15 @@
|
|
|
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 {
|
|
7
|
+
import { Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, SfError, } from '@salesforce/core';
|
|
8
|
+
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
9
9
|
import { Duration } from '@salesforce/kit';
|
|
10
10
|
import { buildScratchOrgRequest } from '../../../shared/scratchOrgRequest.js';
|
|
11
11
|
import { buildStatus } from '../../../shared/scratchOrgOutput.js';
|
|
12
12
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
13
13
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'create_scratch');
|
|
14
|
-
export const secretTimeout = 60_000;
|
|
15
14
|
const definitionFileHelpGroupName = 'Definition File Override';
|
|
16
|
-
export default class
|
|
15
|
+
export default class OrgCreateScratch extends SfCommand {
|
|
17
16
|
static summary = messages.getMessage('summary');
|
|
18
17
|
static description = messages.getMessage('description');
|
|
19
18
|
static examples = messages.getMessages('examples');
|
|
@@ -144,7 +143,7 @@ export default class EnvCreateScratch extends SfCommand {
|
|
|
144
143
|
};
|
|
145
144
|
async run() {
|
|
146
145
|
const lifecycle = Lifecycle.getInstance();
|
|
147
|
-
const { flags } = await this.parse(
|
|
146
|
+
const { flags } = await this.parse(OrgCreateScratch);
|
|
148
147
|
const baseUrl = flags['target-dev-hub'].getField(Org.Fields.INSTANCE_URL)?.toString();
|
|
149
148
|
if (!baseUrl) {
|
|
150
149
|
throw new SfError('No instance URL found for the dev hub');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
2
|
import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
|
|
3
|
-
export default class
|
|
3
|
+
export default class OrgResumeScratch extends SfCommand<ScratchCreateResponse> {
|
|
4
4
|
static readonly summary: string;
|
|
5
5
|
static readonly description: string;
|
|
6
6
|
static readonly examples: string[];
|
|
@@ -5,12 +5,12 @@
|
|
|
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
7
|
import { strict as assert } from 'node:assert';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
8
|
+
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
9
|
+
import { Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName, scratchOrgResume, SfError, } from '@salesforce/core';
|
|
10
10
|
import { buildStatus } from '../../../shared/scratchOrgOutput.js';
|
|
11
11
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
12
12
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'resume_scratch');
|
|
13
|
-
export default class
|
|
13
|
+
export default class OrgResumeScratch extends SfCommand {
|
|
14
14
|
static summary = messages.getMessage('summary');
|
|
15
15
|
static description = messages.getMessage('description');
|
|
16
16
|
static examples = messages.getMessages('examples');
|
|
@@ -32,7 +32,7 @@ export default class EnvResumeScratch extends SfCommand {
|
|
|
32
32
|
}),
|
|
33
33
|
};
|
|
34
34
|
async run() {
|
|
35
|
-
const { flags } = await this.parse(
|
|
35
|
+
const { flags } = await this.parse(OrgResumeScratch);
|
|
36
36
|
const cache = await ScratchOrgCache.create();
|
|
37
37
|
const lifecycle = Lifecycle.getInstance();
|
|
38
38
|
const jobId = flags['use-most-recent'] ? cache.getLatestKey() : flags['job-id'];
|
|
@@ -40,7 +40,7 @@ export default class EnvResumeScratch extends SfCommand {
|
|
|
40
40
|
throw messages.createError('error.NoRecentJobId');
|
|
41
41
|
// oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
|
|
42
42
|
assert(jobId);
|
|
43
|
-
const
|
|
43
|
+
const hubBaseUrl = cache.get(jobId)?.hubBaseUrl;
|
|
44
44
|
let lastStatus;
|
|
45
45
|
lifecycle.on(scratchOrgLifecycleEventName, async (data) => {
|
|
46
46
|
lastStatus = buildStatus(data, hubBaseUrl);
|
|
@@ -49,11 +49,22 @@ export default class EnvResumeScratch extends SfCommand {
|
|
|
49
49
|
});
|
|
50
50
|
this.log();
|
|
51
51
|
this.spinner.start('Creating Scratch Org');
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
try {
|
|
53
|
+
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId);
|
|
54
|
+
this.spinner.stop(lastStatus);
|
|
55
|
+
this.log();
|
|
56
|
+
this.logSuccess(messages.getMessage('success'));
|
|
57
|
+
return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
if (cache.keys() && e instanceof Error && e.name === 'CacheMissError') {
|
|
61
|
+
// we have something in the cache, but it didn't match what the user passed in
|
|
62
|
+
throw messages.createError('error.jobIdMismatch', [jobId]);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
throw SfError.wrap(e);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
57
68
|
}
|
|
58
69
|
}
|
|
59
70
|
//# sourceMappingURL=scratch.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ Both the sandbox and the associated production org must already be authenticated
|
|
|
24
24
|
|
|
25
25
|
# flags.target-org.summary
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
Username or alias of the target org. Not required if the `target-org` configuration variable is already set.
|
|
28
28
|
|
|
29
29
|
# flags.no-prompt.summary
|
|
30
30
|
|
|
@@ -23,7 +23,7 @@ Specify a scratch org with either the username or the alias you gave the scratch
|
|
|
23
23
|
|
|
24
24
|
# flags.target-org.summary
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
Username or alias of the target org. Not required if the `target-org` configuration variable is already set.
|
|
27
27
|
|
|
28
28
|
# flags.no-prompt.summary
|
|
29
29
|
|
|
@@ -36,6 +36,10 @@ Use the job ID of the most recent incomplete scratch org.
|
|
|
36
36
|
|
|
37
37
|
There are no recent job IDs (ScratchOrgInfo requests) in your cache. Maybe it completed or already resumed?
|
|
38
38
|
|
|
39
|
+
# error.jobIdMismatch
|
|
40
|
+
|
|
41
|
+
There are no recent job IDs (ScratchOrgInfo requests) in your cache that match %s. Maybe it completed?
|
|
42
|
+
|
|
39
43
|
# success
|
|
40
44
|
|
|
41
45
|
Your scratch org is ready.
|
package/oclif.manifest.json
CHANGED
|
@@ -1146,7 +1146,7 @@
|
|
|
1146
1146
|
"deprecateAliases": true,
|
|
1147
1147
|
"name": "target-org",
|
|
1148
1148
|
"required": true,
|
|
1149
|
-
"summary": "
|
|
1149
|
+
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
1150
1150
|
"hasDynamicHelp": true,
|
|
1151
1151
|
"multiple": false,
|
|
1152
1152
|
"type": "option"
|
|
@@ -1230,7 +1230,7 @@
|
|
|
1230
1230
|
"deprecateAliases": true,
|
|
1231
1231
|
"name": "target-org",
|
|
1232
1232
|
"required": true,
|
|
1233
|
-
"summary": "
|
|
1233
|
+
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
1234
1234
|
"hasDynamicHelp": true,
|
|
1235
1235
|
"multiple": false,
|
|
1236
1236
|
"type": "option"
|
|
@@ -1982,5 +1982,5 @@
|
|
|
1982
1982
|
]
|
|
1983
1983
|
}
|
|
1984
1984
|
},
|
|
1985
|
-
"version": "4.1.
|
|
1985
|
+
"version": "4.1.16"
|
|
1986
1986
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-org",
|
|
3
3
|
"description": "Commands to interact with Salesforce orgs",
|
|
4
|
-
"version": "4.1.
|
|
4
|
+
"version": "4.1.16",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
"@oclif/plugin-command-snapshot": "^5.1.9",
|
|
20
20
|
"@salesforce/cli-plugins-testkit": "^5.3.5",
|
|
21
21
|
"@salesforce/dev-scripts": "^9.1.2",
|
|
22
|
-
"@salesforce/plugin-command-reference": "^3.0.
|
|
22
|
+
"@salesforce/plugin-command-reference": "^3.0.88",
|
|
23
23
|
"@salesforce/ts-sinon": "1.4.19",
|
|
24
|
-
"eslint-plugin-sf-plugin": "^1.18.
|
|
24
|
+
"eslint-plugin-sf-plugin": "^1.18.5",
|
|
25
25
|
"moment": "^2.30.1",
|
|
26
|
-
"oclif": "^4.
|
|
26
|
+
"oclif": "^4.11.1",
|
|
27
27
|
"ts-node": "^10.9.2",
|
|
28
28
|
"typescript": "^5.4.5"
|
|
29
29
|
},
|
|
@@ -233,7 +233,7 @@
|
|
|
233
233
|
"exports": "./lib/index.js",
|
|
234
234
|
"type": "module",
|
|
235
235
|
"sfdx": {
|
|
236
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.1.
|
|
237
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.1.
|
|
236
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.1.16.crt",
|
|
237
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/4.1.16.sig"
|
|
238
238
|
}
|
|
239
239
|
}
|