@salesforce/plugin-org 2.11.7 → 3.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/README.md +114 -114
- package/lib/commands/force/org/clone.d.ts +8 -8
- package/lib/commands/force/org/clone.js +65 -66
- package/lib/commands/force/org/clone.js.map +1 -1
- package/lib/commands/force/org/create.d.ts +18 -42
- package/lib/commands/force/org/create.js +104 -106
- package/lib/commands/force/org/create.js.map +1 -1
- package/lib/commands/force/org/delete.d.ts +5 -5
- package/lib/commands/force/org/delete.js +42 -44
- package/lib/commands/force/org/delete.js.map +1 -1
- package/lib/commands/force/org/status.d.ts +7 -7
- package/lib/commands/force/org/status.js +48 -50
- package/lib/commands/force/org/status.js.map +1 -1
- package/lib/commands/org/create/sandbox.d.ts +11 -11
- package/lib/commands/org/create/sandbox.js +106 -106
- package/lib/commands/org/create/sandbox.js.map +1 -1
- package/lib/commands/org/create/scratch.d.ts +20 -20
- package/lib/commands/org/create/scratch.js +140 -142
- package/lib/commands/org/create/scratch.js.map +1 -1
- package/lib/commands/org/delete/sandbox.d.ts +2 -2
- package/lib/commands/org/delete/sandbox.js +27 -28
- package/lib/commands/org/delete/sandbox.js.map +1 -1
- package/lib/commands/org/delete/scratch.d.ts +2 -2
- package/lib/commands/org/delete/scratch.js +26 -27
- package/lib/commands/org/delete/scratch.js.map +1 -1
- package/lib/commands/org/display.d.ts +5 -5
- package/lib/commands/org/display.js +33 -34
- package/lib/commands/org/display.js.map +1 -1
- package/lib/commands/org/list/metadata-types.d.ts +5 -5
- package/lib/commands/org/list/metadata-types.js +38 -40
- package/lib/commands/org/list/metadata-types.js.map +1 -1
- package/lib/commands/org/list/metadata.d.ts +6 -6
- package/lib/commands/org/list/metadata.js +39 -41
- package/lib/commands/org/list/metadata.js.map +1 -1
- package/lib/commands/org/list.d.ts +2 -2
- package/lib/commands/org/list.js +56 -57
- package/lib/commands/org/list.js.map +1 -1
- package/lib/commands/org/open.d.ts +7 -7
- package/lib/commands/org/open.js +65 -62
- package/lib/commands/org/open.js.map +1 -1
- package/lib/commands/org/resume/sandbox.d.ts +6 -6
- package/lib/commands/org/resume/sandbox.js +61 -61
- package/lib/commands/org/resume/sandbox.js.map +1 -1
- package/lib/commands/org/resume/scratch.d.ts +3 -3
- package/lib/commands/org/resume/scratch.js +35 -36
- package/lib/commands/org/resume/scratch.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/shared/flags.d.ts +4 -1
- package/lib/shared/flags.js +10 -11
- package/lib/shared/flags.js.map +1 -1
- package/lib/shared/orgHighlighter.d.ts +1 -1
- package/lib/shared/orgHighlighter.js +4 -9
- package/lib/shared/orgHighlighter.js.map +1 -1
- package/lib/shared/orgHooks.js +1 -2
- package/lib/shared/orgHooks.js.map +1 -1
- package/lib/shared/orgListUtil.d.ts +1 -1
- package/lib/shared/orgListUtil.js +27 -31
- package/lib/shared/orgListUtil.js.map +1 -1
- package/lib/shared/orgTypes.js +2 -5
- package/lib/shared/orgTypes.js.map +1 -1
- package/lib/shared/sandboxCommandBase.d.ts +2 -2
- package/lib/shared/sandboxCommandBase.js +33 -28
- package/lib/shared/sandboxCommandBase.js.map +1 -1
- package/lib/shared/sandboxProgress.d.ts +1 -1
- package/lib/shared/sandboxProgress.js +11 -17
- package/lib/shared/sandboxProgress.js.map +1 -1
- package/lib/shared/sandboxReporter.js +5 -9
- package/lib/shared/sandboxReporter.js.map +1 -1
- package/lib/shared/sandboxRequest.d.ts +5 -0
- package/lib/shared/sandboxRequest.js +21 -20
- package/lib/shared/sandboxRequest.js.map +1 -1
- package/lib/shared/scratchOrgOutput.js +20 -31
- package/lib/shared/scratchOrgOutput.js.map +1 -1
- package/lib/shared/scratchOrgRequest.d.ts +1 -1
- package/lib/shared/scratchOrgRequest.js +4 -8
- package/lib/shared/scratchOrgRequest.js.map +1 -1
- package/lib/shared/stagedProgress.d.ts +1 -1
- package/lib/shared/stagedProgress.js +19 -19
- package/lib/shared/stagedProgress.js.map +1 -1
- package/lib/shared/timeUtils.js +10 -16
- package/lib/shared/timeUtils.js.map +1 -1
- package/lib/shared/utils.d.ts +9 -2
- package/lib/shared/utils.js +13 -14
- package/lib/shared/utils.js.map +1 -1
- package/oclif.lock +7993 -0
- package/oclif.manifest.json +1089 -687
- package/package.json +34 -53
|
@@ -1,22 +1,20 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
class OrgListUtil {
|
|
7
|
+
import { basename, join } from 'node:path';
|
|
8
|
+
import fs from 'node:fs/promises';
|
|
9
|
+
import { Org, AuthInfo, Global, Logger, trimTo15, ConfigAggregator, OrgConfigProperties, } from '@salesforce/core';
|
|
10
|
+
import { isObject } from '@salesforce/ts-types';
|
|
11
|
+
import { omit } from '@salesforce/kit';
|
|
12
|
+
import utils from './utils.js';
|
|
13
|
+
export class OrgListUtil {
|
|
14
|
+
static logger;
|
|
17
15
|
static async retrieveLogger() {
|
|
18
16
|
if (!OrgListUtil.logger) {
|
|
19
|
-
OrgListUtil.logger = await
|
|
17
|
+
OrgListUtil.logger = await Logger.child('OrgListUtil');
|
|
20
18
|
}
|
|
21
19
|
return OrgListUtil.logger;
|
|
22
20
|
}
|
|
@@ -63,7 +61,7 @@ class OrgListUtil {
|
|
|
63
61
|
static async processScratchOrgs(scratchOrgs) {
|
|
64
62
|
const orgIdsGroupedByDevHub = new Map();
|
|
65
63
|
scratchOrgs.forEach((fields) => {
|
|
66
|
-
orgIdsGroupedByDevHub.set(fields.devHubUsername, (orgIdsGroupedByDevHub.get(fields.devHubUsername) ?? []).concat([
|
|
64
|
+
orgIdsGroupedByDevHub.set(fields.devHubUsername, (orgIdsGroupedByDevHub.get(fields.devHubUsername) ?? []).concat([trimTo15(fields.orgId)]));
|
|
67
65
|
});
|
|
68
66
|
const updatedContents = (await Promise.all(Array.from(orgIdsGroupedByDevHub).map(([devHubUsername, orgIds]) => OrgListUtil.retrieveScratchOrgInfoFromDevHub(devHubUsername, orgIds)))).reduce((accumulator, iterator) => [...accumulator, ...iterator], []);
|
|
69
67
|
return OrgListUtil.reduceScratchOrgInfo(updatedContents, scratchOrgs);
|
|
@@ -76,12 +74,12 @@ class OrgListUtil {
|
|
|
76
74
|
static async readAuthFiles(fileNames) {
|
|
77
75
|
// Ensure that the Global.SFDX_DIR exists
|
|
78
76
|
// https://github.com/forcedotcom/cli/issues/2222
|
|
79
|
-
await fs.mkdir(
|
|
80
|
-
const orgFileNames = (await fs.readdir(
|
|
77
|
+
await fs.mkdir(Global.SFDX_DIR, { recursive: true });
|
|
78
|
+
const orgFileNames = (await fs.readdir(Global.SFDX_DIR)).filter((filename) => filename.match(/^00D.{15}\.json$/g));
|
|
81
79
|
const allAuths = await Promise.all(fileNames.map(async (fileName) => {
|
|
82
80
|
try {
|
|
83
|
-
const orgUsername =
|
|
84
|
-
const auth = await
|
|
81
|
+
const orgUsername = basename(fileName, '.json');
|
|
82
|
+
const auth = await AuthInfo.create({ username: orgUsername });
|
|
85
83
|
const userId = auth?.getFields().userId;
|
|
86
84
|
// no userid? Definitely an org primary user
|
|
87
85
|
if (!userId) {
|
|
@@ -95,7 +93,7 @@ class OrgListUtil {
|
|
|
95
93
|
}
|
|
96
94
|
// Theory: within <orgId>.json, if the userId is the first entry, that's the primary username.
|
|
97
95
|
if (orgFileNames.includes(orgFileName)) {
|
|
98
|
-
const orgFileContent = JSON.parse(await fs.readFile(
|
|
96
|
+
const orgFileContent = JSON.parse(await fs.readFile(join(Global.SFDX_DIR, orgFileName), 'utf8'));
|
|
99
97
|
const usernames = orgFileContent.usernames;
|
|
100
98
|
if (usernames && usernames[0] === auth.getFields().username) {
|
|
101
99
|
return auth;
|
|
@@ -109,7 +107,7 @@ class OrgListUtil {
|
|
|
109
107
|
logger.warn(err.message);
|
|
110
108
|
}
|
|
111
109
|
}));
|
|
112
|
-
return allAuths.filter((
|
|
110
|
+
return allAuths.filter((isObject));
|
|
113
111
|
}
|
|
114
112
|
/**
|
|
115
113
|
* Helper to group orgs by {scratchOrg, nonScratchOrgs}
|
|
@@ -120,7 +118,7 @@ class OrgListUtil {
|
|
|
120
118
|
* @private
|
|
121
119
|
*/
|
|
122
120
|
static async groupOrgs(authInfos) {
|
|
123
|
-
const configAggregator = await
|
|
121
|
+
const configAggregator = await ConfigAggregator.create();
|
|
124
122
|
const results = await Promise.all(authInfos.map(async (authInfo) => {
|
|
125
123
|
// for (const authInfo of authInfos) {
|
|
126
124
|
let currentValue;
|
|
@@ -134,8 +132,8 @@ class OrgListUtil {
|
|
|
134
132
|
currentValue = removeRestrictedInfoFromConfig(authInfo.getFields());
|
|
135
133
|
}
|
|
136
134
|
const [alias, lastUsed] = await Promise.all([
|
|
137
|
-
|
|
138
|
-
fs.stat(
|
|
135
|
+
utils.getAliasByUsername(currentValue.username),
|
|
136
|
+
fs.stat(join(Global.SFDX_DIR, `${currentValue.username}.json`)),
|
|
139
137
|
]);
|
|
140
138
|
return {
|
|
141
139
|
...identifyDefaultOrgs({ ...currentValue, alias }, configAggregator),
|
|
@@ -160,7 +158,7 @@ class OrgListUtil {
|
|
|
160
158
|
'SignupUsername',
|
|
161
159
|
];
|
|
162
160
|
try {
|
|
163
|
-
const devHubOrg = await
|
|
161
|
+
const devHubOrg = await Org.create({ aliasOrUsername: devHubUsername });
|
|
164
162
|
const conn = devHubOrg.getConnection();
|
|
165
163
|
const data = await conn
|
|
166
164
|
.sobject('ScratchOrgInfo')
|
|
@@ -214,7 +212,7 @@ class OrgListUtil {
|
|
|
214
212
|
*/
|
|
215
213
|
static async checkNonScratchOrgIsDevHub(username) {
|
|
216
214
|
try {
|
|
217
|
-
const org = await
|
|
215
|
+
const org = await Org.create({ aliasOrUsername: username });
|
|
218
216
|
// true forces a server check instead of relying on AuthInfo file cache
|
|
219
217
|
return await org.determineIfDevHubOrg(true);
|
|
220
218
|
}
|
|
@@ -230,8 +228,8 @@ class OrgListUtil {
|
|
|
230
228
|
*/
|
|
231
229
|
static async determineConnectedStatusForNonScratchOrg(username) {
|
|
232
230
|
try {
|
|
233
|
-
const org = await
|
|
234
|
-
if (org.getField(
|
|
231
|
+
const org = await Org.create({ aliasOrUsername: username });
|
|
232
|
+
if (org.getField(Org.Fields.DEV_HUB_USERNAME)) {
|
|
235
233
|
return;
|
|
236
234
|
}
|
|
237
235
|
try {
|
|
@@ -247,17 +245,15 @@ class OrgListUtil {
|
|
|
247
245
|
}
|
|
248
246
|
}
|
|
249
247
|
}
|
|
250
|
-
|
|
251
|
-
const identifyActiveOrgByStatus = (org) => 'status' in org && org.status === 'Active';
|
|
252
|
-
exports.identifyActiveOrgByStatus = identifyActiveOrgByStatus;
|
|
248
|
+
export const identifyActiveOrgByStatus = (org) => 'status' in org && org.status === 'Active';
|
|
253
249
|
/** Identify the default orgs */
|
|
254
250
|
const identifyDefaultOrgs = (orgInfo, config) => {
|
|
255
251
|
// remove undefined, since the config might also be undefined
|
|
256
252
|
const possibleDefaults = [orgInfo.alias, orgInfo.username].filter(Boolean);
|
|
257
253
|
return {
|
|
258
254
|
...orgInfo,
|
|
259
|
-
isDefaultDevHubUsername: possibleDefaults.includes(config.getPropertyValue(
|
|
260
|
-
isDefaultUsername: possibleDefaults.includes(config.getPropertyValue(
|
|
255
|
+
isDefaultDevHubUsername: possibleDefaults.includes(config.getPropertyValue(OrgConfigProperties.TARGET_DEV_HUB)),
|
|
256
|
+
isDefaultUsername: possibleDefaults.includes(config.getPropertyValue(OrgConfigProperties.TARGET_ORG)),
|
|
261
257
|
};
|
|
262
258
|
};
|
|
263
259
|
/**
|
|
@@ -267,7 +263,7 @@ const identifyDefaultOrgs = (orgInfo, config) => {
|
|
|
267
263
|
* @param {string[]} properties - properties to exclude ex ['refreshToken', 'clientSecret']
|
|
268
264
|
* @returns the config less the sensitive information.
|
|
269
265
|
*/
|
|
270
|
-
const removeRestrictedInfoFromConfig = (config, properties = ['refreshToken', 'clientSecret']) =>
|
|
266
|
+
const removeRestrictedInfoFromConfig = (config, properties = ['refreshToken', 'clientSecret']) => omit(config, properties);
|
|
271
267
|
const sandboxFilter = (org) => Boolean(org.isSandbox);
|
|
272
268
|
const regularOrgFilter = (org) => !org.isSandbox && !org.isDevHub;
|
|
273
269
|
const devHubFilter = (org) => Boolean(org.isDevHub);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orgListUtil.js","sourceRoot":"","sources":["../../src/shared/orgListUtil.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/orgTypes.js
CHANGED
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
exports.SandboxLicenseType = void 0;
|
|
10
|
-
var SandboxLicenseType;
|
|
7
|
+
export var SandboxLicenseType;
|
|
11
8
|
(function (SandboxLicenseType) {
|
|
12
9
|
SandboxLicenseType["developer"] = "Developer";
|
|
13
10
|
SandboxLicenseType["developerPro"] = "Developer_Pro";
|
|
14
11
|
SandboxLicenseType["partial"] = "Partial";
|
|
15
12
|
SandboxLicenseType["full"] = "Full";
|
|
16
|
-
})(SandboxLicenseType || (
|
|
13
|
+
})(SandboxLicenseType || (SandboxLicenseType = {}));
|
|
17
14
|
//# sourceMappingURL=orgTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgTypes.js","sourceRoot":"","sources":["../../src/shared/orgTypes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orgTypes.js","sourceRoot":"","sources":["../../src/shared/orgTypes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgGH,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,6CAAuB,CAAA;IACvB,oDAA8B,CAAA;IAC9B,yCAAmB,CAAA;IACnB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
2
|
import { Config } from '@oclif/core';
|
|
3
3
|
import { Lifecycle, Org, ResultEvent, SandboxProcessObject, SandboxRequestCache, SandboxRequestCacheEntry, SandboxUserAuthResponse, StatusEvent } from '@salesforce/core';
|
|
4
|
-
import { SandboxProgress } from './sandboxProgress';
|
|
5
|
-
import { State } from './stagedProgress';
|
|
4
|
+
import { SandboxProgress } from './sandboxProgress.js';
|
|
5
|
+
import { State } from './stagedProgress.js';
|
|
6
6
|
export declare abstract class SandboxCommandBase<T> extends SfCommand<T> {
|
|
7
7
|
protected sandboxProgress: SandboxProgress;
|
|
8
8
|
protected latestSandboxProgressObj?: SandboxProcessObject;
|
|
@@ -1,27 +1,33 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SandboxCommandBase = void 0;
|
|
4
1
|
/*
|
|
5
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
3
|
* All rights reserved.
|
|
7
4
|
* Licensed under the BSD 3-Clause license.
|
|
8
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
6
|
*/
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
7
|
+
import os from 'node:os';
|
|
8
|
+
import { dirname } from 'node:path';
|
|
9
|
+
import { fileURLToPath } from 'node:url';
|
|
10
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
11
|
+
import { AuthInfo, Lifecycle, Messages, SandboxEvents, SandboxRequestCache, } from '@salesforce/core';
|
|
12
|
+
import { SandboxProgress } from './sandboxProgress.js';
|
|
13
|
+
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
14
|
+
const messages = Messages.loadMessages('@salesforce/plugin-org', 'sandboxbase');
|
|
15
|
+
export class SandboxCommandBase extends SfCommand {
|
|
16
|
+
sandboxProgress;
|
|
17
|
+
latestSandboxProgressObj;
|
|
18
|
+
sandboxAuth;
|
|
19
|
+
prodOrg;
|
|
20
|
+
pollingTimeOut = false;
|
|
21
|
+
// initialized at top of run method
|
|
22
|
+
sandboxRequestConfig;
|
|
23
|
+
sandboxRequestData;
|
|
17
24
|
constructor(argv, config) {
|
|
18
25
|
super(argv, config);
|
|
19
|
-
this.
|
|
20
|
-
this.sandboxProgress = new sandboxProgress_1.SandboxProgress();
|
|
26
|
+
this.sandboxProgress = new SandboxProgress();
|
|
21
27
|
}
|
|
22
28
|
async getSandboxRequestConfig() {
|
|
23
29
|
if (!this.sandboxRequestConfig) {
|
|
24
|
-
this.sandboxRequestConfig = await
|
|
30
|
+
this.sandboxRequestConfig = await SandboxRequestCache.create();
|
|
25
31
|
}
|
|
26
32
|
return this.sandboxRequestConfig;
|
|
27
33
|
}
|
|
@@ -53,12 +59,12 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
53
59
|
this.pollingTimeOut = true;
|
|
54
60
|
return Promise.resolve(this.updateSandboxRequestData());
|
|
55
61
|
});
|
|
56
|
-
lifecycle.on(
|
|
62
|
+
lifecycle.on(SandboxEvents.EVENT_RESUME, async (results) => {
|
|
57
63
|
this.latestSandboxProgressObj = results;
|
|
58
64
|
this.sandboxProgress.markPreviousStagesAsCompleted(results.Status !== 'Completed' ? results.Status : 'Authenticating');
|
|
59
65
|
return Promise.resolve(this.updateSandboxRequestData());
|
|
60
66
|
});
|
|
61
|
-
lifecycle.on(
|
|
67
|
+
lifecycle.on(SandboxEvents.EVENT_ASYNC_RESULT, async (results) => {
|
|
62
68
|
this.latestSandboxProgressObj = results ?? this.latestSandboxProgressObj;
|
|
63
69
|
this.updateSandboxRequestData();
|
|
64
70
|
if (!options.isAsync) {
|
|
@@ -81,7 +87,7 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
81
87
|
this.log(this.sandboxProgress.formatProgressStatus(false));
|
|
82
88
|
return Promise.resolve(this.info(messages.getMessage('checkSandboxStatus', this.getCheckSandboxStatusParams())));
|
|
83
89
|
});
|
|
84
|
-
lifecycle.on(
|
|
90
|
+
lifecycle.on(SandboxEvents.EVENT_STATUS, async (results) => {
|
|
85
91
|
this.latestSandboxProgressObj = results.sandboxProcessObj;
|
|
86
92
|
this.updateSandboxRequestData();
|
|
87
93
|
const progress = this.sandboxProgress.getSandboxProgress(results);
|
|
@@ -89,11 +95,11 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
89
95
|
this.updateStage(currentStage, 'inProgress');
|
|
90
96
|
return Promise.resolve(this.updateProgress(results, options.isAsync));
|
|
91
97
|
});
|
|
92
|
-
lifecycle.on(
|
|
98
|
+
lifecycle.on(SandboxEvents.EVENT_AUTH, async (results) => {
|
|
93
99
|
this.sandboxAuth = results;
|
|
94
100
|
return Promise.resolve();
|
|
95
101
|
});
|
|
96
|
-
lifecycle.on(
|
|
102
|
+
lifecycle.on(SandboxEvents.EVENT_RESULT, async (results) => {
|
|
97
103
|
this.latestSandboxProgressObj = results.sandboxProcessObj;
|
|
98
104
|
this.updateSandboxRequestData();
|
|
99
105
|
this.sandboxProgress.markPreviousStagesAsCompleted();
|
|
@@ -102,7 +108,7 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
102
108
|
this.progress.stop();
|
|
103
109
|
}
|
|
104
110
|
if (results.sandboxRes?.authUserName) {
|
|
105
|
-
const authInfo = await
|
|
111
|
+
const authInfo = await AuthInfo.create({ username: results.sandboxRes?.authUserName });
|
|
106
112
|
await authInfo.handleAliasAndDefaultSettings({
|
|
107
113
|
alias: options.alias,
|
|
108
114
|
setDefault: options.setDefault,
|
|
@@ -114,7 +120,7 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
114
120
|
this.updateProgress(results, options.isAsync);
|
|
115
121
|
this.reportResults(results);
|
|
116
122
|
});
|
|
117
|
-
lifecycle.on(
|
|
123
|
+
lifecycle.on(SandboxEvents.EVENT_MULTIPLE_SBX_PROCESSES, async (results) => {
|
|
118
124
|
const [resumingProcess, ...otherSbxProcesses] = results;
|
|
119
125
|
const sbxProcessIds = otherSbxProcesses.map((sbxProcess) => sbxProcess.Id);
|
|
120
126
|
const sbxProcessStatuses = otherSbxProcesses.map((sbxProcess) => sbxProcess.Status);
|
|
@@ -173,14 +179,14 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
173
179
|
}
|
|
174
180
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
175
181
|
async finally(_) {
|
|
176
|
-
const lifecycle =
|
|
182
|
+
const lifecycle = Lifecycle.getInstance();
|
|
177
183
|
lifecycle.removeAllListeners('POLLING_TIME_OUT');
|
|
178
|
-
lifecycle.removeAllListeners(
|
|
179
|
-
lifecycle.removeAllListeners(
|
|
180
|
-
lifecycle.removeAllListeners(
|
|
181
|
-
lifecycle.removeAllListeners(
|
|
182
|
-
lifecycle.removeAllListeners(
|
|
183
|
-
lifecycle.removeAllListeners(
|
|
184
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_RESUME);
|
|
185
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_ASYNC_RESULT);
|
|
186
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_STATUS);
|
|
187
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_AUTH);
|
|
188
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_RESULT);
|
|
189
|
+
lifecycle.removeAllListeners(SandboxEvents.EVENT_MULTIPLE_SBX_PROCESSES);
|
|
184
190
|
return super.finally(_);
|
|
185
191
|
}
|
|
186
192
|
removeSandboxProgressConfig() {
|
|
@@ -190,5 +196,4 @@ class SandboxCommandBase extends sf_plugins_core_1.SfCommand {
|
|
|
190
196
|
}
|
|
191
197
|
}
|
|
192
198
|
}
|
|
193
|
-
exports.SandboxCommandBase = SandboxCommandBase;
|
|
194
199
|
//# sourceMappingURL=sandboxCommandBase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxCommandBase.js","sourceRoot":"","sources":["../../src/shared/sandboxCommandBase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sandboxCommandBase.js","sourceRoot":"","sources":["../../src/shared/sandboxCommandBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSandboxTableAsText = exports.getTableDataFromProcessObj = exports.SandboxProgress = void 0;
|
|
4
1
|
/*
|
|
5
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
3
|
* All rights reserved.
|
|
7
4
|
* Licensed under the BSD 3-Clause license.
|
|
8
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
6
|
*/
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
7
|
+
import os from 'node:os';
|
|
8
|
+
import { ux } from '@oclif/core';
|
|
9
|
+
import { getClockForSeconds } from '../shared/timeUtils.js';
|
|
10
|
+
import { StagedProgress } from './stagedProgress.js';
|
|
14
11
|
const columns = {
|
|
15
12
|
key: { header: 'Field' },
|
|
16
13
|
value: { header: 'Value' },
|
|
17
14
|
};
|
|
18
|
-
class SandboxProgress extends
|
|
15
|
+
export class SandboxProgress extends StagedProgress {
|
|
19
16
|
constructor(stageNames = ['Pending', 'Processing', 'Activating', 'Authenticating']) {
|
|
20
17
|
super(stageNames);
|
|
21
18
|
}
|
|
@@ -38,14 +35,14 @@ class SandboxProgress extends stagedProgress_1.StagedProgress {
|
|
|
38
35
|
status: waitingOnAuth || sandboxProcessObj.Status === 'Completed' ? 'Authenticating' : sandboxProcessObj.Status,
|
|
39
36
|
percentComplete: sandboxProcessObj.CopyProgress,
|
|
40
37
|
remainingWaitTime: waitTimeInSec,
|
|
41
|
-
remainingWaitTimeHuman: waitTimeInSec === 0 ? '' : `${
|
|
38
|
+
remainingWaitTimeHuman: waitTimeInSec === 0 ? '' : `${getClockForSeconds(waitTimeInSec)} until timeout.`,
|
|
42
39
|
};
|
|
43
40
|
}
|
|
44
41
|
formatProgressStatus(withClock = true) {
|
|
45
|
-
const table =
|
|
42
|
+
const table = getSandboxTableAsText(undefined, this.statusData?.sandboxProcessObj).join(os.EOL);
|
|
46
43
|
return [
|
|
47
44
|
withClock && this.statusData
|
|
48
|
-
? `${
|
|
45
|
+
? `${getClockForSeconds(this.statusData.sandboxProgress.remainingWaitTime)} until timeout. ${this.statusData.sandboxProgress.percentComplete}%`
|
|
49
46
|
: undefined,
|
|
50
47
|
table,
|
|
51
48
|
'---------------------',
|
|
@@ -69,8 +66,7 @@ class SandboxProgress extends stagedProgress_1.StagedProgress {
|
|
|
69
66
|
}
|
|
70
67
|
}
|
|
71
68
|
}
|
|
72
|
-
|
|
73
|
-
const getTableDataFromProcessObj = (sandboxProcessObj, authUserName) => [
|
|
69
|
+
export const getTableDataFromProcessObj = (sandboxProcessObj, authUserName) => [
|
|
74
70
|
{ key: 'Id', value: sandboxProcessObj.Id },
|
|
75
71
|
{ key: 'SandboxName', value: sandboxProcessObj.SandboxName },
|
|
76
72
|
{ key: 'Status', value: sandboxProcessObj.Status },
|
|
@@ -87,18 +83,16 @@ const getTableDataFromProcessObj = (sandboxProcessObj, authUserName) => [
|
|
|
87
83
|
...(sandboxProcessObj.Description ? [{ key: 'Description', value: sandboxProcessObj.Description }] : []),
|
|
88
84
|
...(authUserName ? [{ key: 'Authorized Sandbox Username', value: authUserName }] : []),
|
|
89
85
|
];
|
|
90
|
-
|
|
91
|
-
const getSandboxTableAsText = (sandboxUsername, sandboxProgress) => {
|
|
86
|
+
export const getSandboxTableAsText = (sandboxUsername, sandboxProgress) => {
|
|
92
87
|
if (!sandboxProgress) {
|
|
93
88
|
return [];
|
|
94
89
|
}
|
|
95
90
|
const tableRows = [];
|
|
96
|
-
|
|
91
|
+
ux.table(getTableDataFromProcessObj(sandboxProgress, sandboxUsername), columns, {
|
|
97
92
|
printLine: (s) => {
|
|
98
93
|
tableRows.push(s);
|
|
99
94
|
},
|
|
100
95
|
});
|
|
101
96
|
return tableRows;
|
|
102
97
|
};
|
|
103
|
-
exports.getSandboxTableAsText = getSandboxTableAsText;
|
|
104
98
|
//# sourceMappingURL=sandboxProgress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxProgress.js","sourceRoot":"","sources":["../../src/shared/sandboxProgress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sandboxProgress.js","sourceRoot":"","sources":["../../src/shared/sandboxProgress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.SandboxReporter = void 0;
|
|
4
|
-
const kit_1 = require("@salesforce/kit");
|
|
5
|
-
class SandboxReporter {
|
|
1
|
+
import { Duration } from '@salesforce/kit';
|
|
2
|
+
export class SandboxReporter {
|
|
6
3
|
static sandboxProgress(update) {
|
|
7
4
|
const { remainingWait, interval, sandboxProcessObj, waitingOnAuth } = update;
|
|
8
5
|
const waitTime = SandboxReporter.getSecondsToHuman(remainingWait);
|
|
@@ -34,14 +31,13 @@ class SandboxReporter {
|
|
|
34
31
|
return { sandboxReadyForUse, data };
|
|
35
32
|
}
|
|
36
33
|
static getSecondsToHuman(waitTimeInSec) {
|
|
37
|
-
const hours =
|
|
38
|
-
const minutes =
|
|
39
|
-
const seconds =
|
|
34
|
+
const hours = Duration.hours(Math.floor(waitTimeInSec / 3600));
|
|
35
|
+
const minutes = Duration.minutes(Math.floor((waitTimeInSec % 3600) / 60));
|
|
36
|
+
const seconds = Duration.seconds(Math.floor(waitTimeInSec % 60));
|
|
40
37
|
const hDisplay = hours.hours > 0 ? hours.toString() + ' ' : '';
|
|
41
38
|
const mDisplay = minutes.minutes > 0 ? minutes.toString() + ' ' : '';
|
|
42
39
|
const sDisplay = seconds.seconds > 0 ? seconds.toString() : '';
|
|
43
40
|
return (hDisplay + mDisplay + sDisplay).trim();
|
|
44
41
|
}
|
|
45
42
|
}
|
|
46
|
-
exports.SandboxReporter = SandboxReporter;
|
|
47
43
|
//# sourceMappingURL=sandboxReporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandboxReporter.js","sourceRoot":"","sources":["../../src/shared/sandboxReporter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sandboxReporter.js","sourceRoot":"","sources":["../../src/shared/sandboxReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,3 +7,8 @@ export declare function createSandboxRequest(isClone: true, definitionFile: stri
|
|
|
7
7
|
export declare function createSandboxRequest(isClone: false, definitionFile: string | undefined, logger?: Logger | undefined, properties?: Record<string, string | undefined>): Promise<{
|
|
8
8
|
sandboxReq: SandboxRequest;
|
|
9
9
|
}>;
|
|
10
|
+
declare const _default: {
|
|
11
|
+
createSandboxRequest: typeof createSandboxRequest;
|
|
12
|
+
generateSboxName: () => Promise<string>;
|
|
13
|
+
};
|
|
14
|
+
export default _default;
|