@salesforce/plugin-org 5.11.0 → 5.11.2
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 +20 -20
- package/lib/commands/org/create/scratch.js +30 -3
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/display.js +31 -5
- package/lib/commands/org/display.js.map +1 -1
- package/lib/commands/org/list.js +12 -1
- package/lib/commands/org/list.js.map +1 -1
- package/lib/commands/org/resume/scratch.js +30 -2
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/shared/orgListUtil.js +22 -7
- package/lib/shared/orgListUtil.js.map +1 -1
- package/messages/secrets-redacted.md +19 -0
- package/oclif.manifest.json +246 -246
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -161,7 +161,7 @@ EXAMPLES
|
|
|
161
161
|
$ sf org auth show-access-token --target-org my-org --json
|
|
162
162
|
```
|
|
163
163
|
|
|
164
|
-
_See code: [src/commands/org/auth/show-access-token.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
164
|
+
_See code: [src/commands/org/auth/show-access-token.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/auth/show-access-token.ts)_
|
|
165
165
|
|
|
166
166
|
## `sf org auth show-sfdx-auth-url`
|
|
167
167
|
|
|
@@ -205,7 +205,7 @@ EXAMPLES
|
|
|
205
205
|
$ sf org auth show-sfdx-auth-url --target-org my-org --json
|
|
206
206
|
```
|
|
207
207
|
|
|
208
|
-
_See code: [src/commands/org/auth/show-sfdx-auth-url.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
208
|
+
_See code: [src/commands/org/auth/show-sfdx-auth-url.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/auth/show-sfdx-auth-url.ts)_
|
|
209
209
|
|
|
210
210
|
## `sf org auth show-user-password`
|
|
211
211
|
|
|
@@ -252,7 +252,7 @@ EXAMPLES
|
|
|
252
252
|
$ sf org auth show-user-password --target-org my-org --json
|
|
253
253
|
```
|
|
254
254
|
|
|
255
|
-
_See code: [src/commands/org/auth/show-user-password.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
255
|
+
_See code: [src/commands/org/auth/show-user-password.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/auth/show-user-password.ts)_
|
|
256
256
|
|
|
257
257
|
## `sf org create agent-user`
|
|
258
258
|
|
|
@@ -330,7 +330,7 @@ FLAG DESCRIPTIONS
|
|
|
330
330
|
"agent.user.<GUID>@your-org-domain.com".
|
|
331
331
|
```
|
|
332
332
|
|
|
333
|
-
_See code: [src/commands/org/create/agent-user.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
333
|
+
_See code: [src/commands/org/create/agent-user.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/create/agent-user.ts)_
|
|
334
334
|
|
|
335
335
|
## `sf org create sandbox`
|
|
336
336
|
|
|
@@ -464,7 +464,7 @@ FLAG DESCRIPTIONS
|
|
|
464
464
|
You can specify either --source-sandbox-name or --source-id when cloning an existing sandbox, but not both.
|
|
465
465
|
```
|
|
466
466
|
|
|
467
|
-
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
467
|
+
_See code: [src/commands/org/create/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/create/sandbox.ts)_
|
|
468
468
|
|
|
469
469
|
## `sf org create scratch`
|
|
470
470
|
|
|
@@ -646,7 +646,7 @@ FLAG DESCRIPTIONS
|
|
|
646
646
|
Omit this flag to have Salesforce generate a unique username for your org.
|
|
647
647
|
```
|
|
648
648
|
|
|
649
|
-
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
649
|
+
_See code: [src/commands/org/create/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/create/scratch.ts)_
|
|
650
650
|
|
|
651
651
|
## `sf org delete sandbox`
|
|
652
652
|
|
|
@@ -692,7 +692,7 @@ EXAMPLES
|
|
|
692
692
|
$ sf org delete sandbox --target-org my-sandbox --no-prompt
|
|
693
693
|
```
|
|
694
694
|
|
|
695
|
-
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
695
|
+
_See code: [src/commands/org/delete/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/delete/sandbox.ts)_
|
|
696
696
|
|
|
697
697
|
## `sf org delete scratch`
|
|
698
698
|
|
|
@@ -736,7 +736,7 @@ EXAMPLES
|
|
|
736
736
|
$ sf org delete scratch --target-org my-scratch-org --no-prompt
|
|
737
737
|
```
|
|
738
738
|
|
|
739
|
-
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
739
|
+
_See code: [src/commands/org/delete/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/delete/scratch.ts)_
|
|
740
740
|
|
|
741
741
|
## `sf org disable tracking`
|
|
742
742
|
|
|
@@ -775,7 +775,7 @@ EXAMPLES
|
|
|
775
775
|
$ sf org disable tracking
|
|
776
776
|
```
|
|
777
777
|
|
|
778
|
-
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
778
|
+
_See code: [src/commands/org/disable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/disable/tracking.ts)_
|
|
779
779
|
|
|
780
780
|
## `sf org display`
|
|
781
781
|
|
|
@@ -820,7 +820,7 @@ EXAMPLES
|
|
|
820
820
|
$ sf org display --target-org TestOrg1 --verbose
|
|
821
821
|
```
|
|
822
822
|
|
|
823
|
-
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
823
|
+
_See code: [src/commands/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/display.ts)_
|
|
824
824
|
|
|
825
825
|
## `sf org enable tracking`
|
|
826
826
|
|
|
@@ -862,7 +862,7 @@ EXAMPLES
|
|
|
862
862
|
$ sf org enable tracking
|
|
863
863
|
```
|
|
864
864
|
|
|
865
|
-
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
865
|
+
_See code: [src/commands/org/enable/tracking.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/enable/tracking.ts)_
|
|
866
866
|
|
|
867
867
|
## `sf org list`
|
|
868
868
|
|
|
@@ -901,7 +901,7 @@ EXAMPLES
|
|
|
901
901
|
$ sf org list --clean
|
|
902
902
|
```
|
|
903
903
|
|
|
904
|
-
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
904
|
+
_See code: [src/commands/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/list.ts)_
|
|
905
905
|
|
|
906
906
|
## `sf org list metadata`
|
|
907
907
|
|
|
@@ -968,7 +968,7 @@ FLAG DESCRIPTIONS
|
|
|
968
968
|
Examples of metadata types that use folders are Dashboard, Document, EmailTemplate, and Report.
|
|
969
969
|
```
|
|
970
970
|
|
|
971
|
-
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
971
|
+
_See code: [src/commands/org/list/metadata.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/list/metadata.ts)_
|
|
972
972
|
|
|
973
973
|
## `sf org list metadata-types`
|
|
974
974
|
|
|
@@ -1023,7 +1023,7 @@ FLAG DESCRIPTIONS
|
|
|
1023
1023
|
Override the api version used for api requests made by this command
|
|
1024
1024
|
```
|
|
1025
1025
|
|
|
1026
|
-
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1026
|
+
_See code: [src/commands/org/list/metadata-types.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/list/metadata-types.ts)_
|
|
1027
1027
|
|
|
1028
1028
|
## `sf org open`
|
|
1029
1029
|
|
|
@@ -1099,7 +1099,7 @@ EXAMPLES
|
|
|
1099
1099
|
$ sf org open --source-file force-app/main/default/bots/Coral_Cloud_Agent/Coral_Cloud_Agent.bot-meta.xml
|
|
1100
1100
|
```
|
|
1101
1101
|
|
|
1102
|
-
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1102
|
+
_See code: [src/commands/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/open.ts)_
|
|
1103
1103
|
|
|
1104
1104
|
## `sf org open agent`
|
|
1105
1105
|
|
|
@@ -1174,7 +1174,7 @@ FLAG DESCRIPTIONS
|
|
|
1174
1174
|
flag.
|
|
1175
1175
|
```
|
|
1176
1176
|
|
|
1177
|
-
_See code: [src/commands/org/open/agent.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1177
|
+
_See code: [src/commands/org/open/agent.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/open/agent.ts)_
|
|
1178
1178
|
|
|
1179
1179
|
## `sf org open authoring-bundle`
|
|
1180
1180
|
|
|
@@ -1220,7 +1220,7 @@ EXAMPLES
|
|
|
1220
1220
|
$ sf org open authoring-bundle --target-org MyTestOrg1 --browser firefox
|
|
1221
1221
|
```
|
|
1222
1222
|
|
|
1223
|
-
_See code: [src/commands/org/open/authoring-bundle.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1223
|
+
_See code: [src/commands/org/open/authoring-bundle.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/open/authoring-bundle.ts)_
|
|
1224
1224
|
|
|
1225
1225
|
## `sf org refresh sandbox`
|
|
1226
1226
|
|
|
@@ -1323,7 +1323,7 @@ FLAG DESCRIPTIONS
|
|
|
1323
1323
|
You can specify either --source-sandbox-name or --source-id when refreshing an existing sandbox, but not both.
|
|
1324
1324
|
```
|
|
1325
1325
|
|
|
1326
|
-
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1326
|
+
_See code: [src/commands/org/refresh/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/refresh/sandbox.ts)_
|
|
1327
1327
|
|
|
1328
1328
|
## `sf org resume sandbox`
|
|
1329
1329
|
|
|
@@ -1386,7 +1386,7 @@ FLAG DESCRIPTIONS
|
|
|
1386
1386
|
returns the job ID. To resume checking the sandbox creation, rerun this command.
|
|
1387
1387
|
```
|
|
1388
1388
|
|
|
1389
|
-
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1389
|
+
_See code: [src/commands/org/resume/sandbox.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/resume/sandbox.ts)_
|
|
1390
1390
|
|
|
1391
1391
|
## `sf org resume scratch`
|
|
1392
1392
|
|
|
@@ -1439,6 +1439,6 @@ FLAG DESCRIPTIONS
|
|
|
1439
1439
|
returns the job ID. To resume checking the scratch creation, rerun this command.
|
|
1440
1440
|
```
|
|
1441
1441
|
|
|
1442
|
-
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.
|
|
1442
|
+
_See code: [src/commands/org/resume/scratch.ts](https://github.com/salesforcecli/plugin-org/blob/5.11.2/src/commands/org/resume/scratch.ts)_
|
|
1443
1443
|
|
|
1444
1444
|
<!-- commandsstop -->
|
|
@@ -14,14 +14,15 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
17
|
-
import { Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, SfError, } from '@salesforce/core';
|
|
17
|
+
import { envVars, Lifecycle, Messages, Org, scratchOrgCreate, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, SfError, } from '@salesforce/core';
|
|
18
18
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
19
|
-
import { Duration } from '@salesforce/kit';
|
|
19
|
+
import { Duration, omit } from '@salesforce/kit';
|
|
20
20
|
import terminalLink from 'terminal-link';
|
|
21
21
|
import { capitalCase } from 'change-case';
|
|
22
22
|
import { buildScratchOrgRequest } from '../../../shared/scratchOrgRequest.js';
|
|
23
23
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
24
24
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'create_scratch');
|
|
25
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
25
26
|
const definitionFileHelpGroupName = 'Definition File Override';
|
|
26
27
|
export default class OrgCreateScratch extends SfCommand {
|
|
27
28
|
static summary = messages.getMessage('summary');
|
|
@@ -223,7 +224,33 @@ export default class OrgCreateScratch extends SfCommand {
|
|
|
223
224
|
else {
|
|
224
225
|
this.logSuccess(messages.getMessage('success'));
|
|
225
226
|
}
|
|
226
|
-
|
|
227
|
+
// TODO: Remove env var workaround
|
|
228
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
229
|
+
const accessTokenRedacted = secretsMessages.getMessage('redacted.accessToken');
|
|
230
|
+
const redactedAuthFields = authFields
|
|
231
|
+
? {
|
|
232
|
+
...authFields,
|
|
233
|
+
accessToken: showSecretsEnvVarIsSet ? authFields.accessToken : accessTokenRedacted,
|
|
234
|
+
refreshToken: undefined,
|
|
235
|
+
clientSecret: undefined,
|
|
236
|
+
}
|
|
237
|
+
: undefined;
|
|
238
|
+
const redactedScratchOrgInfo = omit(scratchOrgInfo, ['AuthCode']);
|
|
239
|
+
if (this.jsonEnabled()) {
|
|
240
|
+
if (showSecretsEnvVarIsSet) {
|
|
241
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org create scratch --json']));
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org create scratch --json']));
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
return {
|
|
248
|
+
username,
|
|
249
|
+
scratchOrgInfo: redactedScratchOrgInfo,
|
|
250
|
+
authFields: redactedAuthFields,
|
|
251
|
+
warnings,
|
|
252
|
+
orgId: authFields?.orgId,
|
|
253
|
+
};
|
|
227
254
|
}
|
|
228
255
|
catch (error) {
|
|
229
256
|
mso.error();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,SAAS,EACT,QAAQ,EACR,GAAG,EACH,gBAAgB,EAEhB,4BAA4B,EAC5B,yBAAyB,EACzB,OAAO,GACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Flags, SfCommand, requiredOrgFlagWithDeprecations, loglevel, orgApiVersionFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
|
|
17
|
-
import { AuthInfo, Messages, SfError, trimTo15 } from '@salesforce/core';
|
|
17
|
+
import { AuthInfo, envVars, Messages, SfError, trimTo15 } from '@salesforce/core';
|
|
18
18
|
import { camelCaseToTitleCase } from '@salesforce/kit';
|
|
19
19
|
import { getAliasByUsername } from '../../shared/utils.js';
|
|
20
20
|
import { getStyledValue } from '../../shared/orgHighlighter.js';
|
|
@@ -22,6 +22,7 @@ import { OrgListUtil } from '../../shared/orgListUtil.js';
|
|
|
22
22
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
23
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'display');
|
|
24
24
|
const sharedMessages = Messages.loadMessages('@salesforce/plugin-org', 'messages');
|
|
25
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
25
26
|
export class OrgDisplayCommand extends SfCommand {
|
|
26
27
|
static summary = messages.getMessage('summary');
|
|
27
28
|
static description = messages.getMessage('description');
|
|
@@ -42,6 +43,7 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
42
43
|
this.org = flags['target-org'];
|
|
43
44
|
this.org.getConnection(flags['api-version']);
|
|
44
45
|
try {
|
|
46
|
+
// TODO: Once env var is removed, this refresh could be removed.
|
|
45
47
|
// the auth file might have a stale access token. We want to refresh it before getting the fields
|
|
46
48
|
await this.org.refreshAuth();
|
|
47
49
|
}
|
|
@@ -49,32 +51,56 @@ export class OrgDisplayCommand extends SfCommand {
|
|
|
49
51
|
// even if this fails, we want to display the information we can read from the auth file
|
|
50
52
|
this.warn('unable to refresh auth for org');
|
|
51
53
|
}
|
|
54
|
+
const accessTokenRedactedMessage = secretsMessages.getMessage('redacted.accessToken');
|
|
55
|
+
const sfdxAuthUrlRedactedMessage = secretsMessages.getMessage('redacted.sfdxAuthUrl');
|
|
56
|
+
const passwordRedactedMessage = secretsMessages.getMessage('redacted.userPassword');
|
|
57
|
+
const envVarAsATempWorkaroundMessage = secretsMessages.getMessage('temp.envVarWorkaround', ['sf org display']);
|
|
58
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
59
|
+
const envVarIsSetWarning = secretsMessages.getMessage('temp.envVarIsSet', ['sf org display']);
|
|
52
60
|
// translate to alias if necessary
|
|
53
61
|
const authInfo = await AuthInfo.create({ username: this.org.getUsername() });
|
|
54
62
|
const fields = authInfo.getFields(true);
|
|
55
63
|
const isScratchOrg = Boolean(fields.devHubUsername);
|
|
56
64
|
const scratchOrgInfo = isScratchOrg && fields.orgId ? await this.getScratchOrgInformation(fields) : {};
|
|
65
|
+
const getSfdxAuthUrlOutput = () => {
|
|
66
|
+
if (flags.verbose && fields.refreshToken) {
|
|
67
|
+
// TODO: Remove env var workaround
|
|
68
|
+
return showSecretsEnvVarIsSet ? authInfo.getSfdxAuthUrl() : sfdxAuthUrlRedactedMessage;
|
|
69
|
+
}
|
|
70
|
+
return undefined;
|
|
71
|
+
};
|
|
57
72
|
const returnValue = {
|
|
58
73
|
// renamed properties
|
|
59
74
|
id: fields.orgId,
|
|
60
75
|
devHubId: fields.devHubUsername,
|
|
61
76
|
// copied properties
|
|
62
77
|
apiVersion: fields.instanceApiVersion,
|
|
63
|
-
|
|
78
|
+
// Access token will always exist, don't check for value first
|
|
79
|
+
// TODO: Remove env var workaround
|
|
80
|
+
accessToken: showSecretsEnvVarIsSet ? fields.accessToken : accessTokenRedactedMessage,
|
|
64
81
|
instanceUrl: fields.instanceUrl,
|
|
65
82
|
username: fields.username,
|
|
66
83
|
clientId: fields.clientId,
|
|
67
|
-
|
|
84
|
+
// Password only exists if it was generated locally, check for value first
|
|
85
|
+
// TODO: Remove env var workaround
|
|
86
|
+
password: fields.password ? (showSecretsEnvVarIsSet ? fields.password : passwordRedactedMessage) : undefined,
|
|
68
87
|
...scratchOrgInfo,
|
|
69
88
|
// properties with more complex logic
|
|
70
89
|
connectedStatus: isScratchOrg
|
|
71
90
|
? undefined
|
|
72
91
|
: await OrgListUtil.determineConnectedStatusForNonScratchOrg(fields.username),
|
|
73
|
-
sfdxAuthUrl:
|
|
92
|
+
sfdxAuthUrl: getSfdxAuthUrlOutput(),
|
|
74
93
|
alias: await getAliasByUsername(fields.username),
|
|
94
|
+
// TODO: deprecate these values
|
|
75
95
|
clientApps: fields.clientApps ? Object.keys(fields.clientApps).join(',') : undefined,
|
|
76
96
|
};
|
|
77
|
-
|
|
97
|
+
if (showSecretsEnvVarIsSet) {
|
|
98
|
+
this.warn(envVarIsSetWarning);
|
|
99
|
+
this.warn(sharedMessages.getMessage('SecurityWarning'));
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.warn(envVarAsATempWorkaroundMessage);
|
|
103
|
+
}
|
|
78
104
|
this.print(returnValue);
|
|
79
105
|
return returnValue;
|
|
80
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../src/commands/org/display.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,EACL,SAAS,EACT,+BAA+B,EAC/B,QAAQ,EACR,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAO,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../src/commands/org/display.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/org/list.js
CHANGED
|
@@ -15,12 +15,13 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { EOL } from 'node:os';
|
|
17
17
|
import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
|
|
18
|
-
import { AuthInfo, Connection, Org, SfError, Messages, Logger } from '@salesforce/core';
|
|
18
|
+
import { AuthInfo, Connection, envVars, Org, SfError, Messages, Logger, } from '@salesforce/core';
|
|
19
19
|
import ansis from 'ansis';
|
|
20
20
|
import { OrgListUtil, identifyActiveOrgByStatus } from '../../shared/orgListUtil.js';
|
|
21
21
|
import { getStyledObject } from '../../shared/orgHighlighter.js';
|
|
22
22
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
23
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'list');
|
|
24
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
24
25
|
export const defaultOrgEmoji = '🍁';
|
|
25
26
|
export const defaultHubEmoji = '🌳';
|
|
26
27
|
export class OrgListCommand extends SfCommand {
|
|
@@ -94,6 +95,16 @@ export class OrgListCommand extends SfCommand {
|
|
|
94
95
|
});
|
|
95
96
|
this.info(`
|
|
96
97
|
Legend: ${defaultHubEmoji}=Default DevHub, ${defaultOrgEmoji}=Default Org ${flags.all ? '' : ' Use --all to see expired and deleted scratch orgs'}`);
|
|
98
|
+
// TODO: Remove after env var workaround is removed
|
|
99
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
100
|
+
if (this.jsonEnabled()) {
|
|
101
|
+
if (showSecretsEnvVarIsSet) {
|
|
102
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org list']));
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org list']));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
97
108
|
return result;
|
|
98
109
|
}
|
|
99
110
|
async cleanScratchOrgs(scratchOrgs, prompt) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/org/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,14 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { strict as assert } from 'node:assert';
|
|
17
17
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
18
|
-
import { Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, scratchOrgResume, SfError, } from '@salesforce/core';
|
|
18
|
+
import { envVars, Lifecycle, Messages, ScratchOrgCache, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, scratchOrgResume, SfError, } from '@salesforce/core';
|
|
19
19
|
import terminalLink from 'terminal-link';
|
|
20
20
|
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
21
21
|
import { capitalCase } from 'change-case';
|
|
22
|
+
import { omit } from '@salesforce/kit';
|
|
22
23
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
23
24
|
const messages = Messages.loadMessages('@salesforce/plugin-org', 'resume_scratch');
|
|
25
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
24
26
|
export default class OrgResumeScratch extends SfCommand {
|
|
25
27
|
static summary = messages.getMessage('summary');
|
|
26
28
|
static description = messages.getMessage('description');
|
|
@@ -106,7 +108,33 @@ export default class OrgResumeScratch extends SfCommand {
|
|
|
106
108
|
const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId, flags.wait);
|
|
107
109
|
this.log();
|
|
108
110
|
this.logSuccess(messages.getMessage('success'));
|
|
109
|
-
|
|
111
|
+
// TODO: Remove env var workaround
|
|
112
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
113
|
+
const accessTokenRedacted = secretsMessages.getMessage('redacted.accessToken');
|
|
114
|
+
const redactedAuthFields = authFields
|
|
115
|
+
? {
|
|
116
|
+
...authFields,
|
|
117
|
+
accessToken: showSecretsEnvVarIsSet ? authFields.accessToken : accessTokenRedacted,
|
|
118
|
+
refreshToken: undefined,
|
|
119
|
+
clientSecret: undefined,
|
|
120
|
+
}
|
|
121
|
+
: undefined;
|
|
122
|
+
const redactedScratchOrgInfo = scratchOrgInfo ? omit(scratchOrgInfo, ['AuthCode']) : undefined;
|
|
123
|
+
if (this.jsonEnabled()) {
|
|
124
|
+
if (showSecretsEnvVarIsSet) {
|
|
125
|
+
this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org resume scratch --json']));
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org resume scratch --json']));
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return {
|
|
132
|
+
username,
|
|
133
|
+
scratchOrgInfo: redactedScratchOrgInfo,
|
|
134
|
+
authFields: redactedAuthFields,
|
|
135
|
+
warnings,
|
|
136
|
+
orgId: authFields?.orgId,
|
|
137
|
+
};
|
|
110
138
|
}
|
|
111
139
|
catch (e) {
|
|
112
140
|
mso.error();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;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,yBAAyB,EACzB,gBAAgB,EAChB,OAAO,GACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/resume/scratch.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,9 +15,11 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { basename, join } from 'node:path';
|
|
17
17
|
import fs from 'node:fs/promises';
|
|
18
|
-
import { Org, AuthInfo, Global, Logger, SfError, trimTo15, ConfigAggregator, OrgConfigProperties, } from '@salesforce/core';
|
|
18
|
+
import { Org, AuthInfo, envVars, Global, Logger, Messages, SfError, trimTo15, ConfigAggregator, OrgConfigProperties, } from '@salesforce/core';
|
|
19
19
|
import { omit } from '@salesforce/kit';
|
|
20
20
|
import utils, { isDefined } from './utils.js';
|
|
21
|
+
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
22
|
+
const secretsMessages = Messages.loadMessages('@salesforce/plugin-org', 'secrets-redacted');
|
|
21
23
|
export class OrgListUtil {
|
|
22
24
|
static logger;
|
|
23
25
|
static async retrieveLogger() {
|
|
@@ -52,12 +54,25 @@ export class OrgListUtil {
|
|
|
52
54
|
})),
|
|
53
55
|
OrgListUtil.processScratchOrgs(orgs.scratchOrgs),
|
|
54
56
|
]);
|
|
57
|
+
// TODO: Remove env var workaround
|
|
58
|
+
const showSecretsEnvVarIsSet = envVars.getBoolean('SF_TEMP_SHOW_SECRETS', false);
|
|
59
|
+
const redactSecrets = (org) => ({
|
|
60
|
+
...org,
|
|
61
|
+
accessToken: showSecretsEnvVarIsSet ? org.accessToken : secretsMessages.getMessage('redacted.accessToken'),
|
|
62
|
+
password: org.password
|
|
63
|
+
? showSecretsEnvVarIsSet
|
|
64
|
+
? org.password
|
|
65
|
+
: secretsMessages.getMessage('redacted.userPassword')
|
|
66
|
+
: undefined,
|
|
67
|
+
});
|
|
68
|
+
const redactedNonScratchOrgs = nonScratchOrgs.map(redactSecrets);
|
|
69
|
+
const redactedScratchOrgs = scratchOrgs.map(redactSecrets);
|
|
55
70
|
return {
|
|
56
|
-
nonScratchOrgs,
|
|
57
|
-
scratchOrgs,
|
|
58
|
-
sandboxes:
|
|
59
|
-
other:
|
|
60
|
-
devHubs:
|
|
71
|
+
nonScratchOrgs: redactedNonScratchOrgs,
|
|
72
|
+
scratchOrgs: redactedScratchOrgs,
|
|
73
|
+
sandboxes: redactedNonScratchOrgs.filter(sandboxFilter),
|
|
74
|
+
other: redactedNonScratchOrgs.filter(regularOrgFilter),
|
|
75
|
+
devHubs: redactedNonScratchOrgs.filter(devHubFilter),
|
|
61
76
|
};
|
|
62
77
|
}
|
|
63
78
|
/**
|
|
@@ -296,7 +311,7 @@ const authErrorHandler = async (err, username) => {
|
|
|
296
311
|
const logger = await OrgListUtil.retrieveLogger();
|
|
297
312
|
logger.trace(`error refreshing auth for org: ${username}`);
|
|
298
313
|
logger.trace(error);
|
|
299
|
-
// Orgs under
|
|
314
|
+
// Orgs under maintenance return html as the error message.
|
|
300
315
|
if (error.message.includes('maintenance'))
|
|
301
316
|
return 'Down (Maintenance)';
|
|
302
317
|
// handle other potential html responses
|
|
@@ -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":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
# redacted.accessToken
|
|
2
|
+
|
|
3
|
+
[REDACTED] Use 'sf org auth show-access-token' to view
|
|
4
|
+
|
|
5
|
+
# redacted.sfdxAuthUrl
|
|
6
|
+
|
|
7
|
+
[REDACTED] Use 'sf org auth show-sfdx-auth-url' to view
|
|
8
|
+
|
|
9
|
+
# redacted.userPassword
|
|
10
|
+
|
|
11
|
+
[REDACTED] Use 'sf org auth show-user-password' to view
|
|
12
|
+
|
|
13
|
+
# temp.envVarWorkaround
|
|
14
|
+
|
|
15
|
+
Secrets are now hidden from '%s' command output. Use the 'sf org auth' commands instead. As a temporary workaround, you can set SF_TEMP_SHOW_SECRETS=true to render these secrets. This workaround will be removed in an upcoming release.
|
|
16
|
+
|
|
17
|
+
# temp.envVarIsSet
|
|
18
|
+
|
|
19
|
+
The SF_TEMP_SHOW_SECRETS env var is set. This is a temporary env var to continue to show secrets in the '%s' command output. This workaround will be removed in an upcoming CLI release. Switch to use the 'sf org auth' commands to avoid future disruption.
|
package/oclif.manifest.json
CHANGED
|
@@ -598,237 +598,6 @@
|
|
|
598
598
|
"show-user-password:auth:org"
|
|
599
599
|
]
|
|
600
600
|
},
|
|
601
|
-
"org:disable:tracking": {
|
|
602
|
-
"aliases": [],
|
|
603
|
-
"args": {},
|
|
604
|
-
"description": "Disabling source tracking has no direct effect on the org, it affects only your local environment. Specifically, Salesforce CLI stores the setting in the org's local configuration file so that no source tracking operations are executed when working with the org.",
|
|
605
|
-
"examples": [
|
|
606
|
-
"Disable source tracking for an org with alias \"myscratch\":\n<%= config.bin %> <%= command.id %> --target-org myscratch",
|
|
607
|
-
"Disable source tracking for an org using a username:\n<%= config.bin %> <%= command.id %> --target-org you@example.com",
|
|
608
|
-
"Disable source tracking for your default org:\n<%= config.bin %> <%= command.id %>"
|
|
609
|
-
],
|
|
610
|
-
"flags": {
|
|
611
|
-
"json": {
|
|
612
|
-
"description": "Format output as json.",
|
|
613
|
-
"helpGroup": "GLOBAL",
|
|
614
|
-
"name": "json",
|
|
615
|
-
"allowNo": false,
|
|
616
|
-
"type": "boolean"
|
|
617
|
-
},
|
|
618
|
-
"flags-dir": {
|
|
619
|
-
"helpGroup": "GLOBAL",
|
|
620
|
-
"name": "flags-dir",
|
|
621
|
-
"summary": "Import flag values from a directory.",
|
|
622
|
-
"hasDynamicHelp": false,
|
|
623
|
-
"multiple": false,
|
|
624
|
-
"type": "option"
|
|
625
|
-
},
|
|
626
|
-
"target-org": {
|
|
627
|
-
"char": "o",
|
|
628
|
-
"name": "target-org",
|
|
629
|
-
"noCacheDefault": true,
|
|
630
|
-
"required": true,
|
|
631
|
-
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
632
|
-
"hasDynamicHelp": true,
|
|
633
|
-
"multiple": false,
|
|
634
|
-
"type": "option"
|
|
635
|
-
}
|
|
636
|
-
},
|
|
637
|
-
"hasDynamicHelp": true,
|
|
638
|
-
"hiddenAliases": [],
|
|
639
|
-
"id": "org:disable:tracking",
|
|
640
|
-
"pluginAlias": "@salesforce/plugin-org",
|
|
641
|
-
"pluginName": "@salesforce/plugin-org",
|
|
642
|
-
"pluginType": "core",
|
|
643
|
-
"strict": true,
|
|
644
|
-
"summary": "Prevent Salesforce CLI from tracking changes in your source files between your project and an org.",
|
|
645
|
-
"enableJsonFlag": true,
|
|
646
|
-
"isESM": true,
|
|
647
|
-
"relativePath": [
|
|
648
|
-
"lib",
|
|
649
|
-
"commands",
|
|
650
|
-
"org",
|
|
651
|
-
"disable",
|
|
652
|
-
"tracking.js"
|
|
653
|
-
],
|
|
654
|
-
"aliasPermutations": [],
|
|
655
|
-
"permutations": [
|
|
656
|
-
"org:disable:tracking",
|
|
657
|
-
"disable:org:tracking",
|
|
658
|
-
"disable:tracking:org",
|
|
659
|
-
"org:tracking:disable",
|
|
660
|
-
"tracking:org:disable",
|
|
661
|
-
"tracking:disable:org"
|
|
662
|
-
]
|
|
663
|
-
},
|
|
664
|
-
"org:delete:sandbox": {
|
|
665
|
-
"aliases": [
|
|
666
|
-
"env:delete:sandbox"
|
|
667
|
-
],
|
|
668
|
-
"args": {},
|
|
669
|
-
"deprecateAliases": true,
|
|
670
|
-
"description": "Salesforce CLI marks the org for deletion in the production org that contains the sandbox licenses and then deletes all local references to the org from your computer.\nSpecify a sandbox with either the username you used when you logged into it, or the alias you gave the sandbox when you created it. Run \"<%= config.bin %> org list\" to view all your orgs, including sandboxes, and their aliases.\nBoth the sandbox and the associated production org must already be authenticated with the CLI to successfully delete the sandbox.",
|
|
671
|
-
"examples": [
|
|
672
|
-
"Delete a sandbox with alias my-sandbox:\n<%= config.bin %> <%= command.id %> --target-org my-sandbox",
|
|
673
|
-
"Specify a username instead of an alias:\n<%= config.bin %> <%= command.id %> --target-org myusername@example.com.qa",
|
|
674
|
-
"Delete the sandbox without prompting to confirm:\n<%= config.bin %> <%= command.id %> --target-org my-sandbox --no-prompt"
|
|
675
|
-
],
|
|
676
|
-
"flags": {
|
|
677
|
-
"json": {
|
|
678
|
-
"description": "Format output as json.",
|
|
679
|
-
"helpGroup": "GLOBAL",
|
|
680
|
-
"name": "json",
|
|
681
|
-
"allowNo": false,
|
|
682
|
-
"type": "boolean"
|
|
683
|
-
},
|
|
684
|
-
"flags-dir": {
|
|
685
|
-
"helpGroup": "GLOBAL",
|
|
686
|
-
"name": "flags-dir",
|
|
687
|
-
"summary": "Import flag values from a directory.",
|
|
688
|
-
"hasDynamicHelp": false,
|
|
689
|
-
"multiple": false,
|
|
690
|
-
"type": "option"
|
|
691
|
-
},
|
|
692
|
-
"target-org": {
|
|
693
|
-
"aliases": [
|
|
694
|
-
"targetusername",
|
|
695
|
-
"u"
|
|
696
|
-
],
|
|
697
|
-
"char": "o",
|
|
698
|
-
"deprecateAliases": true,
|
|
699
|
-
"name": "target-org",
|
|
700
|
-
"required": true,
|
|
701
|
-
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
702
|
-
"hasDynamicHelp": true,
|
|
703
|
-
"multiple": false,
|
|
704
|
-
"type": "option"
|
|
705
|
-
},
|
|
706
|
-
"no-prompt": {
|
|
707
|
-
"char": "p",
|
|
708
|
-
"name": "no-prompt",
|
|
709
|
-
"summary": "Don't prompt the user to confirm the deletion.",
|
|
710
|
-
"allowNo": false,
|
|
711
|
-
"type": "boolean"
|
|
712
|
-
}
|
|
713
|
-
},
|
|
714
|
-
"hasDynamicHelp": true,
|
|
715
|
-
"hiddenAliases": [],
|
|
716
|
-
"id": "org:delete:sandbox",
|
|
717
|
-
"pluginAlias": "@salesforce/plugin-org",
|
|
718
|
-
"pluginName": "@salesforce/plugin-org",
|
|
719
|
-
"pluginType": "core",
|
|
720
|
-
"strict": true,
|
|
721
|
-
"summary": "Delete a sandbox.",
|
|
722
|
-
"enableJsonFlag": true,
|
|
723
|
-
"isESM": true,
|
|
724
|
-
"relativePath": [
|
|
725
|
-
"lib",
|
|
726
|
-
"commands",
|
|
727
|
-
"org",
|
|
728
|
-
"delete",
|
|
729
|
-
"sandbox.js"
|
|
730
|
-
],
|
|
731
|
-
"aliasPermutations": [
|
|
732
|
-
"env:delete:sandbox",
|
|
733
|
-
"delete:env:sandbox",
|
|
734
|
-
"delete:sandbox:env",
|
|
735
|
-
"env:sandbox:delete",
|
|
736
|
-
"sandbox:env:delete",
|
|
737
|
-
"sandbox:delete:env"
|
|
738
|
-
],
|
|
739
|
-
"permutations": [
|
|
740
|
-
"org:delete:sandbox",
|
|
741
|
-
"delete:org:sandbox",
|
|
742
|
-
"delete:sandbox:org",
|
|
743
|
-
"org:sandbox:delete",
|
|
744
|
-
"sandbox:org:delete",
|
|
745
|
-
"sandbox:delete:org"
|
|
746
|
-
]
|
|
747
|
-
},
|
|
748
|
-
"org:delete:scratch": {
|
|
749
|
-
"aliases": [
|
|
750
|
-
"env:delete:scratch"
|
|
751
|
-
],
|
|
752
|
-
"args": {},
|
|
753
|
-
"deprecateAliases": true,
|
|
754
|
-
"description": "Salesforce CLI marks the org for deletion in the Dev Hub org and then deletes all local references to the org from your computer.\nSpecify a scratch org with either the username or the alias you gave the scratch org when you created it. Run \"<%= config.bin %> org list\" to view all your orgs, including scratch orgs, and their aliases.",
|
|
755
|
-
"examples": [
|
|
756
|
-
"Delete a scratch org with alias my-scratch-org:\n<%= config.bin %> <%= command.id %> --target-org my-scratch-org",
|
|
757
|
-
"Specify a username instead of an alias:\n<%= config.bin %> <%= command.id %> --target-org test-123456-abcdefg@example.com",
|
|
758
|
-
"Delete the scratch org without prompting to confirm :\n<%= config.bin %> <%= command.id %> --target-org my-scratch-org --no-prompt"
|
|
759
|
-
],
|
|
760
|
-
"flags": {
|
|
761
|
-
"json": {
|
|
762
|
-
"description": "Format output as json.",
|
|
763
|
-
"helpGroup": "GLOBAL",
|
|
764
|
-
"name": "json",
|
|
765
|
-
"allowNo": false,
|
|
766
|
-
"type": "boolean"
|
|
767
|
-
},
|
|
768
|
-
"flags-dir": {
|
|
769
|
-
"helpGroup": "GLOBAL",
|
|
770
|
-
"name": "flags-dir",
|
|
771
|
-
"summary": "Import flag values from a directory.",
|
|
772
|
-
"hasDynamicHelp": false,
|
|
773
|
-
"multiple": false,
|
|
774
|
-
"type": "option"
|
|
775
|
-
},
|
|
776
|
-
"target-org": {
|
|
777
|
-
"aliases": [
|
|
778
|
-
"targetusername",
|
|
779
|
-
"u"
|
|
780
|
-
],
|
|
781
|
-
"char": "o",
|
|
782
|
-
"deprecateAliases": true,
|
|
783
|
-
"name": "target-org",
|
|
784
|
-
"required": true,
|
|
785
|
-
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
786
|
-
"hasDynamicHelp": true,
|
|
787
|
-
"multiple": false,
|
|
788
|
-
"type": "option"
|
|
789
|
-
},
|
|
790
|
-
"no-prompt": {
|
|
791
|
-
"char": "p",
|
|
792
|
-
"name": "no-prompt",
|
|
793
|
-
"summary": "Don't prompt the user to confirm the deletion.",
|
|
794
|
-
"allowNo": false,
|
|
795
|
-
"type": "boolean"
|
|
796
|
-
}
|
|
797
|
-
},
|
|
798
|
-
"hasDynamicHelp": true,
|
|
799
|
-
"hiddenAliases": [],
|
|
800
|
-
"id": "org:delete:scratch",
|
|
801
|
-
"pluginAlias": "@salesforce/plugin-org",
|
|
802
|
-
"pluginName": "@salesforce/plugin-org",
|
|
803
|
-
"pluginType": "core",
|
|
804
|
-
"strict": true,
|
|
805
|
-
"summary": "Delete a scratch org.",
|
|
806
|
-
"enableJsonFlag": true,
|
|
807
|
-
"isESM": true,
|
|
808
|
-
"relativePath": [
|
|
809
|
-
"lib",
|
|
810
|
-
"commands",
|
|
811
|
-
"org",
|
|
812
|
-
"delete",
|
|
813
|
-
"scratch.js"
|
|
814
|
-
],
|
|
815
|
-
"aliasPermutations": [
|
|
816
|
-
"env:delete:scratch",
|
|
817
|
-
"delete:env:scratch",
|
|
818
|
-
"delete:scratch:env",
|
|
819
|
-
"env:scratch:delete",
|
|
820
|
-
"scratch:env:delete",
|
|
821
|
-
"scratch:delete:env"
|
|
822
|
-
],
|
|
823
|
-
"permutations": [
|
|
824
|
-
"org:delete:scratch",
|
|
825
|
-
"delete:org:scratch",
|
|
826
|
-
"delete:scratch:org",
|
|
827
|
-
"org:scratch:delete",
|
|
828
|
-
"scratch:org:delete",
|
|
829
|
-
"scratch:delete:org"
|
|
830
|
-
]
|
|
831
|
-
},
|
|
832
601
|
"org:create:agent-user": {
|
|
833
602
|
"aliases": [],
|
|
834
603
|
"args": {},
|
|
@@ -1389,14 +1158,182 @@
|
|
|
1389
1158
|
"scratch:create:org"
|
|
1390
1159
|
]
|
|
1391
1160
|
},
|
|
1392
|
-
"org:
|
|
1161
|
+
"org:delete:sandbox": {
|
|
1162
|
+
"aliases": [
|
|
1163
|
+
"env:delete:sandbox"
|
|
1164
|
+
],
|
|
1165
|
+
"args": {},
|
|
1166
|
+
"deprecateAliases": true,
|
|
1167
|
+
"description": "Salesforce CLI marks the org for deletion in the production org that contains the sandbox licenses and then deletes all local references to the org from your computer.\nSpecify a sandbox with either the username you used when you logged into it, or the alias you gave the sandbox when you created it. Run \"<%= config.bin %> org list\" to view all your orgs, including sandboxes, and their aliases.\nBoth the sandbox and the associated production org must already be authenticated with the CLI to successfully delete the sandbox.",
|
|
1168
|
+
"examples": [
|
|
1169
|
+
"Delete a sandbox with alias my-sandbox:\n<%= config.bin %> <%= command.id %> --target-org my-sandbox",
|
|
1170
|
+
"Specify a username instead of an alias:\n<%= config.bin %> <%= command.id %> --target-org myusername@example.com.qa",
|
|
1171
|
+
"Delete the sandbox without prompting to confirm:\n<%= config.bin %> <%= command.id %> --target-org my-sandbox --no-prompt"
|
|
1172
|
+
],
|
|
1173
|
+
"flags": {
|
|
1174
|
+
"json": {
|
|
1175
|
+
"description": "Format output as json.",
|
|
1176
|
+
"helpGroup": "GLOBAL",
|
|
1177
|
+
"name": "json",
|
|
1178
|
+
"allowNo": false,
|
|
1179
|
+
"type": "boolean"
|
|
1180
|
+
},
|
|
1181
|
+
"flags-dir": {
|
|
1182
|
+
"helpGroup": "GLOBAL",
|
|
1183
|
+
"name": "flags-dir",
|
|
1184
|
+
"summary": "Import flag values from a directory.",
|
|
1185
|
+
"hasDynamicHelp": false,
|
|
1186
|
+
"multiple": false,
|
|
1187
|
+
"type": "option"
|
|
1188
|
+
},
|
|
1189
|
+
"target-org": {
|
|
1190
|
+
"aliases": [
|
|
1191
|
+
"targetusername",
|
|
1192
|
+
"u"
|
|
1193
|
+
],
|
|
1194
|
+
"char": "o",
|
|
1195
|
+
"deprecateAliases": true,
|
|
1196
|
+
"name": "target-org",
|
|
1197
|
+
"required": true,
|
|
1198
|
+
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
1199
|
+
"hasDynamicHelp": true,
|
|
1200
|
+
"multiple": false,
|
|
1201
|
+
"type": "option"
|
|
1202
|
+
},
|
|
1203
|
+
"no-prompt": {
|
|
1204
|
+
"char": "p",
|
|
1205
|
+
"name": "no-prompt",
|
|
1206
|
+
"summary": "Don't prompt the user to confirm the deletion.",
|
|
1207
|
+
"allowNo": false,
|
|
1208
|
+
"type": "boolean"
|
|
1209
|
+
}
|
|
1210
|
+
},
|
|
1211
|
+
"hasDynamicHelp": true,
|
|
1212
|
+
"hiddenAliases": [],
|
|
1213
|
+
"id": "org:delete:sandbox",
|
|
1214
|
+
"pluginAlias": "@salesforce/plugin-org",
|
|
1215
|
+
"pluginName": "@salesforce/plugin-org",
|
|
1216
|
+
"pluginType": "core",
|
|
1217
|
+
"strict": true,
|
|
1218
|
+
"summary": "Delete a sandbox.",
|
|
1219
|
+
"enableJsonFlag": true,
|
|
1220
|
+
"isESM": true,
|
|
1221
|
+
"relativePath": [
|
|
1222
|
+
"lib",
|
|
1223
|
+
"commands",
|
|
1224
|
+
"org",
|
|
1225
|
+
"delete",
|
|
1226
|
+
"sandbox.js"
|
|
1227
|
+
],
|
|
1228
|
+
"aliasPermutations": [
|
|
1229
|
+
"env:delete:sandbox",
|
|
1230
|
+
"delete:env:sandbox",
|
|
1231
|
+
"delete:sandbox:env",
|
|
1232
|
+
"env:sandbox:delete",
|
|
1233
|
+
"sandbox:env:delete",
|
|
1234
|
+
"sandbox:delete:env"
|
|
1235
|
+
],
|
|
1236
|
+
"permutations": [
|
|
1237
|
+
"org:delete:sandbox",
|
|
1238
|
+
"delete:org:sandbox",
|
|
1239
|
+
"delete:sandbox:org",
|
|
1240
|
+
"org:sandbox:delete",
|
|
1241
|
+
"sandbox:org:delete",
|
|
1242
|
+
"sandbox:delete:org"
|
|
1243
|
+
]
|
|
1244
|
+
},
|
|
1245
|
+
"org:delete:scratch": {
|
|
1246
|
+
"aliases": [
|
|
1247
|
+
"env:delete:scratch"
|
|
1248
|
+
],
|
|
1249
|
+
"args": {},
|
|
1250
|
+
"deprecateAliases": true,
|
|
1251
|
+
"description": "Salesforce CLI marks the org for deletion in the Dev Hub org and then deletes all local references to the org from your computer.\nSpecify a scratch org with either the username or the alias you gave the scratch org when you created it. Run \"<%= config.bin %> org list\" to view all your orgs, including scratch orgs, and their aliases.",
|
|
1252
|
+
"examples": [
|
|
1253
|
+
"Delete a scratch org with alias my-scratch-org:\n<%= config.bin %> <%= command.id %> --target-org my-scratch-org",
|
|
1254
|
+
"Specify a username instead of an alias:\n<%= config.bin %> <%= command.id %> --target-org test-123456-abcdefg@example.com",
|
|
1255
|
+
"Delete the scratch org without prompting to confirm :\n<%= config.bin %> <%= command.id %> --target-org my-scratch-org --no-prompt"
|
|
1256
|
+
],
|
|
1257
|
+
"flags": {
|
|
1258
|
+
"json": {
|
|
1259
|
+
"description": "Format output as json.",
|
|
1260
|
+
"helpGroup": "GLOBAL",
|
|
1261
|
+
"name": "json",
|
|
1262
|
+
"allowNo": false,
|
|
1263
|
+
"type": "boolean"
|
|
1264
|
+
},
|
|
1265
|
+
"flags-dir": {
|
|
1266
|
+
"helpGroup": "GLOBAL",
|
|
1267
|
+
"name": "flags-dir",
|
|
1268
|
+
"summary": "Import flag values from a directory.",
|
|
1269
|
+
"hasDynamicHelp": false,
|
|
1270
|
+
"multiple": false,
|
|
1271
|
+
"type": "option"
|
|
1272
|
+
},
|
|
1273
|
+
"target-org": {
|
|
1274
|
+
"aliases": [
|
|
1275
|
+
"targetusername",
|
|
1276
|
+
"u"
|
|
1277
|
+
],
|
|
1278
|
+
"char": "o",
|
|
1279
|
+
"deprecateAliases": true,
|
|
1280
|
+
"name": "target-org",
|
|
1281
|
+
"required": true,
|
|
1282
|
+
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
1283
|
+
"hasDynamicHelp": true,
|
|
1284
|
+
"multiple": false,
|
|
1285
|
+
"type": "option"
|
|
1286
|
+
},
|
|
1287
|
+
"no-prompt": {
|
|
1288
|
+
"char": "p",
|
|
1289
|
+
"name": "no-prompt",
|
|
1290
|
+
"summary": "Don't prompt the user to confirm the deletion.",
|
|
1291
|
+
"allowNo": false,
|
|
1292
|
+
"type": "boolean"
|
|
1293
|
+
}
|
|
1294
|
+
},
|
|
1295
|
+
"hasDynamicHelp": true,
|
|
1296
|
+
"hiddenAliases": [],
|
|
1297
|
+
"id": "org:delete:scratch",
|
|
1298
|
+
"pluginAlias": "@salesforce/plugin-org",
|
|
1299
|
+
"pluginName": "@salesforce/plugin-org",
|
|
1300
|
+
"pluginType": "core",
|
|
1301
|
+
"strict": true,
|
|
1302
|
+
"summary": "Delete a scratch org.",
|
|
1303
|
+
"enableJsonFlag": true,
|
|
1304
|
+
"isESM": true,
|
|
1305
|
+
"relativePath": [
|
|
1306
|
+
"lib",
|
|
1307
|
+
"commands",
|
|
1308
|
+
"org",
|
|
1309
|
+
"delete",
|
|
1310
|
+
"scratch.js"
|
|
1311
|
+
],
|
|
1312
|
+
"aliasPermutations": [
|
|
1313
|
+
"env:delete:scratch",
|
|
1314
|
+
"delete:env:scratch",
|
|
1315
|
+
"delete:scratch:env",
|
|
1316
|
+
"env:scratch:delete",
|
|
1317
|
+
"scratch:env:delete",
|
|
1318
|
+
"scratch:delete:env"
|
|
1319
|
+
],
|
|
1320
|
+
"permutations": [
|
|
1321
|
+
"org:delete:scratch",
|
|
1322
|
+
"delete:org:scratch",
|
|
1323
|
+
"delete:scratch:org",
|
|
1324
|
+
"org:scratch:delete",
|
|
1325
|
+
"scratch:org:delete",
|
|
1326
|
+
"scratch:delete:org"
|
|
1327
|
+
]
|
|
1328
|
+
},
|
|
1329
|
+
"org:disable:tracking": {
|
|
1393
1330
|
"aliases": [],
|
|
1394
1331
|
"args": {},
|
|
1395
|
-
"description": "
|
|
1332
|
+
"description": "Disabling source tracking has no direct effect on the org, it affects only your local environment. Specifically, Salesforce CLI stores the setting in the org's local configuration file so that no source tracking operations are executed when working with the org.",
|
|
1396
1333
|
"examples": [
|
|
1397
|
-
"
|
|
1398
|
-
"
|
|
1399
|
-
"
|
|
1334
|
+
"Disable source tracking for an org with alias \"myscratch\":\n<%= config.bin %> <%= command.id %> --target-org myscratch",
|
|
1335
|
+
"Disable source tracking for an org using a username:\n<%= config.bin %> <%= command.id %> --target-org you@example.com",
|
|
1336
|
+
"Disable source tracking for your default org:\n<%= config.bin %> <%= command.id %>"
|
|
1400
1337
|
],
|
|
1401
1338
|
"flags": {
|
|
1402
1339
|
"json": {
|
|
@@ -1427,29 +1364,29 @@
|
|
|
1427
1364
|
},
|
|
1428
1365
|
"hasDynamicHelp": true,
|
|
1429
1366
|
"hiddenAliases": [],
|
|
1430
|
-
"id": "org:
|
|
1367
|
+
"id": "org:disable:tracking",
|
|
1431
1368
|
"pluginAlias": "@salesforce/plugin-org",
|
|
1432
1369
|
"pluginName": "@salesforce/plugin-org",
|
|
1433
1370
|
"pluginType": "core",
|
|
1434
1371
|
"strict": true,
|
|
1435
|
-
"summary": "
|
|
1372
|
+
"summary": "Prevent Salesforce CLI from tracking changes in your source files between your project and an org.",
|
|
1436
1373
|
"enableJsonFlag": true,
|
|
1437
1374
|
"isESM": true,
|
|
1438
1375
|
"relativePath": [
|
|
1439
1376
|
"lib",
|
|
1440
1377
|
"commands",
|
|
1441
1378
|
"org",
|
|
1442
|
-
"
|
|
1379
|
+
"disable",
|
|
1443
1380
|
"tracking.js"
|
|
1444
1381
|
],
|
|
1445
1382
|
"aliasPermutations": [],
|
|
1446
1383
|
"permutations": [
|
|
1447
|
-
"org:
|
|
1448
|
-
"
|
|
1449
|
-
"
|
|
1450
|
-
"org:tracking:
|
|
1451
|
-
"tracking:org:
|
|
1452
|
-
"tracking:
|
|
1384
|
+
"org:disable:tracking",
|
|
1385
|
+
"disable:org:tracking",
|
|
1386
|
+
"disable:tracking:org",
|
|
1387
|
+
"org:tracking:disable",
|
|
1388
|
+
"tracking:org:disable",
|
|
1389
|
+
"tracking:disable:org"
|
|
1453
1390
|
]
|
|
1454
1391
|
},
|
|
1455
1392
|
"org:list:metadata-types": {
|
|
@@ -1711,6 +1648,69 @@
|
|
|
1711
1648
|
"metadata:list:org"
|
|
1712
1649
|
]
|
|
1713
1650
|
},
|
|
1651
|
+
"org:enable:tracking": {
|
|
1652
|
+
"aliases": [],
|
|
1653
|
+
"args": {},
|
|
1654
|
+
"description": "Enabling source tracking has no direct effect on the org, it affects only your local environment. Specifically, Salesforce CLI stores the setting in the org's local configuration file so that source tracking operations are executed when working with the org.\n\nThis command throws an error if the org doesn't support tracking. Examples of orgs that don't support source tracking include Developer Edition orgs, production orgs, Partial Copy sandboxes, and Full sandboxes.",
|
|
1655
|
+
"examples": [
|
|
1656
|
+
"Enable source tracking for an org with alias \"myscratch\":\n<%= config.bin %> <%= command.id %> --target-org myscratch",
|
|
1657
|
+
"Enable source tracking for an org using a username:\n<%= config.bin %> <%= command.id %> --target-org you@example.com",
|
|
1658
|
+
"Enable source tracking for your default org:\n<%= config.bin %> <%= command.id %>"
|
|
1659
|
+
],
|
|
1660
|
+
"flags": {
|
|
1661
|
+
"json": {
|
|
1662
|
+
"description": "Format output as json.",
|
|
1663
|
+
"helpGroup": "GLOBAL",
|
|
1664
|
+
"name": "json",
|
|
1665
|
+
"allowNo": false,
|
|
1666
|
+
"type": "boolean"
|
|
1667
|
+
},
|
|
1668
|
+
"flags-dir": {
|
|
1669
|
+
"helpGroup": "GLOBAL",
|
|
1670
|
+
"name": "flags-dir",
|
|
1671
|
+
"summary": "Import flag values from a directory.",
|
|
1672
|
+
"hasDynamicHelp": false,
|
|
1673
|
+
"multiple": false,
|
|
1674
|
+
"type": "option"
|
|
1675
|
+
},
|
|
1676
|
+
"target-org": {
|
|
1677
|
+
"char": "o",
|
|
1678
|
+
"name": "target-org",
|
|
1679
|
+
"noCacheDefault": true,
|
|
1680
|
+
"required": true,
|
|
1681
|
+
"summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
|
|
1682
|
+
"hasDynamicHelp": true,
|
|
1683
|
+
"multiple": false,
|
|
1684
|
+
"type": "option"
|
|
1685
|
+
}
|
|
1686
|
+
},
|
|
1687
|
+
"hasDynamicHelp": true,
|
|
1688
|
+
"hiddenAliases": [],
|
|
1689
|
+
"id": "org:enable:tracking",
|
|
1690
|
+
"pluginAlias": "@salesforce/plugin-org",
|
|
1691
|
+
"pluginName": "@salesforce/plugin-org",
|
|
1692
|
+
"pluginType": "core",
|
|
1693
|
+
"strict": true,
|
|
1694
|
+
"summary": "Allow Salesforce CLI to track changes in your source files between your project and an org.",
|
|
1695
|
+
"enableJsonFlag": true,
|
|
1696
|
+
"isESM": true,
|
|
1697
|
+
"relativePath": [
|
|
1698
|
+
"lib",
|
|
1699
|
+
"commands",
|
|
1700
|
+
"org",
|
|
1701
|
+
"enable",
|
|
1702
|
+
"tracking.js"
|
|
1703
|
+
],
|
|
1704
|
+
"aliasPermutations": [],
|
|
1705
|
+
"permutations": [
|
|
1706
|
+
"org:enable:tracking",
|
|
1707
|
+
"enable:org:tracking",
|
|
1708
|
+
"enable:tracking:org",
|
|
1709
|
+
"org:tracking:enable",
|
|
1710
|
+
"tracking:org:enable",
|
|
1711
|
+
"tracking:enable:org"
|
|
1712
|
+
]
|
|
1713
|
+
},
|
|
1714
1714
|
"org:open:agent": {
|
|
1715
1715
|
"aliases": [],
|
|
1716
1716
|
"args": {},
|
|
@@ -2311,5 +2311,5 @@
|
|
|
2311
2311
|
]
|
|
2312
2312
|
}
|
|
2313
2313
|
},
|
|
2314
|
-
"version": "5.11.
|
|
2314
|
+
"version": "5.11.2"
|
|
2315
2315
|
}
|
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": "5.11.
|
|
4
|
+
"version": "5.11.2",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"enableO11y": true,
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@oclif/core": "^4.11.3",
|
|
11
11
|
"@oclif/multi-stage-output": "^0.8.40",
|
|
12
|
-
"@salesforce/core": "^8.
|
|
12
|
+
"@salesforce/core": "^8.31.0",
|
|
13
13
|
"@salesforce/kit": "^3.2.4",
|
|
14
14
|
"@salesforce/sf-plugins-core": "^12.2.16",
|
|
15
15
|
"@salesforce/source-deploy-retrieve": "^12.35.1",
|
|
@@ -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/5.11.
|
|
237
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/5.11.
|
|
236
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/5.11.2.crt",
|
|
237
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/5.11.2.sig"
|
|
238
238
|
}
|
|
239
239
|
}
|