@salesforce/plugin-org 1.13.1 → 2.0.1
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/CHANGELOG.md +30 -0
- package/README.md +107 -114
- package/lib/commands/force/org/beta/create.js +19 -21
- package/lib/commands/force/org/beta/create.js.map +1 -1
- package/lib/commands/force/org/clone.js +9 -13
- package/lib/commands/force/org/clone.js.map +1 -1
- package/lib/commands/force/org/display.js +5 -8
- package/lib/commands/force/org/display.js.map +1 -1
- package/lib/commands/force/org/list.js +42 -25
- package/lib/commands/force/org/list.js.map +1 -1
- package/lib/commands/force/org/open.js +5 -5
- package/lib/commands/force/org/open.js.map +1 -1
- package/lib/commands/force/org/status.js +7 -8
- package/lib/commands/force/org/status.js.map +1 -1
- package/lib/shared/orgListUtil.d.ts +6 -3
- package/lib/shared/orgListUtil.js +9 -8
- package/lib/shared/orgListUtil.js.map +1 -1
- package/lib/shared/sandboxReporter.js +2 -3
- package/lib/shared/sandboxReporter.js.map +1 -1
- package/lib/shared/utils.js +2 -2
- package/lib/shared/utils.js.map +1 -1
- package/messages/clone.json +5 -2
- package/messages/display.json +4 -4
- package/messages/list.json +3 -3
- package/messages/open.json +5 -5
- package/messages/status.json +2 -2
- package/oclif.manifest.json +1 -1
- package/package.json +17 -18
|
@@ -34,20 +34,19 @@ class OrgCloneCommand extends command_1.SfdxCommand {
|
|
|
34
34
|
this.ux.log(sandboxReadyForUse);
|
|
35
35
|
this.ux.styledHeader('Sandbox Org Cloning Status');
|
|
36
36
|
this.ux.table(data, {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
{ key: 'value', label: 'Value' },
|
|
40
|
-
],
|
|
37
|
+
key: { header: 'Name' },
|
|
38
|
+
value: { header: 'Value' },
|
|
41
39
|
});
|
|
42
40
|
if ((_a = results === null || results === void 0 ? void 0 : results.sandboxRes) === null || _a === void 0 ? void 0 : _a.authUserName) {
|
|
43
41
|
if (this.flags.setalias) {
|
|
44
|
-
const
|
|
45
|
-
|
|
42
|
+
const stateAggregator = await core_1.StateAggregator.getInstance();
|
|
43
|
+
stateAggregator.aliases.set(this.flags.setalias, results.sandboxRes.authUserName);
|
|
44
|
+
const result = stateAggregator.aliases.getAll();
|
|
46
45
|
this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);
|
|
47
46
|
}
|
|
48
47
|
if (this.flags.setdefaultusername) {
|
|
49
48
|
const globalConfig = this.configAggregator.getGlobalConfig();
|
|
50
|
-
globalConfig.set(core_1.
|
|
49
|
+
globalConfig.set(core_1.OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
|
|
51
50
|
const result = await globalConfig.write();
|
|
52
51
|
this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
|
|
53
52
|
}
|
|
@@ -59,9 +58,7 @@ class OrgCloneCommand extends command_1.SfdxCommand {
|
|
|
59
58
|
return this.org.cloneSandbox(sandboxReq, srcSandboxName, { wait });
|
|
60
59
|
}
|
|
61
60
|
else {
|
|
62
|
-
throw
|
|
63
|
-
core_1.OrgTypes.Sandbox,
|
|
64
|
-
]).addAction('commandOrganizationTypeNotSupportAction', [core_1.OrgTypes.Sandbox]));
|
|
61
|
+
throw new core_1.SfError(messages.getMessage('commandOrganizationTypeNotSupport', [core_1.OrgTypes.Sandbox]), messages.getMessage('commandOrganizationTypeNotSupportAction', [core_1.OrgTypes.Sandbox]));
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
createSandboxRequest() {
|
|
@@ -89,9 +86,7 @@ class OrgCloneCommand extends command_1.SfdxCommand {
|
|
|
89
86
|
}
|
|
90
87
|
else {
|
|
91
88
|
// error - we need SourceSandboxName to know which sandbox to clone from
|
|
92
|
-
throw
|
|
93
|
-
OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME,
|
|
94
|
-
]).addAction('missingSourceSandboxNameAction', [OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME]));
|
|
89
|
+
throw new core_1.SfError(messages.getMessage('missingSourceSandboxName', [OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME]), messages.getMessage('missingSourceSandboxNameAction', [OrgCloneCommand.SANDBOXDEF_SRC_SANDBOXNAME]));
|
|
95
90
|
}
|
|
96
91
|
return { sandboxReq, srcSandboxName };
|
|
97
92
|
}
|
|
@@ -137,6 +132,7 @@ OrgCloneCommand.flagsConfig = {
|
|
|
137
132
|
wait: command_1.flags.minutes({
|
|
138
133
|
char: 'w',
|
|
139
134
|
description: messages.getMessage('flags.wait'),
|
|
135
|
+
longDescription: messages.getMessage('flagsLong.wait'),
|
|
140
136
|
min: kit_1.Duration.minutes(2),
|
|
141
137
|
default: kit_1.Duration.minutes(6),
|
|
142
138
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../../../src/commands/force/org/clone.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2BAAyB;AACzB,yBAAyB;AACzB,iDAAsE;AACtE,2CAa0B;AAC1B,yCAAuD;AACvD,qEAAkE;AAElE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;AAE1E,MAAa,eAAgB,SAAQ,qBAAW;
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../../../src/commands/force/org/clone.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,12 +58,6 @@ class OrgDisplayCommand extends command_1.SfdxCommand {
|
|
|
58
58
|
}
|
|
59
59
|
print(result) {
|
|
60
60
|
this.ux.log('');
|
|
61
|
-
const columns = {
|
|
62
|
-
columns: [
|
|
63
|
-
{ key: 'key', label: 'KEY' },
|
|
64
|
-
{ key: 'value', label: 'VALUE' },
|
|
65
|
-
],
|
|
66
|
-
};
|
|
67
61
|
const tableRows = Object.keys(result)
|
|
68
62
|
.filter((key) => result[key] !== undefined && result[key] !== null) // some values won't exist
|
|
69
63
|
.sort() // this command always alphabetizes the table rows
|
|
@@ -72,7 +66,10 @@ class OrgDisplayCommand extends command_1.SfdxCommand {
|
|
|
72
66
|
value: (0, orgHighlighter_1.getStyledValue)(key, result[key]),
|
|
73
67
|
}));
|
|
74
68
|
this.ux.styledHeader('Org Description');
|
|
75
|
-
this.ux.table(tableRows,
|
|
69
|
+
this.ux.table(tableRows, {
|
|
70
|
+
key: { header: 'KEY' },
|
|
71
|
+
value: { header: 'VALUE' },
|
|
72
|
+
});
|
|
76
73
|
}
|
|
77
74
|
async getScratchOrgInformation(orgId) {
|
|
78
75
|
var _a, _b, _c;
|
|
@@ -89,7 +86,7 @@ class OrgDisplayCommand extends command_1.SfdxCommand {
|
|
|
89
86
|
createdDate: result.CreatedDate,
|
|
90
87
|
};
|
|
91
88
|
}
|
|
92
|
-
throw new core_1.
|
|
89
|
+
throw new core_1.SfError(messages.getMessage('noScratchOrgInfoError', [core_1.sfdc.trimTo15(orgId), hubOrg.getUsername()]), 'NoScratchInfo', [messages.getMessage('noScratchOrgInfoAction')]);
|
|
93
90
|
}
|
|
94
91
|
}
|
|
95
92
|
exports.OrgDisplayCommand = OrgDisplayCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/commands/force/org/display.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/commands/force/org/display.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,12 +26,12 @@ class OrgListCommand extends command_1.SfdxCommand {
|
|
|
26
26
|
async run() {
|
|
27
27
|
let fileNames = [];
|
|
28
28
|
try {
|
|
29
|
-
fileNames = await core_1.AuthInfo.
|
|
29
|
+
fileNames = (await core_1.AuthInfo.listAllAuthorizations()).map((auth) => auth.username);
|
|
30
30
|
}
|
|
31
31
|
catch (err) {
|
|
32
32
|
const error = err;
|
|
33
33
|
if (error.name === 'NoAuthInfoFound') {
|
|
34
|
-
throw new core_1.
|
|
34
|
+
throw new core_1.SfError(messages.getMessage('noOrgsFound'), 'noOrgsFound', [
|
|
35
35
|
messages.getMessage('noOrgsFoundAction'),
|
|
36
36
|
]);
|
|
37
37
|
}
|
|
@@ -90,17 +90,25 @@ class OrgListCommand extends command_1.SfdxCommand {
|
|
|
90
90
|
}
|
|
91
91
|
printOrgTable(nonScratchOrgs, skipconnectionstatus) {
|
|
92
92
|
// default columns for the non-scratch org list
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
93
|
+
let nonScratchOrgColumns = {
|
|
94
|
+
defaultMarker: {
|
|
95
|
+
header: '',
|
|
96
|
+
get: (data) => { var _a; return (_a = data.defaultMarker) !== null && _a !== void 0 ? _a : ''; },
|
|
97
|
+
},
|
|
98
|
+
alias: {
|
|
99
|
+
header: 'ALIAS',
|
|
100
|
+
get: (data) => { var _a; return (_a = data.alias) !== null && _a !== void 0 ? _a : ''; },
|
|
101
|
+
},
|
|
102
|
+
username: { header: 'USERNAME' },
|
|
103
|
+
orgId: { header: 'ORG ID' },
|
|
104
|
+
};
|
|
99
105
|
if (!skipconnectionstatus) {
|
|
100
|
-
nonScratchOrgColumns.
|
|
106
|
+
nonScratchOrgColumns = Object.assign(nonScratchOrgColumns, {
|
|
107
|
+
connectedStatus: { header: 'CONNECTED STATUS' },
|
|
108
|
+
});
|
|
101
109
|
}
|
|
102
110
|
if (nonScratchOrgs.length) {
|
|
103
|
-
this.ux.table(nonScratchOrgs.map((row) => (0, orgHighlighter_1.getStyledObject)(row)),
|
|
111
|
+
this.ux.table(nonScratchOrgs.map((row) => (0, orgHighlighter_1.getStyledObject)(row)), nonScratchOrgColumns);
|
|
104
112
|
}
|
|
105
113
|
else {
|
|
106
114
|
this.ux.log(messages.getMessage('noResultsFound'));
|
|
@@ -112,7 +120,7 @@ class OrgListCommand extends command_1.SfdxCommand {
|
|
|
112
120
|
}
|
|
113
121
|
else {
|
|
114
122
|
// One or more rows are available.
|
|
115
|
-
this.ux.table(scratchOrgs.map((row) => (0, orgHighlighter_1.getStyledObject)(row)),
|
|
123
|
+
this.ux.table(scratchOrgs.map((row) => (0, orgHighlighter_1.getStyledObject)(row)), this.getScratchOrgColumnData());
|
|
116
124
|
}
|
|
117
125
|
}
|
|
118
126
|
extractDefaultOrgStatus(val) {
|
|
@@ -125,26 +133,35 @@ class OrgListCommand extends command_1.SfdxCommand {
|
|
|
125
133
|
}
|
|
126
134
|
getScratchOrgColumnData() {
|
|
127
135
|
// default columns for the scratch org list
|
|
128
|
-
let scratchOrgColumns =
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
136
|
+
let scratchOrgColumns = {
|
|
137
|
+
defaultMarker: {
|
|
138
|
+
header: '',
|
|
139
|
+
get: (data) => { var _a; return (_a = data.defaultMarker) !== null && _a !== void 0 ? _a : ''; },
|
|
140
|
+
},
|
|
141
|
+
alias: {
|
|
142
|
+
header: 'ALIAS',
|
|
143
|
+
get: (data) => { var _a; return (_a = data.alias) !== null && _a !== void 0 ? _a : ''; },
|
|
144
|
+
},
|
|
145
|
+
username: { header: 'USERNAME' },
|
|
146
|
+
orgId: { header: 'ORG ID' },
|
|
147
|
+
};
|
|
134
148
|
if (this.flags.all || this.flags.verbose) {
|
|
135
|
-
scratchOrgColumns.
|
|
149
|
+
scratchOrgColumns = Object.assign(scratchOrgColumns, {
|
|
150
|
+
status: { header: 'STATUS' },
|
|
151
|
+
});
|
|
136
152
|
}
|
|
137
153
|
// scratch org verbose columns
|
|
138
154
|
if (this.flags.verbose) {
|
|
139
|
-
scratchOrgColumns =
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
];
|
|
155
|
+
scratchOrgColumns = Object.assign(scratchOrgColumns, {
|
|
156
|
+
devHubOrgId: { header: 'DEV HUB' },
|
|
157
|
+
createdDate: { header: 'CREATED DATE' },
|
|
158
|
+
instanceUrl: { header: 'INSTANCE URL' },
|
|
159
|
+
});
|
|
145
160
|
}
|
|
146
161
|
// scratch org expiration date should be on the end.
|
|
147
|
-
return
|
|
162
|
+
return Object.assign(scratchOrgColumns, {
|
|
163
|
+
expirationDate: { header: 'EXPIRATION DATE' },
|
|
164
|
+
});
|
|
148
165
|
}
|
|
149
166
|
}
|
|
150
167
|
exports.OrgListCommand = OrgListCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/force/org/list.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2BAAyB;AAEzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/force/org/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,11 +54,9 @@ class OrgOpenCommand extends command_1.SfdxCommand {
|
|
|
54
54
|
const domain = `https://${/https?:\/\/([^.]*)/.exec(url)[1]}.lightning.force.com`;
|
|
55
55
|
const timeout = new kit_1.Duration(new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240), kit_1.Duration.Unit.SECONDS);
|
|
56
56
|
this.logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
|
|
57
|
-
throw new core_1.
|
|
58
|
-
messages.getMessage('domainTimeoutAction'),
|
|
59
|
-
]);
|
|
57
|
+
throw new core_1.SfError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError');
|
|
60
58
|
}
|
|
61
|
-
throw core_1.
|
|
59
|
+
throw core_1.SfError.wrap(err);
|
|
62
60
|
}
|
|
63
61
|
const openOptions = typeof this.flags.browser === 'string' ? { app: { name: open.apps[this.flags.browser] } } : {};
|
|
64
62
|
await (0, utils_1.openUrl)(url, openOptions);
|
|
@@ -88,7 +86,9 @@ OrgOpenCommand.flagsConfig = {
|
|
|
88
86
|
char: 'p',
|
|
89
87
|
description: messages.getMessage('cliPath'),
|
|
90
88
|
env: 'FORCE_OPEN_URL',
|
|
91
|
-
parse: (input) =>
|
|
89
|
+
parse: (input) => {
|
|
90
|
+
return Promise.resolve(encodeURIComponent(decodeURIComponent(input)));
|
|
91
|
+
},
|
|
92
92
|
}),
|
|
93
93
|
urlonly: command_1.flags.boolean({
|
|
94
94
|
char: 'r',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/force/org/open.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2BAAyB;AAEzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/force/org/open.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,20 +29,19 @@ class OrgStatusCommand extends command_1.SfdxCommand {
|
|
|
29
29
|
const { data } = sandboxReporter_1.SandboxReporter.logSandboxProcessResult(results);
|
|
30
30
|
this.ux.styledHeader('Sandbox Org Status');
|
|
31
31
|
this.ux.table(data, {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
{ key: 'value', label: 'Value' },
|
|
35
|
-
],
|
|
32
|
+
key: { header: 'Name' },
|
|
33
|
+
value: { header: 'Value' },
|
|
36
34
|
});
|
|
37
35
|
if ((_a = results.sandboxRes) === null || _a === void 0 ? void 0 : _a.authUserName) {
|
|
38
36
|
if (this.flags.setalias) {
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
37
|
+
const stateAggregator = await core_1.StateAggregator.getInstance();
|
|
38
|
+
stateAggregator.aliases.set(this.flags.setalias, results.sandboxRes.authUserName);
|
|
39
|
+
await stateAggregator.aliases.write();
|
|
40
|
+
this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, results.sandboxRes.authUserName);
|
|
42
41
|
}
|
|
43
42
|
if (this.flags.setdefaultusername) {
|
|
44
43
|
const globalConfig = this.configAggregator.getGlobalConfig();
|
|
45
|
-
globalConfig.set(core_1.
|
|
44
|
+
globalConfig.set(core_1.OrgConfigProperties.TARGET_ORG, results.sandboxRes.authUserName);
|
|
46
45
|
const result = await globalConfig.write();
|
|
47
46
|
this.logger.debug('Set defaultUsername: %s result: %s', this.flags.setdefaultusername, result);
|
|
48
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/force/org/status.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2BAAyB;AACzB,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/force/org/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,10 @@ declare type OrgGroups = {
|
|
|
8
8
|
};
|
|
9
9
|
declare type ExtendedScratchOrgInfo = ScratchOrgInfoSObject & {
|
|
10
10
|
devHubOrgId: string;
|
|
11
|
-
attributes:
|
|
11
|
+
attributes: {
|
|
12
|
+
type: string;
|
|
13
|
+
url: string;
|
|
14
|
+
};
|
|
12
15
|
};
|
|
13
16
|
export declare class OrgListUtil {
|
|
14
17
|
private static logger;
|
|
@@ -54,8 +57,8 @@ export declare class OrgListUtil {
|
|
|
54
57
|
static removeRestrictedInfoFromConfig(config: AuthFields, properties?: string[]): AuthFields;
|
|
55
58
|
/** Identify the default orgs */
|
|
56
59
|
static identifyDefaultOrgs(orgInfo: ExtendedAuthFields, config: JsonMap): void;
|
|
57
|
-
static retrieveScratchOrgInfoFromDevHub(devHubUsername: string, orgIdsToQuery: string[]): Promise<Array<Record
|
|
58
|
-
static reduceScratchOrgInfo(updatedContents: Array<Record
|
|
60
|
+
static retrieveScratchOrgInfoFromDevHub(devHubUsername: string, orgIdsToQuery: string[]): Promise<Array<Partial<Record> & ExtendedScratchOrgInfo>>;
|
|
61
|
+
static reduceScratchOrgInfo(updatedContents: Array<Partial<Record> & ExtendedScratchOrgInfo>, orgs: ExtendedAuthFields[]): Promise<ExtendedAuthFields[]>;
|
|
59
62
|
/**
|
|
60
63
|
* Asks the org if it's a devHub. Because the dev hub setting can't be deactivated, only ask orgs that aren't already stored as hubs.
|
|
61
64
|
* This has a number of side effects, including updating the AuthInfo files and
|
|
@@ -8,6 +8,7 @@ exports.identifyActiveOrgByStatus = exports.OrgListUtil = void 0;
|
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
+
const fs = require("fs/promises");
|
|
11
12
|
const core_1 = require("@salesforce/core");
|
|
12
13
|
const lib_1 = require("@salesforce/kit/lib");
|
|
13
14
|
const utils_1 = require("./utils");
|
|
@@ -72,7 +73,7 @@ class OrgListUtil {
|
|
|
72
73
|
* @param fileNames All the filenames in the global hidden folder
|
|
73
74
|
*/
|
|
74
75
|
static async readAuthFiles(fileNames) {
|
|
75
|
-
const orgFileNames = (await
|
|
76
|
+
const orgFileNames = (await fs.readdir(core_1.Global.SFDX_DIR)).filter((filename) => filename.match(/^00D.{15}\.json$/g));
|
|
76
77
|
const allAuths = await Promise.all(fileNames.map(async (fileName) => {
|
|
77
78
|
try {
|
|
78
79
|
const orgUsername = (0, path_1.basename)(fileName, '.json');
|
|
@@ -90,7 +91,8 @@ class OrgListUtil {
|
|
|
90
91
|
}
|
|
91
92
|
// Theory: within <orgId>.json, if the userId is the first entry, that's the primary username.
|
|
92
93
|
if (orgFileNames.includes(orgFileName)) {
|
|
93
|
-
const
|
|
94
|
+
const orgFileContent = JSON.parse(await fs.readFile((0, path_1.join)(core_1.Global.SFDX_STATE_FOLDER, orgFileName), 'utf8'));
|
|
95
|
+
const usernames = orgFileContent.usernames;
|
|
94
96
|
if (usernames && usernames[0] === auth.getFields().username) {
|
|
95
97
|
return auth;
|
|
96
98
|
}
|
|
@@ -118,7 +120,7 @@ class OrgListUtil {
|
|
|
118
120
|
scratchOrgs: [],
|
|
119
121
|
nonScratchOrgs: [],
|
|
120
122
|
};
|
|
121
|
-
const config = (await core_1.
|
|
123
|
+
const config = (await core_1.SfdxConfigAggregator.create()).getConfig();
|
|
122
124
|
for (const authInfo of authInfos) {
|
|
123
125
|
let currentValue;
|
|
124
126
|
try {
|
|
@@ -131,7 +133,7 @@ class OrgListUtil {
|
|
|
131
133
|
}
|
|
132
134
|
const [alias, lastUsed] = await Promise.all([
|
|
133
135
|
(0, utils_1.getAliasByUsername)(currentValue.username),
|
|
134
|
-
|
|
136
|
+
fs.stat((0, path_1.join)(core_1.Global.SFDX_DIR, `${currentValue.username}.json`)),
|
|
135
137
|
]);
|
|
136
138
|
currentValue.alias = alias;
|
|
137
139
|
currentValue.lastUsed = lastUsed.atime;
|
|
@@ -157,12 +159,11 @@ class OrgListUtil {
|
|
|
157
159
|
}
|
|
158
160
|
/** Identify the default orgs */
|
|
159
161
|
static identifyDefaultOrgs(orgInfo, config) {
|
|
160
|
-
if (config.
|
|
161
|
-
(orgInfo.username === config.defaultusername || orgInfo.alias === config.defaultusername)) {
|
|
162
|
+
if (config['target-org'] && (orgInfo.username === config['target-org'] || orgInfo.alias === config['target-org'])) {
|
|
162
163
|
orgInfo.isDefaultUsername = true;
|
|
163
164
|
}
|
|
164
|
-
else if (config
|
|
165
|
-
(orgInfo.username === config
|
|
165
|
+
else if (config['target-dev-hub'] &&
|
|
166
|
+
(orgInfo.username === config['target-dev-hub'] || orgInfo.alias === config['target-dev-hub'])) {
|
|
166
167
|
orgInfo.isDefaultDevHubUsername = true;
|
|
167
168
|
}
|
|
168
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAsC;
|
|
1
|
+
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,8 @@ exports.SandboxReporter = void 0;
|
|
|
4
4
|
const kit_1 = require("@salesforce/kit");
|
|
5
5
|
class SandboxReporter {
|
|
6
6
|
static sandboxProgress(update) {
|
|
7
|
-
const {
|
|
8
|
-
const
|
|
9
|
-
const waitTime = SandboxReporter.getSecondsToHuman(waitTimeInSec);
|
|
7
|
+
const { remainingWait, interval, sandboxProcessObj, waitingOnAuth } = update;
|
|
8
|
+
const waitTime = SandboxReporter.getSecondsToHuman(remainingWait);
|
|
10
9
|
const waitTimeMsg = `Sleeping ${interval} seconds. Will wait ${waitTime} more before timing out.`;
|
|
11
10
|
const sandboxIdentifierMsg = `${sandboxProcessObj.SandboxName}(${sandboxProcessObj.Id})`;
|
|
12
11
|
const waitingOnAuthMessage = waitingOnAuth ? ', waiting on JWT auth' : '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxReporter.js","sourceRoot":"","sources":["../../src/shared/sandboxReporter.ts"],"names":[],"mappings":";;;AAOA,yCAA2C;AAE3C,MAAa,eAAe;IACnB,MAAM,CAAC,eAAe,CAAC,MAAmB;QAC/C,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sandboxReporter.js","sourceRoot":"","sources":["../../src/shared/sandboxReporter.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/utils.js
CHANGED
|
@@ -4,8 +4,8 @@ exports.openUrl = exports.getAliasByUsername = void 0;
|
|
|
4
4
|
const core_1 = require("@salesforce/core");
|
|
5
5
|
const open = require("open");
|
|
6
6
|
const getAliasByUsername = async (username) => {
|
|
7
|
-
const
|
|
8
|
-
const keys =
|
|
7
|
+
const stateAggregator = await core_1.StateAggregator.getInstance();
|
|
8
|
+
const keys = stateAggregator.aliases.getAll(username);
|
|
9
9
|
// use the most recently added alias for that username
|
|
10
10
|
return (keys === null || keys === void 0 ? void 0 : keys.length) ? keys[keys.length - 1] : undefined;
|
|
11
11
|
};
|
package/lib/shared/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":";;;AAOA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":";;;AAOA,2CAAmD;AACnD,6BAA6B;AAEtB,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAgB,EAAmB,EAAE;IAC5E,MAAM,eAAe,GAAG,MAAM,sBAAe,CAAC,WAAW,EAAE,CAAC;IAC5D,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtD,sDAAsD;IACtD,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1D,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,OAAO,GAAG,KAAK,EAAE,GAAW,EAAE,OAAqB,EAAyB,EAAE;IACzF,OAAO,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,OAAO,WAElB"}
|
package/messages/clone.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"success": "The sandbox org cloning process %s is in progress. Run \"sfdx force:org:status -n %s\" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.",
|
|
3
|
-
"description": "clone a sandbox org\nThere are two ways to clone a sandbox: either specify a sandbox definition file or provide key=value pairs at the command line. Key-value pairs at the command-line override their equivalent sandbox definition file values. In either case, you must specify both the \"SandboxName\" and \"SourceSandboxName\" options. \n\nSet the --targetusername (-u) parameter to a production org with sandbox licenses. The --type (-t) parameter is required and must be set to \"sandbox\".",
|
|
3
|
+
"description": "clone a sandbox org\nThere are two ways to clone a sandbox: either specify a sandbox definition file or provide key=value pairs at the command line. Key-value pairs at the command-line override their equivalent sandbox definition file values. In either case, you must specify both the \"SandboxName\" and \"SourceSandboxName\" options to set the names of the new sandbox and the one being cloned, respectively. \n\nSet the --targetusername (-u) parameter to a production org with sandbox licenses. The --type (-t) parameter is required and must be set to \"sandbox\".",
|
|
4
4
|
"examples": [
|
|
5
5
|
"$ sfdx force:org:clone -t sandbox -f config/dev-sandbox-def.json -u prodOrg -a MyDevSandbox",
|
|
6
|
-
"$ sfdx force:org:clone -t sandbox SandboxName=
|
|
6
|
+
"$ sfdx force:org:clone -t sandbox SandboxName=NewClonedSandbox SourceSandboxName=ExistingSandbox -u prodOrg -a MyDevSandbox"
|
|
7
7
|
],
|
|
8
8
|
"flags": {
|
|
9
9
|
"type": "type of org to create",
|
|
@@ -12,6 +12,9 @@
|
|
|
12
12
|
"setalias": "alias for the cloned org",
|
|
13
13
|
"definitionfile": "path to the sandbox definition file"
|
|
14
14
|
},
|
|
15
|
+
"flagsLong": {
|
|
16
|
+
"wait": "Sets the streaming client socket timeout, in minutes. If the streaming client socket has no contact from the server for a number of minutes, the client exits. Specify a longer wait time if timeouts occur frequently."
|
|
17
|
+
},
|
|
15
18
|
"commandSuccess": "The sandbox org cloning process %s is in progress. Run \"sfdx force:org:status -n %s\" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.",
|
|
16
19
|
"missingLicenseType": "The sandbox license type is required, but you didn't provide a value. Specify the license type in the sandbox definition file with the \"licenseType\" option, or specify the option as a name-value pair at the command-line. See https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_sandbox_definition.htm for more information.",
|
|
17
20
|
"commandOrganizationTypeNotSupport": "The only supported org type is: %s",
|
package/messages/display.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"description": "get the description for the current or target org\nOutput includes your access token, client Id, connected status, org ID, instance URL, username, and alias, if applicable.\nUse --verbose to include the SFDX auth URL. WARNING: The SFDX auth URL contains sensitive information, such as a refresh token that can be used to access an org. Don't share or distribute this URL or token.\nIncluding --verbose displays the sfdxAuthUrl property only if you authenticated to the org using auth:web:login (not auth:jwt:grant)",
|
|
3
3
|
"examples": [
|
|
4
|
-
"sfdx force:org:display",
|
|
5
|
-
"sfdx force:org:display -u me@my.org",
|
|
6
|
-
"sfdx force:org:display -u TestOrg1 --json",
|
|
7
|
-
"sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"
|
|
4
|
+
"$ sfdx force:org:display",
|
|
5
|
+
"$ sfdx force:org:display -u me@my.org",
|
|
6
|
+
"$ sfdx force:org:display -u TestOrg1 --json",
|
|
7
|
+
"$ sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"
|
|
8
8
|
],
|
|
9
9
|
"noScratchOrgInfoError": "No information for scratch org with ID %s found in Dev Hub %s.",
|
|
10
10
|
"noScratchOrgInfoAction": "First check that you can access your Dev Hub. Then check that the ScratchOrgInfo standard object in your Dev Hub contains a record for your scratch org. In Setup, navigate to the Dev Hub page and click the Scratch Org Infos tab. If you find your scratch org, try again."
|