@salesforce/b2c-cli 1.23.2 → 2.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/dist/commands/bm/roles/create.d.ts +4 -4
- package/dist/commands/bm/roles/create.js +6 -4
- package/dist/commands/bm/roles/create.js.map +1 -1
- package/dist/commands/bm/roles/delete.d.ts +2 -2
- package/dist/commands/bm/roles/delete.js +5 -4
- package/dist/commands/bm/roles/delete.js.map +1 -1
- package/dist/commands/bm/roles/get.d.ts +4 -4
- package/dist/commands/bm/roles/get.js +18 -12
- package/dist/commands/bm/roles/get.js.map +1 -1
- package/dist/commands/bm/roles/grant.d.ts +9 -5
- package/dist/commands/bm/roles/grant.js +8 -6
- package/dist/commands/bm/roles/grant.js.map +1 -1
- package/dist/commands/bm/roles/list.d.ts +4 -4
- package/dist/commands/bm/roles/list.js +14 -12
- package/dist/commands/bm/roles/list.js.map +1 -1
- package/dist/commands/bm/roles/permissions/get.d.ts +4 -4
- package/dist/commands/bm/roles/permissions/get.js +7 -5
- package/dist/commands/bm/roles/permissions/get.js.map +1 -1
- package/dist/commands/bm/roles/permissions/set.d.ts +4 -4
- package/dist/commands/bm/roles/permissions/set.js +6 -4
- package/dist/commands/bm/roles/permissions/set.js.map +1 -1
- package/dist/commands/bm/roles/revoke.d.ts +2 -2
- package/dist/commands/bm/roles/revoke.js +5 -4
- package/dist/commands/bm/roles/revoke.js.map +1 -1
- package/dist/commands/bm/users/create.d.ts +22 -0
- package/dist/commands/bm/users/create.js +93 -0
- package/dist/commands/bm/users/create.js.map +1 -0
- package/dist/commands/bm/users/delete.d.ts +2 -2
- package/dist/commands/bm/users/delete.js +5 -4
- package/dist/commands/bm/users/delete.js.map +1 -1
- package/dist/commands/bm/users/get.d.ts +4 -4
- package/dist/commands/bm/users/get.js +14 -14
- package/dist/commands/bm/users/get.js.map +1 -1
- package/dist/commands/bm/users/list.d.ts +4 -4
- package/dist/commands/bm/users/list.js +15 -13
- package/dist/commands/bm/users/list.js.map +1 -1
- package/dist/commands/bm/users/search.d.ts +4 -4
- package/dist/commands/bm/users/search.js +8 -7
- package/dist/commands/bm/users/search.js.map +1 -1
- package/dist/commands/bm/users/update.d.ts +4 -4
- package/dist/commands/bm/users/update.js +11 -9
- package/dist/commands/bm/users/update.js.map +1 -1
- package/dist/commands/cap/install.d.ts +1 -0
- package/dist/commands/cap/list.d.ts +1 -0
- package/dist/commands/cap/pull.d.ts +1 -0
- package/dist/commands/cap/tasks.d.ts +1 -0
- package/dist/commands/cap/uninstall.d.ts +1 -0
- package/dist/commands/code/activate.d.ts +3 -2
- package/dist/commands/code/activate.js +12 -13
- package/dist/commands/code/activate.js.map +1 -1
- package/dist/commands/code/delete.d.ts +3 -4
- package/dist/commands/code/delete.js +6 -8
- package/dist/commands/code/delete.js.map +1 -1
- package/dist/commands/code/deploy.d.ts +8 -3
- package/dist/commands/code/deploy.js +18 -9
- package/dist/commands/code/deploy.js.map +1 -1
- package/dist/commands/code/download.d.ts +3 -2
- package/dist/commands/code/download.js +5 -2
- package/dist/commands/code/download.js.map +1 -1
- package/dist/commands/code/list.d.ts +10 -4
- package/dist/commands/code/list.js +7 -7
- package/dist/commands/code/list.js.map +1 -1
- package/dist/commands/code/watch.d.ts +1 -0
- package/dist/commands/code/watch.js +3 -2
- package/dist/commands/code/watch.js.map +1 -1
- package/dist/commands/content/export.d.ts +1 -0
- package/dist/commands/content/list.d.ts +1 -0
- package/dist/commands/debug/cli.d.ts +1 -0
- package/dist/commands/debug/index.d.ts +1 -0
- package/dist/commands/docs/download.d.ts +1 -0
- package/dist/commands/job/execution/delete.d.ts +44 -0
- package/dist/commands/job/execution/delete.js +51 -0
- package/dist/commands/job/execution/delete.js.map +1 -0
- package/dist/commands/job/export.d.ts +1 -0
- package/dist/commands/job/import-set.d.ts +1 -0
- package/dist/commands/job/import.d.ts +1 -0
- package/dist/commands/job/log.d.ts +5 -9
- package/dist/commands/job/log.js +24 -15
- package/dist/commands/job/log.js.map +1 -1
- package/dist/commands/job/run.d.ts +3 -6
- package/dist/commands/job/run.js +34 -31
- package/dist/commands/job/run.js.map +1 -1
- package/dist/commands/job/search.d.ts +5 -7
- package/dist/commands/job/search.js +13 -19
- package/dist/commands/job/search.js.map +1 -1
- package/dist/commands/job/wait.d.ts +3 -5
- package/dist/commands/job/wait.js +11 -8
- package/dist/commands/job/wait.js.map +1 -1
- package/dist/commands/logs/get.d.ts +1 -0
- package/dist/commands/logs/list.d.ts +1 -0
- package/dist/commands/logs/tail.d.ts +1 -0
- package/dist/commands/mrt/bundle/delete.d.ts +12 -0
- package/dist/commands/mrt/bundle/delete.js +1 -1
- package/dist/commands/mrt/bundle/delete.js.map +1 -1
- package/dist/commands/mrt/bundle/deploy.d.ts +39 -10
- package/dist/commands/mrt/bundle/deploy.js +114 -85
- package/dist/commands/mrt/bundle/deploy.js.map +1 -1
- package/dist/commands/mrt/bundle/download.d.ts +12 -0
- package/dist/commands/mrt/bundle/download.js +1 -1
- package/dist/commands/mrt/bundle/download.js.map +1 -1
- package/dist/commands/mrt/bundle/history.d.ts +18 -2
- package/dist/commands/mrt/bundle/history.js +40 -15
- package/dist/commands/mrt/bundle/history.js.map +1 -1
- package/dist/commands/mrt/bundle/list.d.ts +12 -0
- package/dist/commands/mrt/bundle/list.js +1 -1
- package/dist/commands/mrt/bundle/list.js.map +1 -1
- package/dist/commands/mrt/bundle/save.js +7 -4
- package/dist/commands/mrt/bundle/save.js.map +1 -1
- package/dist/commands/mrt/bundle/upload-v2.d.ts +58 -0
- package/dist/commands/mrt/bundle/upload-v2.js +169 -0
- package/dist/commands/mrt/bundle/upload-v2.js.map +1 -0
- package/dist/commands/mrt/env/access-control/list.d.ts +12 -0
- package/dist/commands/mrt/env/access-control/list.js +1 -1
- package/dist/commands/mrt/env/access-control/list.js.map +1 -1
- package/dist/commands/mrt/env/b2c.d.ts +12 -0
- package/dist/commands/mrt/env/b2c.js +1 -1
- package/dist/commands/mrt/env/b2c.js.map +1 -1
- package/dist/commands/mrt/env/clone.d.ts +12 -0
- package/dist/commands/mrt/env/clone.js +1 -1
- package/dist/commands/mrt/env/clone.js.map +1 -1
- package/dist/commands/mrt/env/create.d.ts +13 -1
- package/dist/commands/mrt/env/create.js +4 -4
- package/dist/commands/mrt/env/create.js.map +1 -1
- package/dist/commands/mrt/env/delete.d.ts +13 -1
- package/dist/commands/mrt/env/delete.js +4 -4
- package/dist/commands/mrt/env/delete.js.map +1 -1
- package/dist/commands/mrt/env/get.d.ts +12 -0
- package/dist/commands/mrt/env/get.js +1 -1
- package/dist/commands/mrt/env/get.js.map +1 -1
- package/dist/commands/mrt/env/invalidate.d.ts +12 -0
- package/dist/commands/mrt/env/invalidate.js +1 -1
- package/dist/commands/mrt/env/invalidate.js.map +1 -1
- package/dist/commands/mrt/env/list.d.ts +12 -0
- package/dist/commands/mrt/env/list.js +1 -1
- package/dist/commands/mrt/env/list.js.map +1 -1
- package/dist/commands/mrt/env/redirect/clone.d.ts +12 -0
- package/dist/commands/mrt/env/redirect/clone.js +1 -1
- package/dist/commands/mrt/env/redirect/clone.js.map +1 -1
- package/dist/commands/mrt/env/redirect/create.d.ts +12 -0
- package/dist/commands/mrt/env/redirect/create.js +1 -1
- package/dist/commands/mrt/env/redirect/create.js.map +1 -1
- package/dist/commands/mrt/env/redirect/delete.d.ts +12 -0
- package/dist/commands/mrt/env/redirect/delete.js +1 -1
- package/dist/commands/mrt/env/redirect/delete.js.map +1 -1
- package/dist/commands/mrt/env/redirect/list.d.ts +12 -0
- package/dist/commands/mrt/env/redirect/list.js +1 -1
- package/dist/commands/mrt/env/redirect/list.js.map +1 -1
- package/dist/commands/mrt/env/update.d.ts +12 -0
- package/dist/commands/mrt/env/update.js +1 -1
- package/dist/commands/mrt/env/update.js.map +1 -1
- package/dist/commands/mrt/env/var/delete.d.ts +12 -0
- package/dist/commands/mrt/env/var/delete.js +1 -1
- package/dist/commands/mrt/env/var/delete.js.map +1 -1
- package/dist/commands/mrt/env/var/list.d.ts +12 -0
- package/dist/commands/mrt/env/var/list.js +1 -1
- package/dist/commands/mrt/env/var/list.js.map +1 -1
- package/dist/commands/mrt/env/var/push.d.ts +12 -0
- package/dist/commands/mrt/env/var/push.js +1 -1
- package/dist/commands/mrt/env/var/push.js.map +1 -1
- package/dist/commands/mrt/env/var/set.d.ts +12 -0
- package/dist/commands/mrt/env/var/set.js +1 -1
- package/dist/commands/mrt/env/var/set.js.map +1 -1
- package/dist/commands/mrt/org/b2c.d.ts +12 -0
- package/dist/commands/mrt/org/cert/create.d.ts +12 -0
- package/dist/commands/mrt/org/cert/delete.d.ts +12 -0
- package/dist/commands/mrt/org/cert/get.d.ts +12 -0
- package/dist/commands/mrt/org/cert/list.d.ts +12 -0
- package/dist/commands/mrt/org/cert/restart-validation.d.ts +12 -0
- package/dist/commands/mrt/org/list.d.ts +12 -0
- package/dist/commands/mrt/org/member/add.d.ts +12 -0
- package/dist/commands/mrt/org/member/get.d.ts +12 -0
- package/dist/commands/mrt/org/member/list.d.ts +12 -0
- package/dist/commands/mrt/org/member/remove.d.ts +12 -0
- package/dist/commands/mrt/org/member/update.d.ts +12 -0
- package/dist/commands/mrt/project/create.d.ts +13 -1
- package/dist/commands/mrt/project/create.js +7 -6
- package/dist/commands/mrt/project/create.js.map +1 -1
- package/dist/commands/mrt/project/delete.d.ts +14 -1
- package/dist/commands/mrt/project/delete.js +5 -4
- package/dist/commands/mrt/project/delete.js.map +1 -1
- package/dist/commands/mrt/project/get.d.ts +14 -1
- package/dist/commands/mrt/project/get.js +6 -4
- package/dist/commands/mrt/project/get.js.map +1 -1
- package/dist/commands/mrt/project/list.d.ts +13 -0
- package/dist/commands/mrt/project/list.js +1 -0
- package/dist/commands/mrt/project/list.js.map +1 -1
- package/dist/commands/mrt/project/member/add.d.ts +13 -0
- package/dist/commands/mrt/project/member/add.js +2 -1
- package/dist/commands/mrt/project/member/add.js.map +1 -1
- package/dist/commands/mrt/project/member/get.d.ts +13 -0
- package/dist/commands/mrt/project/member/get.js +2 -1
- package/dist/commands/mrt/project/member/get.js.map +1 -1
- package/dist/commands/mrt/project/member/list.d.ts +13 -0
- package/dist/commands/mrt/project/member/list.js +2 -1
- package/dist/commands/mrt/project/member/list.js.map +1 -1
- package/dist/commands/mrt/project/member/remove.d.ts +13 -0
- package/dist/commands/mrt/project/member/remove.js +2 -1
- package/dist/commands/mrt/project/member/remove.js.map +1 -1
- package/dist/commands/mrt/project/member/update.d.ts +13 -0
- package/dist/commands/mrt/project/member/update.js +2 -1
- package/dist/commands/mrt/project/member/update.js.map +1 -1
- package/dist/commands/mrt/project/notification/create.d.ts +3 -17
- package/dist/commands/mrt/project/notification/create.js +24 -10
- package/dist/commands/mrt/project/notification/create.js.map +1 -1
- package/dist/commands/mrt/project/notification/delete.d.ts +13 -0
- package/dist/commands/mrt/project/notification/delete.js +2 -1
- package/dist/commands/mrt/project/notification/delete.js.map +1 -1
- package/dist/commands/mrt/project/notification/get.d.ts +13 -0
- package/dist/commands/mrt/project/notification/get.js +3 -2
- package/dist/commands/mrt/project/notification/get.js.map +1 -1
- package/dist/commands/mrt/project/notification/list.d.ts +3 -17
- package/dist/commands/mrt/project/notification/list.js +22 -10
- package/dist/commands/mrt/project/notification/list.js.map +1 -1
- package/dist/commands/mrt/project/notification/update.d.ts +3 -17
- package/dist/commands/mrt/project/notification/update.js +19 -7
- package/dist/commands/mrt/project/notification/update.js.map +1 -1
- package/dist/commands/mrt/project/update.d.ts +14 -1
- package/dist/commands/mrt/project/update.js +6 -5
- package/dist/commands/mrt/project/update.js.map +1 -1
- package/dist/commands/mrt/tail-logs.d.ts +12 -0
- package/dist/commands/mrt/tail-logs.js +1 -1
- package/dist/commands/mrt/tail-logs.js.map +1 -1
- package/dist/commands/mrt/user/api-key.d.ts +12 -0
- package/dist/commands/mrt/user/email-prefs.d.ts +12 -0
- package/dist/commands/mrt/user/profile.d.ts +12 -0
- package/dist/commands/setup/instance/create.d.ts +3 -0
- package/dist/commands/setup/instance/create.js +27 -5
- package/dist/commands/setup/instance/create.js.map +1 -1
- package/dist/commands/setup/skills.js +2 -2
- package/dist/commands/setup/skills.js.map +1 -1
- package/dist/commands/sites/cartridges/list.js +10 -2
- package/dist/commands/sites/cartridges/list.js.map +1 -1
- package/dist/commands/sites/list.d.ts +7 -3
- package/dist/commands/sites/list.js +12 -17
- package/dist/commands/sites/list.js.map +1 -1
- package/dist/commands/slas/client/delete.d.ts +4 -3
- package/dist/commands/slas/client/delete.js +7 -6
- package/dist/commands/slas/client/delete.js.map +1 -1
- package/dist/commands/slas/client/get.d.ts +4 -3
- package/dist/commands/slas/client/get.js +7 -6
- package/dist/commands/slas/client/get.js.map +1 -1
- package/dist/commands/slas/client/open.d.ts +14 -4
- package/dist/commands/slas/client/open.js +10 -18
- package/dist/commands/slas/client/open.js.map +1 -1
- package/dist/commands/slas/client/update.d.ts +4 -3
- package/dist/commands/slas/client/update.js +7 -6
- package/dist/commands/slas/client/update.js.map +1 -1
- package/dist/commands/webdav/get.d.ts +1 -0
- package/dist/commands/webdav/rm.d.ts +1 -0
- package/dist/i18n/locales/en.js +1 -1
- package/dist/i18n/locales/en.js.map +1 -1
- package/dist/utils/mrt/bundle-flags.d.ts +23 -0
- package/dist/utils/mrt/bundle-flags.js +64 -0
- package/dist/utils/mrt/bundle-flags.js.map +1 -0
- package/dist/utils/slas/client.d.ts +34 -0
- package/dist/utils/slas/client.js +29 -2
- package/dist/utils/slas/client.js.map +1 -1
- package/oclif.manifest.json +23950 -14639
- package/package.json +11 -2
|
@@ -4,8 +4,8 @@
|
|
|
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
6
|
import { Flags, ux } from '@oclif/core';
|
|
7
|
-
import {
|
|
8
|
-
import { searchJobExecutions, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
7
|
+
import { JobCommand, TableRenderer, columnFlagsFor, selectColumns, } from '@salesforce/b2c-tooling-sdk/cli';
|
|
8
|
+
import { searchJobExecutions as ocapiSearchJobExecutions, scapiSearchJobExecutions, mapOcapiSearchResult, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
9
9
|
import { t, withDocs } from '../../i18n/index.js';
|
|
10
10
|
const COLUMNS = {
|
|
11
11
|
id: {
|
|
@@ -14,20 +14,20 @@ const COLUMNS = {
|
|
|
14
14
|
},
|
|
15
15
|
jobId: {
|
|
16
16
|
header: 'Job ID',
|
|
17
|
-
get: (e) => e.
|
|
17
|
+
get: (e) => e.jobId ?? '-',
|
|
18
18
|
},
|
|
19
19
|
status: {
|
|
20
20
|
header: 'Status',
|
|
21
|
-
get: (e) => e.
|
|
21
|
+
get: (e) => e.exitStatus?.code || e.executionStatus || '-',
|
|
22
22
|
},
|
|
23
23
|
startTime: {
|
|
24
24
|
header: 'Start Time',
|
|
25
|
-
get: (e) => (e.
|
|
25
|
+
get: (e) => (e.startTime ? new Date(e.startTime).toISOString().replace('T', ' ').slice(0, 19) : '-'),
|
|
26
26
|
},
|
|
27
27
|
};
|
|
28
28
|
const DEFAULT_COLUMNS = ['id', 'jobId', 'status', 'startTime'];
|
|
29
29
|
const tableRenderer = new TableRenderer(COLUMNS);
|
|
30
|
-
export default class JobSearch extends
|
|
30
|
+
export default class JobSearch extends JobCommand {
|
|
31
31
|
static description = withDocs(t('commands.job.search.description', 'Search for job executions on a B2C Commerce instance'), '/cli/jobs.html#b2c-job-search');
|
|
32
32
|
static enableJsonFlag = true;
|
|
33
33
|
static examples = [
|
|
@@ -38,7 +38,7 @@ export default class JobSearch extends InstanceCommand {
|
|
|
38
38
|
'<%= config.bin %> <%= command.id %> --json',
|
|
39
39
|
];
|
|
40
40
|
static flags = {
|
|
41
|
-
...
|
|
41
|
+
...JobCommand.baseFlags,
|
|
42
42
|
'job-id': Flags.string({
|
|
43
43
|
char: 'j',
|
|
44
44
|
description: 'Filter by job ID',
|
|
@@ -70,28 +70,22 @@ export default class JobSearch extends InstanceCommand {
|
|
|
70
70
|
}),
|
|
71
71
|
...columnFlagsFor(COLUMNS),
|
|
72
72
|
};
|
|
73
|
-
operations = {
|
|
74
|
-
searchJobExecutions,
|
|
75
|
-
};
|
|
76
73
|
async run() {
|
|
77
74
|
this.requireOAuthCredentials();
|
|
78
75
|
const { 'job-id': jobId, status, count, start, 'sort-by': sortBy, 'sort-order': sortOrder } = this.flags;
|
|
76
|
+
const dispatcher = this.createJobsDispatcher();
|
|
77
|
+
const tenantId = this.resolvedConfig.values.tenantId;
|
|
79
78
|
this.log(t('commands.job.search.searching', 'Searching job executions on {{hostname}}...', {
|
|
80
79
|
hostname: this.resolvedConfig.values.hostname,
|
|
81
80
|
}));
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
start,
|
|
87
|
-
sortBy,
|
|
88
|
-
sortOrder: sortOrder,
|
|
81
|
+
const searchOptions = { jobId, status, count, start, sortBy, sortOrder: sortOrder };
|
|
82
|
+
const results = await dispatcher.run({
|
|
83
|
+
scapi: (client) => scapiSearchJobExecutions(client, { ...searchOptions, tenantId: tenantId }),
|
|
84
|
+
ocapi: async () => mapOcapiSearchResult(await ocapiSearchJobExecutions(this.instance, searchOptions)),
|
|
89
85
|
});
|
|
90
|
-
// JSON output handled by oclif
|
|
91
86
|
if (this.jsonEnabled()) {
|
|
92
87
|
return results;
|
|
93
88
|
}
|
|
94
|
-
// Human-readable output
|
|
95
89
|
if (results.total === 0) {
|
|
96
90
|
ux.stdout(t('commands.job.search.noResults', 'No job executions found.'));
|
|
97
91
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/commands/job/search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/commands/job/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
2
|
-
import {
|
|
2
|
+
import { type JobExecutionInfo } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
3
3
|
export default class JobWait extends JobCommand<typeof JobWait> {
|
|
4
4
|
static args: {
|
|
5
5
|
jobId: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
@@ -21,6 +21,7 @@ export default class JobWait extends JobCommand<typeof JobWait> {
|
|
|
21
21
|
passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
22
22
|
selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
23
23
|
verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
24
|
+
'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
25
|
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
26
|
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
26
27
|
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -44,8 +45,5 @@ export default class JobWait extends JobCommand<typeof JobWait> {
|
|
|
44
45
|
'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
45
46
|
'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
46
47
|
};
|
|
47
|
-
|
|
48
|
-
waitForJob: typeof waitForJob;
|
|
49
|
-
};
|
|
50
|
-
run(): Promise<JobExecution>;
|
|
48
|
+
run(): Promise<JobExecutionInfo>;
|
|
51
49
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Args, Flags } from '@oclif/core';
|
|
7
7
|
import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
8
|
-
import {
|
|
8
|
+
import { getJobExecution as ocapiGetJobExecution, scapiGetJobExecution, mapOcapiExecution, waitForJobExecution, CanonicalJobExecutionError, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
9
9
|
import { t, withDocs } from '../../i18n/index.js';
|
|
10
10
|
export default class JobWait extends JobCommand {
|
|
11
11
|
static args = {
|
|
@@ -40,19 +40,22 @@ export default class JobWait extends JobCommand {
|
|
|
40
40
|
default: true,
|
|
41
41
|
}),
|
|
42
42
|
};
|
|
43
|
-
operations = {
|
|
44
|
-
waitForJob,
|
|
45
|
-
};
|
|
46
43
|
async run() {
|
|
47
44
|
this.requireOAuthCredentials();
|
|
48
45
|
const { jobId, executionId } = this.args;
|
|
49
46
|
const { timeout, 'poll-interval': pollInterval, 'show-log': showLog } = this.flags;
|
|
47
|
+
const dispatcher = this.createJobsDispatcher();
|
|
48
|
+
const tenantId = this.resolvedConfig.values.tenantId;
|
|
50
49
|
this.log(t('commands.job.wait.waiting', 'Waiting for job {{jobId}} execution {{executionId}}...', {
|
|
51
50
|
jobId,
|
|
52
51
|
executionId,
|
|
53
52
|
}));
|
|
54
53
|
try {
|
|
55
|
-
const
|
|
54
|
+
const getExecution = (jid, eid) => dispatcher.run({
|
|
55
|
+
scapi: (client) => scapiGetJobExecution(client, jid, eid, tenantId),
|
|
56
|
+
ocapi: async () => mapOcapiExecution(await ocapiGetJobExecution(this.instance, jid, eid)),
|
|
57
|
+
});
|
|
58
|
+
const execution = await waitForJobExecution(getExecution, jobId, executionId, {
|
|
56
59
|
timeoutSeconds: timeout,
|
|
57
60
|
pollIntervalSeconds: pollInterval,
|
|
58
61
|
onPoll: (info) => {
|
|
@@ -66,18 +69,18 @@ export default class JobWait extends JobCommand {
|
|
|
66
69
|
});
|
|
67
70
|
const durationSec = execution.duration ? (execution.duration / 1000).toFixed(1) : 'N/A';
|
|
68
71
|
this.log(t('commands.job.wait.completed', 'Job completed: {{status}} (duration: {{duration}}s)', {
|
|
69
|
-
status: execution.
|
|
72
|
+
status: execution.exitStatus?.code || execution.executionStatus,
|
|
70
73
|
duration: durationSec,
|
|
71
74
|
}));
|
|
72
75
|
return execution;
|
|
73
76
|
}
|
|
74
77
|
catch (error) {
|
|
75
|
-
if (error instanceof
|
|
78
|
+
if (error instanceof CanonicalJobExecutionError) {
|
|
76
79
|
if (showLog) {
|
|
77
80
|
await this.showJobLog(error.execution);
|
|
78
81
|
}
|
|
79
82
|
this.error(t('commands.job.wait.jobFailed', 'Job failed: {{status}}', {
|
|
80
|
-
status: error.execution.
|
|
83
|
+
status: error.execution.exitStatus?.code || 'ERROR',
|
|
81
84
|
}));
|
|
82
85
|
}
|
|
83
86
|
throw error;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/job/wait.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export default class LogsGet extends InstanceCommand<typeof LogsGet> {
|
|
|
26
26
|
passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
27
27
|
selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
28
28
|
verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
29
|
+
'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
29
30
|
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
30
31
|
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
31
32
|
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -23,6 +23,7 @@ export default class LogsList extends InstanceCommand<typeof LogsList> {
|
|
|
23
23
|
passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
24
|
selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
25
25
|
verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
26
|
+
'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
26
27
|
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
27
28
|
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
28
29
|
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -21,6 +21,7 @@ export default class LogsTail extends InstanceCommand<typeof LogsTail> {
|
|
|
21
21
|
passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
22
22
|
selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
23
23
|
verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
24
|
+
'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
25
|
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
26
|
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
26
27
|
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -21,6 +21,18 @@ export default class MrtBundleDelete extends MrtCommand<typeof MrtBundleDelete>
|
|
|
21
21
|
environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
22
22
|
'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
23
23
|
'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
|
+
'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
|
|
25
|
+
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
26
|
+
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
27
|
+
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
28
|
+
'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
29
|
+
'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
30
|
+
'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
31
|
+
'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
32
|
+
'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
33
|
+
'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
34
|
+
'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
35
|
+
'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
36
|
'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
37
|
debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
26
38
|
json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
@@ -41,7 +41,7 @@ export default class MrtBundleDelete extends MrtCommand {
|
|
|
41
41
|
const { argv, flags } = await this.parse(MrtBundleDelete);
|
|
42
42
|
const { mrtProject: project } = this.resolvedConfig.values;
|
|
43
43
|
if (!project) {
|
|
44
|
-
this.error('MRT project is required. Provide --project
|
|
44
|
+
this.error('MRT project is required. Provide --project/--storefront (-p/-s), set MRT_PROJECT, or set mrtProject in dw.json.');
|
|
45
45
|
}
|
|
46
46
|
const bundleIds = [];
|
|
47
47
|
for (const arg of argv) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/mrt/bundle/delete.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,EACL,iBAAiB,EACjB,YAAY,GAEb,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAO5C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAkC;IAC7E,MAAM,CAAC,IAAI,GAAG;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,iDAAiD;YAC9D,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,wCAAwC,EAAE,2DAA2D,CAAC,EACxG,qCAAqC,CACtC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,mEAAmE;QACnE,wEAAwE;QACxE,oEAAoE;KACrE,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;YACvC,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEF,uCAAuC;IACvC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEZ,UAAU,GAAG;QACrB,YAAY;QACZ,iBAAiB;KAClB,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,EAAC,UAAU,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/mrt/bundle/delete.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,EACL,iBAAiB,EACjB,YAAY,GAEb,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAO5C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAkC;IAC7E,MAAM,CAAC,IAAI,GAAG;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,iDAAiD;YAC9D,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,wCAAwC,EAAE,2DAA2D,CAAC,EACxG,qCAAqC,CACtC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,mEAAmE;QACnE,wEAAwE;QACxE,oEAAoE;KACrE,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0BAA0B;YACvC,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEF,uCAAuC;IACvC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEZ,UAAU,GAAG;QACrB,YAAY;QACZ,iBAAiB;KAClB,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,EAAC,UAAU,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CACR,iHAAiH,CAClH,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,IAA8B,EAAE,CAAC;YACjD,MAAM,CAAC,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,sCAAsC,EAAE,4BAA4B,EAAE,EAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC,CAAC;YAC1G,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,MAAM,OAAO,GACX,SAAS,CAAC,MAAM,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC,CAAC,uCAAuC,EAAE,wCAAwC,EAAE;oBACnF,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBACxB,OAAO;iBACR,CAAC;gBACJ,CAAC,CAAC,CAAC,CAAC,wCAAwC,EAAE,wCAAwC,EAAE;oBACpF,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC;oBAC3B,OAAO;iBACR,CAAC,CAAC;YACT,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC,EAAE,mBAAmB,CAAC,CAAC,CAAC;gBACzE,OAAO,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;gBAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAChC;oBACE,WAAW,EAAE,OAAO;oBACpB,QAAQ;oBACR,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS;iBAC7C,EACD,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;gBAEF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBACxB,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,sCAAsC,EAAE,oCAAoC,EAAE,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAC,CAAC,CACxG,CAAC;gBACJ,CAAC;gBAED,OAAO,EAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAC,CAAC;YAC5C,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CACpD;gBACE,WAAW,EAAE,OAAO;gBACpB,SAAS;gBACT,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS;aAC7C,EACD,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,uCAAuC,EAAE,sCAAsC,EAAE;oBACjF,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;iBAChC,CAAC,CACH,CAAC;gBACF,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,2CAA2C,EAAE,mBAAmB,CAAC,CAAC,CAAC;oBAC9E,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;wBAChC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,CACR,CAAC,CAAC,mCAAmC,EAAE,yCAAyC,EAAE,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAC5G,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
2
|
-
import { pushBundle,
|
|
3
|
-
type DeployResult = CreateDeploymentResult | MrtEnvironment | PushResult;
|
|
2
|
+
import { pushBundle, deployMrtBundle, waitForEnv, waitForDeploymentScapi } from '@salesforce/b2c-tooling-sdk/operations/mrt';
|
|
4
3
|
/**
|
|
5
4
|
* Deploy a bundle to Managed Runtime.
|
|
6
5
|
*
|
|
7
6
|
* Without bundleId: Creates a bundle from the local build directory and uploads it.
|
|
8
|
-
* Optionally deploys to
|
|
7
|
+
* Optionally deploys to an environment if --environment is specified.
|
|
8
|
+
* The local-build path is legacy-pinned (bundle upload is not part of the SCAPI
|
|
9
|
+
* MRT surface yet), so it runs against the MRT Cloud API regardless of backend.
|
|
9
10
|
*
|
|
10
|
-
* With bundleId: Deploys an existing bundle to the specified environment.
|
|
11
|
+
* With bundleId: Deploys an existing bundle to the specified environment. This
|
|
12
|
+
* path is backend-aware — it honors `--mrt-backend` (auto/legacy/scapi).
|
|
11
13
|
*/
|
|
12
14
|
export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy> {
|
|
13
15
|
static args: {
|
|
@@ -34,6 +36,18 @@ export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy>
|
|
|
34
36
|
environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
35
37
|
'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
36
38
|
'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
39
|
+
'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
|
|
40
|
+
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
41
|
+
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
42
|
+
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
43
|
+
'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
44
|
+
'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
45
|
+
'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
46
|
+
'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
47
|
+
'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
48
|
+
'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
49
|
+
'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
50
|
+
'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
37
51
|
'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
38
52
|
debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
39
53
|
json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
@@ -48,21 +62,36 @@ export default class MrtBundleDeploy extends MrtCommand<typeof MrtBundleDeploy>
|
|
|
48
62
|
};
|
|
49
63
|
protected operations: {
|
|
50
64
|
pushBundle: typeof pushBundle;
|
|
51
|
-
|
|
65
|
+
deployMrtBundle: typeof deployMrtBundle;
|
|
52
66
|
waitForEnv: typeof waitForEnv;
|
|
67
|
+
waitForDeploymentScapi: typeof waitForDeploymentScapi;
|
|
53
68
|
};
|
|
54
|
-
run(): Promise<
|
|
69
|
+
run(): Promise<unknown>;
|
|
70
|
+
protected supportsScapiMrt(): boolean;
|
|
55
71
|
/**
|
|
56
|
-
* Deploy an existing bundle to an environment.
|
|
72
|
+
* Deploy an existing bundle to an environment. Backend-aware: honors
|
|
73
|
+
* `--mrt-backend` and, on `--wait`, polls whichever backend served the deploy.
|
|
74
|
+
*
|
|
75
|
+
* Returns the backend's native response so `--json` stays backend-specific:
|
|
76
|
+
* without `--wait`, the raw create result (legacy MRT Cloud API / SCAPI
|
|
77
|
+
* Storefront Deployments); with `--wait`, the polled environment (legacy) or
|
|
78
|
+
* completed deployment (SCAPI).
|
|
57
79
|
*/
|
|
58
80
|
private deployExistingBundle;
|
|
59
81
|
/**
|
|
60
|
-
* Push a local build to create a new bundle.
|
|
82
|
+
* Push a local build to create a new bundle. Legacy-pinned: bundle upload is
|
|
83
|
+
* not part of the SCAPI MRT surface, so a single command never mixes
|
|
84
|
+
* backends. Explicit `--mrt-backend scapi` errors here; `auto` warns and
|
|
85
|
+
* proceeds on the legacy MRT Cloud API.
|
|
61
86
|
*/
|
|
62
87
|
private pushLocalBuild;
|
|
63
88
|
/**
|
|
64
|
-
* Wait for a deployment to complete by polling the environment state.
|
|
89
|
+
* Wait for a legacy deployment to complete by polling the environment state.
|
|
65
90
|
*/
|
|
66
91
|
private waitForDeployment;
|
|
92
|
+
/**
|
|
93
|
+
* Wait for a SCAPI deployment to complete by polling it by ID (the backend
|
|
94
|
+
* that served a SCAPI deploy pins this strategy).
|
|
95
|
+
*/
|
|
96
|
+
private waitForScapiDeploymentById;
|
|
67
97
|
}
|
|
68
|
-
export {};
|