@salesforce/b2c-cli 0.10.1 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -7
- package/dist/commands/bm/roles/create.d.ts +14 -0
- package/dist/commands/bm/roles/create.js +44 -0
- package/dist/commands/bm/roles/create.js.map +1 -0
- package/dist/commands/bm/roles/delete.d.ts +16 -0
- package/dist/commands/bm/roles/delete.js +37 -0
- package/dist/commands/bm/roles/delete.js.map +1 -0
- package/dist/commands/bm/roles/get.d.ts +15 -0
- package/dist/commands/bm/roles/get.js +73 -0
- package/dist/commands/bm/roles/get.js.map +1 -0
- package/dist/commands/bm/roles/grant.d.ts +16 -0
- package/dist/commands/bm/roles/grant.js +52 -0
- package/dist/commands/bm/roles/grant.js.map +1 -0
- package/dist/commands/bm/roles/list.d.ts +12 -0
- package/dist/commands/bm/roles/list.js +73 -0
- package/dist/commands/bm/roles/list.js.map +1 -0
- package/dist/commands/bm/roles/permissions/get.d.ts +15 -0
- package/dist/commands/bm/roles/permissions/get.js +99 -0
- package/dist/commands/bm/roles/permissions/get.js.map +1 -0
- package/dist/commands/bm/roles/permissions/set.d.ts +14 -0
- package/dist/commands/bm/roles/permissions/set.js +56 -0
- package/dist/commands/bm/roles/permissions/set.js.map +1 -0
- package/dist/commands/bm/roles/revoke.d.ts +20 -0
- package/dist/commands/bm/roles/revoke.js +53 -0
- package/dist/commands/bm/roles/revoke.js.map +1 -0
- package/dist/commands/code/delete.d.ts +1 -5
- package/dist/commands/code/delete.js +2 -17
- package/dist/commands/code/delete.js.map +1 -1
- package/dist/commands/content/export.js +1 -1
- package/dist/commands/content/export.js.map +1 -1
- package/dist/commands/content/list.js +1 -1
- package/dist/commands/content/list.js.map +1 -1
- package/dist/commands/job/export.js +4 -5
- package/dist/commands/job/export.js.map +1 -1
- package/dist/commands/job/import.js +4 -5
- package/dist/commands/job/import.js.map +1 -1
- package/dist/commands/job/run.d.ts +1 -0
- package/dist/commands/job/run.js +13 -7
- package/dist/commands/job/run.js.map +1 -1
- package/dist/commands/job/wait.js +5 -6
- package/dist/commands/job/wait.js.map +1 -1
- package/dist/commands/mrt/bundle/deploy.d.ts +14 -2
- package/dist/commands/mrt/bundle/deploy.js +66 -4
- package/dist/commands/mrt/bundle/deploy.js.map +1 -1
- package/dist/commands/mrt/env/create.d.ts +2 -0
- package/dist/commands/mrt/env/create.js +16 -6
- package/dist/commands/mrt/env/create.js.map +1 -1
- package/dist/commands/mrt/env/delete.d.ts +1 -5
- package/dist/commands/mrt/env/delete.js +2 -17
- package/dist/commands/mrt/env/delete.js.map +1 -1
- package/dist/commands/mrt/env/redirect/clone.js +1 -16
- package/dist/commands/mrt/env/redirect/clone.js.map +1 -1
- package/dist/commands/mrt/env/redirect/delete.js +1 -16
- package/dist/commands/mrt/env/redirect/delete.js.map +1 -1
- package/dist/commands/mrt/project/delete.js +2 -17
- package/dist/commands/mrt/project/delete.js.map +1 -1
- package/dist/commands/mrt/project/member/remove.js +1 -16
- package/dist/commands/mrt/project/member/remove.js.map +1 -1
- package/dist/commands/mrt/project/notification/delete.js +1 -16
- package/dist/commands/mrt/project/notification/delete.js.map +1 -1
- package/dist/commands/mrt/save-credentials.d.ts +35 -0
- package/dist/commands/mrt/save-credentials.js +97 -0
- package/dist/commands/mrt/save-credentials.js.map +1 -0
- package/dist/commands/mrt/user/api-key.d.ts +0 -1
- package/dist/commands/mrt/user/api-key.js +2 -14
- package/dist/commands/mrt/user/api-key.js.map +1 -1
- package/dist/commands/sandbox/delete.js +2 -17
- package/dist/commands/sandbox/delete.js.map +1 -1
- package/dist/commands/sandbox/update.d.ts +1 -0
- package/dist/commands/sandbox/update.js +18 -5
- package/dist/commands/sandbox/update.js.map +1 -1
- package/dist/commands/scapi/replications/get.d.ts +12 -0
- package/dist/commands/scapi/replications/get.js +74 -0
- package/dist/commands/scapi/replications/get.js.map +1 -0
- package/dist/commands/scapi/replications/list.d.ts +18 -0
- package/dist/commands/scapi/replications/list.js +119 -0
- package/dist/commands/scapi/replications/list.js.map +1 -0
- package/dist/commands/scapi/replications/publish.d.ts +16 -0
- package/dist/commands/scapi/replications/publish.js +100 -0
- package/dist/commands/scapi/replications/publish.js.map +1 -0
- package/dist/commands/scapi/replications/wait.d.ts +15 -0
- package/dist/commands/scapi/replications/wait.js +77 -0
- package/dist/commands/scapi/replications/wait.js.map +1 -0
- package/dist/commands/setup/inspect.d.ts +2 -0
- package/dist/commands/setup/inspect.js +24 -1
- package/dist/commands/setup/inspect.js.map +1 -1
- package/dist/commands/sites/cartridges/add.d.ts +19 -0
- package/dist/commands/sites/cartridges/add.js +93 -0
- package/dist/commands/sites/cartridges/add.js.map +1 -0
- package/dist/commands/sites/cartridges/list.d.ts +14 -0
- package/dist/commands/sites/cartridges/list.js +63 -0
- package/dist/commands/sites/cartridges/list.js.map +1 -0
- package/dist/commands/sites/cartridges/remove.d.ts +17 -0
- package/dist/commands/sites/cartridges/remove.js +76 -0
- package/dist/commands/sites/cartridges/remove.js.map +1 -0
- package/dist/commands/sites/cartridges/set.d.ts +17 -0
- package/dist/commands/sites/cartridges/set.js +73 -0
- package/dist/commands/sites/cartridges/set.js.map +1 -0
- package/dist/commands/webdav/rm.d.ts +4 -0
- package/dist/commands/webdav/rm.js +3 -17
- package/dist/commands/webdav/rm.js.map +1 -1
- package/dist/i18n/locales/en.d.ts +27 -0
- package/dist/i18n/locales/en.js +28 -1
- package/dist/i18n/locales/en.js.map +1 -1
- package/dist/i18n/locales/index.d.ts +27 -0
- package/dist/prompts.d.ts +12 -0
- package/dist/prompts.js +34 -0
- package/dist/prompts.js.map +1 -0
- package/dist/utils/ecdn/base-command.d.ts +0 -5
- package/dist/utils/ecdn/base-command.js +1 -12
- package/dist/utils/ecdn/base-command.js.map +1 -1
- package/dist/utils/scapi/replications.d.ts +20 -0
- package/dist/utils/scapi/replications.js +37 -0
- package/dist/utils/scapi/replications.js.map +1 -0
- package/dist/utils/scapi/schemas.d.ts +0 -5
- package/dist/utils/scapi/schemas.js +1 -12
- package/dist/utils/scapi/schemas.js.map +1 -1
- package/dist/utils/slas/client.js +2 -2
- package/dist/utils/slas/client.js.map +1 -1
- package/oclif.manifest.json +10624 -5338
- package/package.json +21 -9
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2025, Salesforce, Inc.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2
|
|
4
|
+
* For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { Args, Flags } from '@oclif/core';
|
|
7
|
+
import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
8
|
+
import { revokeBmRole } from '@salesforce/b2c-tooling-sdk/operations/bm-roles';
|
|
9
|
+
import { t } from '../../../i18n/index.js';
|
|
10
|
+
export default class BmRolesRevoke extends InstanceCommand {
|
|
11
|
+
static args = {
|
|
12
|
+
login: Args.string({
|
|
13
|
+
description: 'User login (email)',
|
|
14
|
+
required: true,
|
|
15
|
+
}),
|
|
16
|
+
};
|
|
17
|
+
static description = t('commands.bm.roles.revoke.description', 'Revoke a Business Manager role from a user on an instance');
|
|
18
|
+
static enableJsonFlag = true;
|
|
19
|
+
static examples = [
|
|
20
|
+
'<%= config.bin %> <%= command.id %> user@example.com --role Administrator',
|
|
21
|
+
'<%= config.bin %> <%= command.id %> user@example.com --role Administrator --json',
|
|
22
|
+
];
|
|
23
|
+
static flags = {
|
|
24
|
+
role: Flags.string({
|
|
25
|
+
char: 'r',
|
|
26
|
+
description: 'Role ID to revoke',
|
|
27
|
+
required: true,
|
|
28
|
+
}),
|
|
29
|
+
};
|
|
30
|
+
async run() {
|
|
31
|
+
this.requireOAuthCredentials();
|
|
32
|
+
const { login } = this.args;
|
|
33
|
+
const { role } = this.flags;
|
|
34
|
+
const hostname = this.resolvedConfig.values.hostname;
|
|
35
|
+
this.log(t('commands.bm.roles.revoke.revoking', 'Revoking role {{role}} from {{login}} on {{hostname}}...', {
|
|
36
|
+
role,
|
|
37
|
+
login,
|
|
38
|
+
hostname,
|
|
39
|
+
}));
|
|
40
|
+
await revokeBmRole(this.instance, role, login);
|
|
41
|
+
const result = { success: true, role, login, hostname };
|
|
42
|
+
if (this.jsonEnabled()) {
|
|
43
|
+
return result;
|
|
44
|
+
}
|
|
45
|
+
this.log(t('commands.bm.roles.revoke.success', 'User {{login}} revoked from role {{role}} on {{hostname}}.', {
|
|
46
|
+
login,
|
|
47
|
+
role,
|
|
48
|
+
hostname,
|
|
49
|
+
}));
|
|
50
|
+
return result;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=revoke.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"revoke.js","sourceRoot":"","sources":["../../../../src/commands/bm/roles/revoke.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAC,CAAC,EAAC,MAAM,wBAAwB,CAAC;AASzC,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,eAAqC;IAC9E,MAAM,CAAC,IAAI,GAAG;QACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,CAAC,CACpB,sCAAsC,EACtC,2DAA2D,CAC5D,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,2EAA2E;QAC3E,kFAAkF;KACnF,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,mBAAmB;YAChC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAS,CAAC;QAEtD,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,mCAAmC,EAAE,0DAA0D,EAAE;YACjG,IAAI;YACJ,KAAK;YACL,QAAQ;SACT,CAAC,CACH,CAAC;QAEF,MAAM,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAE/C,MAAM,MAAM,GAAG,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;QAEtD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,kCAAkC,EAAE,4DAA4D,EAAE;YAClG,KAAK;YACL,IAAI;YACJ,QAAQ;SACT,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
2
2
|
import { deleteCodeVersion } from '@salesforce/b2c-tooling-sdk/operations/code';
|
|
3
|
-
|
|
4
|
-
* Simple confirmation prompt.
|
|
5
|
-
*/
|
|
6
|
-
declare function confirm(message: string): Promise<boolean>;
|
|
3
|
+
import { confirm } from '../../prompts.js';
|
|
7
4
|
export default class CodeDelete extends InstanceCommand<typeof CodeDelete> {
|
|
8
5
|
static hiddenAliases: string[];
|
|
9
6
|
static args: {
|
|
@@ -48,4 +45,3 @@ export default class CodeDelete extends InstanceCommand<typeof CodeDelete> {
|
|
|
48
45
|
};
|
|
49
46
|
run(): Promise<void>;
|
|
50
47
|
}
|
|
51
|
-
export {};
|
|
@@ -3,26 +3,11 @@
|
|
|
3
3
|
* SPDX-License-Identifier: Apache-2
|
|
4
4
|
* For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
|
|
5
5
|
*/
|
|
6
|
-
import * as readline from 'node:readline';
|
|
7
6
|
import { Args, Flags } from '@oclif/core';
|
|
8
7
|
import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
9
8
|
import { deleteCodeVersion } from '@salesforce/b2c-tooling-sdk/operations/code';
|
|
10
9
|
import { t, withDocs } from '../../i18n/index.js';
|
|
11
|
-
|
|
12
|
-
* Simple confirmation prompt.
|
|
13
|
-
*/
|
|
14
|
-
async function confirm(message) {
|
|
15
|
-
const rl = readline.createInterface({
|
|
16
|
-
input: process.stdin,
|
|
17
|
-
output: process.stderr,
|
|
18
|
-
});
|
|
19
|
-
return new Promise((resolve) => {
|
|
20
|
-
rl.question(`${message} `, (answer) => {
|
|
21
|
-
rl.close();
|
|
22
|
-
resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
}
|
|
10
|
+
import { confirm } from '../../prompts.js';
|
|
26
11
|
export default class CodeDelete extends InstanceCommand {
|
|
27
12
|
static hiddenAliases = ['code:delete'];
|
|
28
13
|
static args = {
|
|
@@ -57,7 +42,7 @@ export default class CodeDelete extends InstanceCommand {
|
|
|
57
42
|
const hostname = this.resolvedConfig.values.hostname;
|
|
58
43
|
// Confirm deletion unless --force is used
|
|
59
44
|
if (!this.flags.force) {
|
|
60
|
-
const confirmed = await this.operations.confirm(t('commands.code.delete.confirm', 'Are you sure you want to delete code version "{{codeVersion}}" on {{hostname}}?
|
|
45
|
+
const confirmed = await this.operations.confirm(t('commands.code.delete.confirm', 'Are you sure you want to delete code version "{{codeVersion}}" on {{hostname}}?', { codeVersion, hostname }));
|
|
61
46
|
if (!confirmed) {
|
|
62
47
|
this.log(t('commands.code.delete.cancelled', 'Deletion cancelled'));
|
|
63
48
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/commands/code/delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/commands/code/delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAC,iBAAiB,EAAC,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAkC;IACxE,MAAM,CAAC,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,GAAG;QACZ,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC;YACvB,WAAW,EAAE,2BAA2B;YACxC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,kCAAkC,EAAE,uBAAuB,CAAC,EAC9D,gCAAgC,CACjC,CAAC;IAEF,MAAM,CAAC,QAAQ,GAAG;QAChB,iDAAiD;QACjD,yDAAyD;QACzD,oFAAoF;KACrF,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,eAAe,CAAC,SAAS;QAC5B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;YACvC,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEQ,UAAU,GAAG;QACrB,OAAO;QACP,iBAAiB;KAClB,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,gCAAgC;QAChC,IAAI,CAAC,iCAAiC,CAAC,qBAAqB,CAAC,CAAC;QAE9D,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAS,CAAC;QAEtD,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAC7C,CAAC,CACC,8BAA8B,EAC9B,iFAAiF,EACjF,EAAC,WAAW,EAAE,QAAQ,EAAC,CACxB,CACF,CAAC;YAEF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,gCAAgC,EAAE,oBAAoB,CAAC,CAAC,CAAC;gBACpE,OAAO;YACT,CAAC;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,+BAA+B,EAAE,4DAA4D,EAAE;YAC/F,QAAQ;YACR,WAAW;SACZ,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,8BAA8B,EAAE,mDAAmD,EAAE,EAAC,WAAW,EAAC,CAAC,CAAC,CAAC;IAClH,CAAC"}
|
|
@@ -98,7 +98,7 @@ export default class ContentExport extends JobCommand {
|
|
|
98
98
|
if (!flags['library-file']) {
|
|
99
99
|
this.requireOAuthCredentials();
|
|
100
100
|
}
|
|
101
|
-
const waitOptions = flags.timeout ? {
|
|
101
|
+
const waitOptions = flags.timeout ? { timeoutSeconds: flags.timeout } : undefined;
|
|
102
102
|
if (flags['dry-run']) {
|
|
103
103
|
const { library } = await this.operations.fetchContentLibrary(this.instance, libraryId, {
|
|
104
104
|
libraryFile: flags['library-file'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/content/export.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/content/export.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,7 @@ export default class ContentList extends JobCommand {
|
|
|
79
79
|
if (!flags['library-file']) {
|
|
80
80
|
this.requireOAuthCredentials();
|
|
81
81
|
}
|
|
82
|
-
const waitOptions = flags.timeout ? {
|
|
82
|
+
const waitOptions = flags.timeout ? { timeoutSeconds: flags.timeout } : undefined;
|
|
83
83
|
const instance = flags['library-file'] ? null : this.instance;
|
|
84
84
|
const { library } = await this.operations.fetchContentLibrary(instance, libraryId, {
|
|
85
85
|
libraryFile: flags['library-file'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/content/list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/content/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,13 +133,12 @@ export default class JobExport extends JobCommand {
|
|
|
133
133
|
}));
|
|
134
134
|
this.log(t('commands.job.export.dataUnits', 'Data units: {{dataUnits}}', { dataUnits: JSON.stringify(dataUnits) }));
|
|
135
135
|
const waitOptions = {
|
|
136
|
-
|
|
137
|
-
|
|
136
|
+
timeoutSeconds: timeout,
|
|
137
|
+
onPoll: (info) => {
|
|
138
138
|
if (!this.jsonEnabled()) {
|
|
139
|
-
const elapsedSec = Math.floor(elapsed / 1000);
|
|
140
139
|
this.log(t('commands.job.export.progress', ' Status: {{status}} ({{elapsed}}s elapsed)', {
|
|
141
|
-
status:
|
|
142
|
-
elapsed:
|
|
140
|
+
status: info.status,
|
|
141
|
+
elapsed: String(info.elapsedSeconds),
|
|
143
142
|
}));
|
|
144
143
|
}
|
|
145
144
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/job/export.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/job/export.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,13 +88,12 @@ export default class JobImport extends JobCommand {
|
|
|
88
88
|
const result = await this.operations.siteArchiveImport(this.instance, importTarget, {
|
|
89
89
|
keepArchive,
|
|
90
90
|
waitOptions: {
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
timeoutSeconds: timeout,
|
|
92
|
+
onPoll: (info) => {
|
|
93
93
|
if (!this.jsonEnabled()) {
|
|
94
|
-
const elapsedSec = Math.floor(elapsed / 1000);
|
|
95
94
|
this.log(t('commands.job.import.progress', ' Status: {{status}} ({{elapsed}}s elapsed)', {
|
|
96
|
-
status:
|
|
97
|
-
elapsed:
|
|
95
|
+
status: info.status,
|
|
96
|
+
elapsed: String(info.elapsedSeconds),
|
|
98
97
|
}));
|
|
99
98
|
}
|
|
100
99
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/commands/job/import.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/commands/job/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
|
|
|
11
11
|
static flags: {
|
|
12
12
|
wait: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
13
13
|
timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
|
+
'poll-interval': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
15
|
param: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
15
16
|
body: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
17
|
'no-wait-running': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
package/dist/commands/job/run.js
CHANGED
|
@@ -35,6 +35,11 @@ export default class JobRun extends JobCommand {
|
|
|
35
35
|
char: 't',
|
|
36
36
|
description: 'Timeout in seconds when waiting (default: no timeout)',
|
|
37
37
|
}),
|
|
38
|
+
'poll-interval': Flags.integer({
|
|
39
|
+
description: 'Polling interval in seconds when using --wait',
|
|
40
|
+
default: 3,
|
|
41
|
+
dependsOn: ['wait'],
|
|
42
|
+
}),
|
|
38
43
|
param: Flags.string({
|
|
39
44
|
char: 'P',
|
|
40
45
|
description: 'Job parameter in format "name=value" (use -P multiple times for multiple params)',
|
|
@@ -63,7 +68,7 @@ export default class JobRun extends JobCommand {
|
|
|
63
68
|
async run() {
|
|
64
69
|
this.requireOAuthCredentials();
|
|
65
70
|
const { jobId } = this.args;
|
|
66
|
-
const { wait, timeout, param, body, 'no-wait-running': noWaitRunning, 'show-log': showLog } = this.flags;
|
|
71
|
+
const { wait, timeout, 'poll-interval': pollInterval, param, body, 'no-wait-running': noWaitRunning, 'show-log': showLog, } = this.flags;
|
|
67
72
|
// Parse parameters or body
|
|
68
73
|
const parameters = this.parseParameters(param || []);
|
|
69
74
|
const rawBody = body ? this.parseBody(body) : undefined;
|
|
@@ -109,6 +114,7 @@ export default class JobRun extends JobCommand {
|
|
|
109
114
|
jobId,
|
|
110
115
|
executionId: execution.id,
|
|
111
116
|
timeout,
|
|
117
|
+
pollInterval,
|
|
112
118
|
showLog,
|
|
113
119
|
context,
|
|
114
120
|
});
|
|
@@ -174,17 +180,17 @@ export default class JobRun extends JobCommand {
|
|
|
174
180
|
});
|
|
175
181
|
}
|
|
176
182
|
async waitForJobCompletion(options) {
|
|
177
|
-
const { jobId, executionId, timeout, showLog, context } = options;
|
|
183
|
+
const { jobId, executionId, timeout, pollInterval, showLog, context } = options;
|
|
178
184
|
this.log(t('commands.job.run.waiting', 'Waiting for job to complete...'));
|
|
179
185
|
try {
|
|
180
186
|
const execution = await this.operations.waitForJob(this.instance, jobId, executionId, {
|
|
181
|
-
|
|
182
|
-
|
|
187
|
+
timeoutSeconds: timeout,
|
|
188
|
+
pollIntervalSeconds: pollInterval,
|
|
189
|
+
onPoll: (info) => {
|
|
183
190
|
if (!this.jsonEnabled()) {
|
|
184
|
-
const elapsedSec = Math.floor(elapsed / 1000);
|
|
185
191
|
this.log(t('commands.job.run.progress', ' Status: {{status}} ({{elapsed}}s elapsed)', {
|
|
186
|
-
status:
|
|
187
|
-
elapsed:
|
|
192
|
+
status: info.status,
|
|
193
|
+
elapsed: String(info.elapsedSeconds),
|
|
188
194
|
}));
|
|
189
195
|
}
|
|
190
196
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/job/run.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAA2B,MAAM,iCAAiC,CAAC;AACrF,OAAO,EACL,UAAU,EACV,UAAU,EACV,iBAAiB,GAElB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAyB;IAC3D,MAAM,CAAC,aAAa,GAAG,CAAC,SAAS,CAAC,CAAC;IAEnC,MAAM,CAAC,IAAI,GAAG;QACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,mBAAmB;YAChC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,8BAA8B,EAAE,0CAA0C,CAAC,EAC7E,4BAA4B,CAC7B,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,mDAAmD;QACnD,0DAA0D;QAC1D,MAAM,CAAC,GAAG,CAAA,sHAAsH;QAChI,wEAAwE;QACxE,MAAM,CAAC,GAAG,CAAA,+HAA+H;KAC1I,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;YACvC,OAAO,EAAE,KAAK;SACf,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uDAAuD;SACrE,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,kFAAkF;YAC/F,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,IAAI;YACvB,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,mEAAmE;YAChF,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/B,WAAW,EAAE,uDAAuD;YACpE,OAAO,EAAE,KAAK;SACf,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC;YACxB,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,IAAI;SACd,CAAC;KACH,CAAC;IAEQ,UAAU,GAAG;QACrB,UAAU;QACV,UAAU;KACX,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/job/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,14 +53,13 @@ export default class JobWait extends JobCommand {
|
|
|
53
53
|
}));
|
|
54
54
|
try {
|
|
55
55
|
const execution = await this.operations.waitForJob(this.instance, jobId, executionId, {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
timeoutSeconds: timeout,
|
|
57
|
+
pollIntervalSeconds: pollInterval,
|
|
58
|
+
onPoll: (info) => {
|
|
59
59
|
if (!this.jsonEnabled()) {
|
|
60
|
-
const elapsedSec = Math.floor(elapsed / 1000);
|
|
61
60
|
this.log(t('commands.job.wait.progress', ' Status: {{status}} ({{elapsed}}s elapsed)', {
|
|
62
|
-
status:
|
|
63
|
-
elapsed:
|
|
61
|
+
status: info.status,
|
|
62
|
+
elapsed: String(info.elapsedSeconds),
|
|
64
63
|
}));
|
|
65
64
|
}
|
|
66
65
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/job/wait.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAoB,MAAM,6CAA6C,CAAC;AAC7G,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,UAA0B;IAC7D,MAAM,CAAC,IAAI,GAAG;QACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,QAAQ;YACrB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC;YACvB,WAAW,EAAE,0BAA0B;YACvC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,+BAA+B,EAAE,sCAAsC,CAAC,EAC1E,6BAA6B,CAC9B,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,0DAA0D;QAC1D,wEAAwE;QACxE,4EAA4E;KAC7E,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0CAA0C;SACxD,CAAC;QACF,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC;YAC7B,WAAW,EAAE,6BAA6B;YAC1C,OAAO,EAAE,CAAC;SACX,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC;YACxB,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,IAAI;SACd,CAAC;KACH,CAAC;IAEQ,UAAU,GAAG;QACrB,UAAU;KACX,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,MAAM,EAAC,KAAK,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QACvC,MAAM,EAAC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjF,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,2BAA2B,EAAE,wDAAwD,EAAE;YACvF,KAAK;YACL,WAAW;SACZ,CAAC,CACH,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE;gBACpF,
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/job/wait.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
2
|
-
import { type PushResult, type CreateDeploymentResult } from '@salesforce/b2c-tooling-sdk/operations/mrt';
|
|
3
|
-
type DeployResult = CreateDeploymentResult | PushResult;
|
|
2
|
+
import { pushBundle, createDeployment, waitForEnv, type PushResult, type CreateDeploymentResult, type MrtEnvironment } from '@salesforce/b2c-tooling-sdk/operations/mrt';
|
|
3
|
+
type DeployResult = CreateDeploymentResult | MrtEnvironment | PushResult;
|
|
4
4
|
/**
|
|
5
5
|
* Deploy a bundle to Managed Runtime.
|
|
6
6
|
*
|
|
@@ -26,6 +26,9 @@ export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy>
|
|
|
26
26
|
'ssr-shared': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
27
27
|
'node-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
28
28
|
'ssr-param': import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
|
|
29
|
+
wait: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
30
|
+
'poll-interval': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
31
|
+
timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
29
32
|
'api-key': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
30
33
|
project: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
31
34
|
environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -43,6 +46,11 @@ export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy>
|
|
|
43
46
|
'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
44
47
|
'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
45
48
|
};
|
|
49
|
+
protected operations: {
|
|
50
|
+
pushBundle: typeof pushBundle;
|
|
51
|
+
createDeployment: typeof createDeployment;
|
|
52
|
+
waitForEnv: typeof waitForEnv;
|
|
53
|
+
};
|
|
46
54
|
run(): Promise<DeployResult>;
|
|
47
55
|
/**
|
|
48
56
|
* Deploy an existing bundle to an environment.
|
|
@@ -52,5 +60,9 @@ export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy>
|
|
|
52
60
|
* Push a local build to create a new bundle.
|
|
53
61
|
*/
|
|
54
62
|
private pushLocalBuild;
|
|
63
|
+
/**
|
|
64
|
+
* Wait for a deployment to complete by polling the environment state.
|
|
65
|
+
*/
|
|
66
|
+
private waitForDeployment;
|
|
55
67
|
}
|
|
56
68
|
export {};
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Args, Flags } from '@oclif/core';
|
|
7
7
|
import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
8
|
-
import { pushBundle, createDeployment, DEFAULT_SSR_PARAMETERS, } from '@salesforce/b2c-tooling-sdk/operations/mrt';
|
|
8
|
+
import { pushBundle, createDeployment, waitForEnv, DEFAULT_SSR_PARAMETERS, } from '@salesforce/b2c-tooling-sdk/operations/mrt';
|
|
9
9
|
import { t, withDocs } from '../../../i18n/index.js';
|
|
10
10
|
/**
|
|
11
11
|
* Parses a glob pattern string into an array of patterns.
|
|
@@ -69,6 +69,7 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
69
69
|
'<%= config.bin %> <%= command.id %> --project my-storefront --node-version 20.x',
|
|
70
70
|
'<%= config.bin %> <%= command.id %> --project my-storefront --ssr-param SSRProxyPath=/api',
|
|
71
71
|
'<%= config.bin %> <%= command.id %> 12345 --project my-storefront --environment staging',
|
|
72
|
+
'<%= config.bin %> <%= command.id %> 12345 --project my-storefront --environment staging --wait',
|
|
72
73
|
];
|
|
73
74
|
static flags = {
|
|
74
75
|
...MrtCommand.baseFlags,
|
|
@@ -98,6 +99,26 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
98
99
|
multiple: true,
|
|
99
100
|
default: [],
|
|
100
101
|
}),
|
|
102
|
+
wait: Flags.boolean({
|
|
103
|
+
char: 'w',
|
|
104
|
+
description: 'Wait for the deployment to complete before returning',
|
|
105
|
+
default: false,
|
|
106
|
+
}),
|
|
107
|
+
'poll-interval': Flags.integer({
|
|
108
|
+
description: 'Polling interval in seconds when using --wait',
|
|
109
|
+
default: 30,
|
|
110
|
+
dependsOn: ['wait'],
|
|
111
|
+
}),
|
|
112
|
+
timeout: Flags.integer({
|
|
113
|
+
description: 'Maximum time to wait in seconds when using --wait (0 for no timeout)',
|
|
114
|
+
default: 600,
|
|
115
|
+
dependsOn: ['wait'],
|
|
116
|
+
}),
|
|
117
|
+
};
|
|
118
|
+
operations = {
|
|
119
|
+
pushBundle,
|
|
120
|
+
createDeployment,
|
|
121
|
+
waitForEnv,
|
|
101
122
|
};
|
|
102
123
|
async run() {
|
|
103
124
|
this.requireMrtCredentials();
|
|
@@ -124,7 +145,7 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
124
145
|
environment,
|
|
125
146
|
}));
|
|
126
147
|
try {
|
|
127
|
-
const result = await createDeployment({
|
|
148
|
+
const result = await this.operations.createDeployment({
|
|
128
149
|
projectSlug: project,
|
|
129
150
|
targetSlug: environment,
|
|
130
151
|
bundleId,
|
|
@@ -135,7 +156,12 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
135
156
|
bundleId,
|
|
136
157
|
environment,
|
|
137
158
|
}));
|
|
138
|
-
this.
|
|
159
|
+
if (!this.flags.wait) {
|
|
160
|
+
this.log(t('commands.mrt.bundle.deploy.note', 'Note: Deployments are asynchronous. Use "b2c mrt env get" or the Runtime Admin dashboard to check status.'));
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (this.flags.wait) {
|
|
164
|
+
return this.waitForDeployment(project, environment);
|
|
139
165
|
}
|
|
140
166
|
return result;
|
|
141
167
|
}
|
|
@@ -171,7 +197,7 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
171
197
|
this.log(t('commands.mrt.bundle.deploy.willDeploy', 'Bundle will be deployed to {{environment}}', { environment: target }));
|
|
172
198
|
}
|
|
173
199
|
try {
|
|
174
|
-
const result = await pushBundle({
|
|
200
|
+
const result = await this.operations.pushBundle({
|
|
175
201
|
projectSlug: project,
|
|
176
202
|
target,
|
|
177
203
|
message,
|
|
@@ -189,6 +215,13 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
189
215
|
deployed: deployedMsg,
|
|
190
216
|
message: result.message,
|
|
191
217
|
}));
|
|
218
|
+
if (this.flags.wait) {
|
|
219
|
+
if (!target) {
|
|
220
|
+
this.warn('--wait was specified but no environment target was provided. Skipping wait.');
|
|
221
|
+
return result;
|
|
222
|
+
}
|
|
223
|
+
return this.waitForDeployment(project, target);
|
|
224
|
+
}
|
|
192
225
|
return result;
|
|
193
226
|
}
|
|
194
227
|
catch (error) {
|
|
@@ -198,5 +231,34 @@ export default class MrtBundleDeploy extends MrtCommand {
|
|
|
198
231
|
throw error;
|
|
199
232
|
}
|
|
200
233
|
}
|
|
234
|
+
/**
|
|
235
|
+
* Wait for a deployment to complete by polling the environment state.
|
|
236
|
+
*/
|
|
237
|
+
async waitForDeployment(project, environment) {
|
|
238
|
+
this.log(t('commands.mrt.bundle.deploy.waiting', 'Waiting for deployment to complete on {{environment}}...', {
|
|
239
|
+
environment,
|
|
240
|
+
}));
|
|
241
|
+
const envResult = await this.operations.waitForEnv({
|
|
242
|
+
projectSlug: project,
|
|
243
|
+
slug: environment,
|
|
244
|
+
origin: this.resolvedConfig.values.mrtOrigin,
|
|
245
|
+
pollIntervalSeconds: this.flags['poll-interval'],
|
|
246
|
+
timeoutSeconds: this.flags.timeout,
|
|
247
|
+
onPoll: (info) => {
|
|
248
|
+
if (!this.jsonEnabled()) {
|
|
249
|
+
this.log(t('commands.mrt.bundle.deploy.state', '[{{elapsed}}s] State: {{state}}', {
|
|
250
|
+
elapsed: String(info.elapsedSeconds),
|
|
251
|
+
state: info.state,
|
|
252
|
+
}));
|
|
253
|
+
}
|
|
254
|
+
},
|
|
255
|
+
}, this.getMrtAuth());
|
|
256
|
+
if (!this.jsonEnabled()) {
|
|
257
|
+
this.log(t('commands.mrt.bundle.deploy.deployComplete', 'Deployment complete. Environment is {{state}}.', {
|
|
258
|
+
state: envResult.state ?? 'unknown',
|
|
259
|
+
}));
|
|
260
|
+
}
|
|
261
|
+
return envResult;
|
|
262
|
+
}
|
|
201
263
|
}
|
|
202
264
|
//# sourceMappingURL=deploy.js.map
|