@salesforce/b2c-cli 1.23.2 → 2.1.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.
Files changed (282) hide show
  1. package/dist/commands/bm/roles/create.d.ts +4 -4
  2. package/dist/commands/bm/roles/create.js +6 -4
  3. package/dist/commands/bm/roles/create.js.map +1 -1
  4. package/dist/commands/bm/roles/delete.d.ts +2 -2
  5. package/dist/commands/bm/roles/delete.js +5 -4
  6. package/dist/commands/bm/roles/delete.js.map +1 -1
  7. package/dist/commands/bm/roles/get.d.ts +4 -4
  8. package/dist/commands/bm/roles/get.js +18 -12
  9. package/dist/commands/bm/roles/get.js.map +1 -1
  10. package/dist/commands/bm/roles/grant.d.ts +9 -5
  11. package/dist/commands/bm/roles/grant.js +8 -6
  12. package/dist/commands/bm/roles/grant.js.map +1 -1
  13. package/dist/commands/bm/roles/list.d.ts +4 -4
  14. package/dist/commands/bm/roles/list.js +14 -12
  15. package/dist/commands/bm/roles/list.js.map +1 -1
  16. package/dist/commands/bm/roles/permissions/get.d.ts +4 -4
  17. package/dist/commands/bm/roles/permissions/get.js +7 -5
  18. package/dist/commands/bm/roles/permissions/get.js.map +1 -1
  19. package/dist/commands/bm/roles/permissions/set.d.ts +4 -4
  20. package/dist/commands/bm/roles/permissions/set.js +6 -4
  21. package/dist/commands/bm/roles/permissions/set.js.map +1 -1
  22. package/dist/commands/bm/roles/revoke.d.ts +2 -2
  23. package/dist/commands/bm/roles/revoke.js +5 -4
  24. package/dist/commands/bm/roles/revoke.js.map +1 -1
  25. package/dist/commands/bm/users/create.d.ts +22 -0
  26. package/dist/commands/bm/users/create.js +93 -0
  27. package/dist/commands/bm/users/create.js.map +1 -0
  28. package/dist/commands/bm/users/delete.d.ts +2 -2
  29. package/dist/commands/bm/users/delete.js +5 -4
  30. package/dist/commands/bm/users/delete.js.map +1 -1
  31. package/dist/commands/bm/users/get.d.ts +4 -4
  32. package/dist/commands/bm/users/get.js +14 -14
  33. package/dist/commands/bm/users/get.js.map +1 -1
  34. package/dist/commands/bm/users/list.d.ts +4 -4
  35. package/dist/commands/bm/users/list.js +15 -13
  36. package/dist/commands/bm/users/list.js.map +1 -1
  37. package/dist/commands/bm/users/search.d.ts +4 -4
  38. package/dist/commands/bm/users/search.js +8 -7
  39. package/dist/commands/bm/users/search.js.map +1 -1
  40. package/dist/commands/bm/users/update.d.ts +4 -4
  41. package/dist/commands/bm/users/update.js +11 -9
  42. package/dist/commands/bm/users/update.js.map +1 -1
  43. package/dist/commands/cap/install.d.ts +1 -0
  44. package/dist/commands/cap/list.d.ts +1 -0
  45. package/dist/commands/cap/pull.d.ts +1 -0
  46. package/dist/commands/cap/tasks.d.ts +1 -0
  47. package/dist/commands/cap/uninstall.d.ts +1 -0
  48. package/dist/commands/code/activate.d.ts +3 -2
  49. package/dist/commands/code/activate.js +12 -13
  50. package/dist/commands/code/activate.js.map +1 -1
  51. package/dist/commands/code/delete.d.ts +3 -4
  52. package/dist/commands/code/delete.js +6 -8
  53. package/dist/commands/code/delete.js.map +1 -1
  54. package/dist/commands/code/deploy.d.ts +8 -3
  55. package/dist/commands/code/deploy.js +18 -9
  56. package/dist/commands/code/deploy.js.map +1 -1
  57. package/dist/commands/code/download.d.ts +3 -2
  58. package/dist/commands/code/download.js +5 -2
  59. package/dist/commands/code/download.js.map +1 -1
  60. package/dist/commands/code/list.d.ts +10 -4
  61. package/dist/commands/code/list.js +7 -7
  62. package/dist/commands/code/list.js.map +1 -1
  63. package/dist/commands/code/watch.d.ts +1 -0
  64. package/dist/commands/code/watch.js +3 -2
  65. package/dist/commands/code/watch.js.map +1 -1
  66. package/dist/commands/content/export.d.ts +1 -0
  67. package/dist/commands/content/list.d.ts +1 -0
  68. package/dist/commands/debug/cli.d.ts +1 -0
  69. package/dist/commands/debug/index.d.ts +1 -0
  70. package/dist/commands/docs/download.d.ts +1 -0
  71. package/dist/commands/job/execution/delete.d.ts +44 -0
  72. package/dist/commands/job/execution/delete.js +51 -0
  73. package/dist/commands/job/execution/delete.js.map +1 -0
  74. package/dist/commands/job/export.d.ts +2 -0
  75. package/dist/commands/job/export.js +17 -4
  76. package/dist/commands/job/export.js.map +1 -1
  77. package/dist/commands/job/import-set.d.ts +1 -0
  78. package/dist/commands/job/import.d.ts +23 -2
  79. package/dist/commands/job/import.js +116 -11
  80. package/dist/commands/job/import.js.map +1 -1
  81. package/dist/commands/job/log.d.ts +5 -9
  82. package/dist/commands/job/log.js +24 -15
  83. package/dist/commands/job/log.js.map +1 -1
  84. package/dist/commands/job/run.d.ts +3 -6
  85. package/dist/commands/job/run.js +34 -31
  86. package/dist/commands/job/run.js.map +1 -1
  87. package/dist/commands/job/search.d.ts +5 -7
  88. package/dist/commands/job/search.js +13 -19
  89. package/dist/commands/job/search.js.map +1 -1
  90. package/dist/commands/job/wait.d.ts +3 -5
  91. package/dist/commands/job/wait.js +11 -8
  92. package/dist/commands/job/wait.js.map +1 -1
  93. package/dist/commands/logs/get.d.ts +1 -0
  94. package/dist/commands/logs/list.d.ts +1 -0
  95. package/dist/commands/logs/tail.d.ts +1 -0
  96. package/dist/commands/mrt/bundle/delete.d.ts +12 -0
  97. package/dist/commands/mrt/bundle/delete.js +9 -13
  98. package/dist/commands/mrt/bundle/delete.js.map +1 -1
  99. package/dist/commands/mrt/bundle/deploy.d.ts +64 -11
  100. package/dist/commands/mrt/bundle/deploy.js +179 -103
  101. package/dist/commands/mrt/bundle/deploy.js.map +1 -1
  102. package/dist/commands/mrt/bundle/download.d.ts +12 -0
  103. package/dist/commands/mrt/bundle/download.js +8 -12
  104. package/dist/commands/mrt/bundle/download.js.map +1 -1
  105. package/dist/commands/mrt/bundle/history.d.ts +18 -2
  106. package/dist/commands/mrt/bundle/history.js +34 -11
  107. package/dist/commands/mrt/bundle/history.js.map +1 -1
  108. package/dist/commands/mrt/bundle/list.d.ts +18 -2
  109. package/dist/commands/mrt/bundle/list.js +29 -8
  110. package/dist/commands/mrt/bundle/list.js.map +1 -1
  111. package/dist/commands/mrt/bundle/save.js +8 -7
  112. package/dist/commands/mrt/bundle/save.js.map +1 -1
  113. package/dist/commands/mrt/bundle/upload-v2.d.ts +62 -0
  114. package/dist/commands/mrt/bundle/upload-v2.js +172 -0
  115. package/dist/commands/mrt/bundle/upload-v2.js.map +1 -0
  116. package/dist/commands/mrt/env/access-control/list.d.ts +12 -0
  117. package/dist/commands/mrt/env/access-control/list.js +1 -1
  118. package/dist/commands/mrt/env/access-control/list.js.map +1 -1
  119. package/dist/commands/mrt/env/b2c.d.ts +12 -0
  120. package/dist/commands/mrt/env/b2c.js +1 -1
  121. package/dist/commands/mrt/env/b2c.js.map +1 -1
  122. package/dist/commands/mrt/env/clone.d.ts +12 -0
  123. package/dist/commands/mrt/env/clone.js +5 -7
  124. package/dist/commands/mrt/env/clone.js.map +1 -1
  125. package/dist/commands/mrt/env/create.d.ts +13 -1
  126. package/dist/commands/mrt/env/create.js +8 -10
  127. package/dist/commands/mrt/env/create.js.map +1 -1
  128. package/dist/commands/mrt/env/delete.d.ts +13 -1
  129. package/dist/commands/mrt/env/delete.js +9 -13
  130. package/dist/commands/mrt/env/delete.js.map +1 -1
  131. package/dist/commands/mrt/env/get.d.ts +12 -0
  132. package/dist/commands/mrt/env/get.js +1 -1
  133. package/dist/commands/mrt/env/get.js.map +1 -1
  134. package/dist/commands/mrt/env/invalidate.d.ts +12 -0
  135. package/dist/commands/mrt/env/invalidate.js +3 -5
  136. package/dist/commands/mrt/env/invalidate.js.map +1 -1
  137. package/dist/commands/mrt/env/list.d.ts +12 -0
  138. package/dist/commands/mrt/env/list.js +1 -1
  139. package/dist/commands/mrt/env/list.js.map +1 -1
  140. package/dist/commands/mrt/env/redirect/clone.d.ts +12 -0
  141. package/dist/commands/mrt/env/redirect/clone.js +6 -8
  142. package/dist/commands/mrt/env/redirect/clone.js.map +1 -1
  143. package/dist/commands/mrt/env/redirect/create.d.ts +12 -0
  144. package/dist/commands/mrt/env/redirect/create.js +6 -8
  145. package/dist/commands/mrt/env/redirect/create.js.map +1 -1
  146. package/dist/commands/mrt/env/redirect/delete.d.ts +12 -0
  147. package/dist/commands/mrt/env/redirect/delete.js +2 -4
  148. package/dist/commands/mrt/env/redirect/delete.js.map +1 -1
  149. package/dist/commands/mrt/env/redirect/list.d.ts +12 -0
  150. package/dist/commands/mrt/env/redirect/list.js +1 -1
  151. package/dist/commands/mrt/env/redirect/list.js.map +1 -1
  152. package/dist/commands/mrt/env/update.d.ts +12 -0
  153. package/dist/commands/mrt/env/update.js +1 -1
  154. package/dist/commands/mrt/env/update.js.map +1 -1
  155. package/dist/commands/mrt/env/var/delete.d.ts +15 -2
  156. package/dist/commands/mrt/env/var/delete.js +28 -11
  157. package/dist/commands/mrt/env/var/delete.js.map +1 -1
  158. package/dist/commands/mrt/env/var/list.d.ts +17 -4
  159. package/dist/commands/mrt/env/var/list.js +31 -12
  160. package/dist/commands/mrt/env/var/list.js.map +1 -1
  161. package/dist/commands/mrt/env/var/push.d.ts +17 -4
  162. package/dist/commands/mrt/env/var/push.js +78 -32
  163. package/dist/commands/mrt/env/var/push.js.map +1 -1
  164. package/dist/commands/mrt/env/var/set.d.ts +15 -2
  165. package/dist/commands/mrt/env/var/set.js +36 -19
  166. package/dist/commands/mrt/env/var/set.js.map +1 -1
  167. package/dist/commands/mrt/org/b2c.d.ts +12 -0
  168. package/dist/commands/mrt/org/cert/create.d.ts +12 -0
  169. package/dist/commands/mrt/org/cert/create.js +6 -8
  170. package/dist/commands/mrt/org/cert/create.js.map +1 -1
  171. package/dist/commands/mrt/org/cert/delete.d.ts +12 -0
  172. package/dist/commands/mrt/org/cert/delete.js +1 -3
  173. package/dist/commands/mrt/org/cert/delete.js.map +1 -1
  174. package/dist/commands/mrt/org/cert/get.d.ts +12 -0
  175. package/dist/commands/mrt/org/cert/list.d.ts +12 -0
  176. package/dist/commands/mrt/org/cert/restart-validation.d.ts +12 -0
  177. package/dist/commands/mrt/org/cert/restart-validation.js +6 -8
  178. package/dist/commands/mrt/org/cert/restart-validation.js.map +1 -1
  179. package/dist/commands/mrt/org/list.d.ts +12 -0
  180. package/dist/commands/mrt/org/member/add.d.ts +12 -0
  181. package/dist/commands/mrt/org/member/add.js +5 -7
  182. package/dist/commands/mrt/org/member/add.js.map +1 -1
  183. package/dist/commands/mrt/org/member/get.d.ts +12 -0
  184. package/dist/commands/mrt/org/member/list.d.ts +12 -0
  185. package/dist/commands/mrt/org/member/remove.d.ts +12 -0
  186. package/dist/commands/mrt/org/member/remove.js +1 -3
  187. package/dist/commands/mrt/org/member/remove.js.map +1 -1
  188. package/dist/commands/mrt/org/member/update.d.ts +12 -0
  189. package/dist/commands/mrt/org/member/update.js +1 -3
  190. package/dist/commands/mrt/org/member/update.js.map +1 -1
  191. package/dist/commands/mrt/project/create.d.ts +13 -1
  192. package/dist/commands/mrt/project/create.js +7 -6
  193. package/dist/commands/mrt/project/create.js.map +1 -1
  194. package/dist/commands/mrt/project/delete.d.ts +14 -1
  195. package/dist/commands/mrt/project/delete.js +6 -7
  196. package/dist/commands/mrt/project/delete.js.map +1 -1
  197. package/dist/commands/mrt/project/get.d.ts +14 -1
  198. package/dist/commands/mrt/project/get.js +6 -4
  199. package/dist/commands/mrt/project/get.js.map +1 -1
  200. package/dist/commands/mrt/project/list.d.ts +13 -0
  201. package/dist/commands/mrt/project/list.js +1 -0
  202. package/dist/commands/mrt/project/list.js.map +1 -1
  203. package/dist/commands/mrt/project/member/add.d.ts +13 -0
  204. package/dist/commands/mrt/project/member/add.js +6 -7
  205. package/dist/commands/mrt/project/member/add.js.map +1 -1
  206. package/dist/commands/mrt/project/member/get.d.ts +13 -0
  207. package/dist/commands/mrt/project/member/get.js +2 -1
  208. package/dist/commands/mrt/project/member/get.js.map +1 -1
  209. package/dist/commands/mrt/project/member/list.d.ts +13 -0
  210. package/dist/commands/mrt/project/member/list.js +2 -1
  211. package/dist/commands/mrt/project/member/list.js.map +1 -1
  212. package/dist/commands/mrt/project/member/remove.d.ts +13 -0
  213. package/dist/commands/mrt/project/member/remove.js +3 -4
  214. package/dist/commands/mrt/project/member/remove.js.map +1 -1
  215. package/dist/commands/mrt/project/member/update.d.ts +13 -0
  216. package/dist/commands/mrt/project/member/update.js +6 -7
  217. package/dist/commands/mrt/project/member/update.js.map +1 -1
  218. package/dist/commands/mrt/project/notification/create.d.ts +3 -17
  219. package/dist/commands/mrt/project/notification/create.js +30 -18
  220. package/dist/commands/mrt/project/notification/create.js.map +1 -1
  221. package/dist/commands/mrt/project/notification/delete.d.ts +13 -0
  222. package/dist/commands/mrt/project/notification/delete.js +3 -4
  223. package/dist/commands/mrt/project/notification/delete.js.map +1 -1
  224. package/dist/commands/mrt/project/notification/get.d.ts +13 -0
  225. package/dist/commands/mrt/project/notification/get.js +3 -2
  226. package/dist/commands/mrt/project/notification/get.js.map +1 -1
  227. package/dist/commands/mrt/project/notification/list.d.ts +3 -17
  228. package/dist/commands/mrt/project/notification/list.js +22 -10
  229. package/dist/commands/mrt/project/notification/list.js.map +1 -1
  230. package/dist/commands/mrt/project/notification/update.d.ts +3 -17
  231. package/dist/commands/mrt/project/notification/update.js +20 -10
  232. package/dist/commands/mrt/project/notification/update.js.map +1 -1
  233. package/dist/commands/mrt/project/update.d.ts +14 -1
  234. package/dist/commands/mrt/project/update.js +6 -5
  235. package/dist/commands/mrt/project/update.js.map +1 -1
  236. package/dist/commands/mrt/tail-logs.d.ts +12 -0
  237. package/dist/commands/mrt/tail-logs.js +16 -22
  238. package/dist/commands/mrt/tail-logs.js.map +1 -1
  239. package/dist/commands/mrt/user/api-key.d.ts +12 -0
  240. package/dist/commands/mrt/user/api-key.js +3 -5
  241. package/dist/commands/mrt/user/api-key.js.map +1 -1
  242. package/dist/commands/mrt/user/email-prefs.d.ts +12 -0
  243. package/dist/commands/mrt/user/profile.d.ts +12 -0
  244. package/dist/commands/setup/inspect.d.ts +7 -0
  245. package/dist/commands/setup/inspect.js +122 -5
  246. package/dist/commands/setup/inspect.js.map +1 -1
  247. package/dist/commands/setup/instance/create.d.ts +3 -0
  248. package/dist/commands/setup/instance/create.js +27 -5
  249. package/dist/commands/setup/instance/create.js.map +1 -1
  250. package/dist/commands/setup/skills.js +2 -2
  251. package/dist/commands/setup/skills.js.map +1 -1
  252. package/dist/commands/sites/cartridges/list.js +10 -2
  253. package/dist/commands/sites/cartridges/list.js.map +1 -1
  254. package/dist/commands/sites/list.d.ts +7 -3
  255. package/dist/commands/sites/list.js +12 -17
  256. package/dist/commands/sites/list.js.map +1 -1
  257. package/dist/commands/slas/client/delete.d.ts +4 -3
  258. package/dist/commands/slas/client/delete.js +7 -6
  259. package/dist/commands/slas/client/delete.js.map +1 -1
  260. package/dist/commands/slas/client/get.d.ts +4 -3
  261. package/dist/commands/slas/client/get.js +7 -6
  262. package/dist/commands/slas/client/get.js.map +1 -1
  263. package/dist/commands/slas/client/open.d.ts +14 -4
  264. package/dist/commands/slas/client/open.js +10 -18
  265. package/dist/commands/slas/client/open.js.map +1 -1
  266. package/dist/commands/slas/client/update.d.ts +4 -3
  267. package/dist/commands/slas/client/update.js +7 -6
  268. package/dist/commands/slas/client/update.js.map +1 -1
  269. package/dist/commands/webdav/get.d.ts +1 -0
  270. package/dist/commands/webdav/rm.d.ts +1 -0
  271. package/dist/i18n/locales/en.js +1 -1
  272. package/dist/i18n/locales/en.js.map +1 -1
  273. package/dist/script-types/node_modules/@salesforce/b2c-script-types/package.json +15 -2
  274. package/dist/script-types/node_modules/@salesforce/b2c-script-types/plugin/index.js +24 -7
  275. package/dist/utils/mrt/bundle-flags.d.ts +23 -0
  276. package/dist/utils/mrt/bundle-flags.js +64 -0
  277. package/dist/utils/mrt/bundle-flags.js.map +1 -0
  278. package/dist/utils/slas/client.d.ts +34 -0
  279. package/dist/utils/slas/client.js +29 -2
  280. package/dist/utils/slas/client.js.map +1 -1
  281. package/oclif.manifest.json +27653 -18271
  282. package/package.json +11 -2
@@ -1,10 +1,10 @@
1
- import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
2
- import { searchJobExecutions, getJobExecution, getJobLog, type JobExecution } from '@salesforce/b2c-tooling-sdk/operations/jobs';
1
+ import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
2
+ import { type JobExecutionInfo } from '@salesforce/b2c-tooling-sdk/operations/jobs';
3
3
  interface JobLogResult {
4
- execution: JobExecution;
4
+ execution: JobExecutionInfo;
5
5
  log: string;
6
6
  }
7
- export default class JobLog extends InstanceCommand<typeof JobLog> {
7
+ export default class JobLog extends JobCommand<typeof JobLog> {
8
8
  static args: {
9
9
  jobId: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
10
10
  executionId: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
@@ -24,6 +24,7 @@ export default class JobLog extends InstanceCommand<typeof JobLog> {
24
24
  passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
25
25
  selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
26
26
  verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
27
+ 'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
27
28
  'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
28
29
  'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
29
30
  'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -47,11 +48,6 @@ export default class JobLog extends InstanceCommand<typeof JobLog> {
47
48
  'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
48
49
  'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
49
50
  };
50
- protected operations: {
51
- searchJobExecutions: typeof searchJobExecutions;
52
- getJobExecution: typeof getJobExecution;
53
- getJobLog: typeof getJobLog;
54
- };
55
51
  run(): Promise<JobLogResult>;
56
52
  }
57
53
  export {};
@@ -4,11 +4,11 @@
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 { Args, Flags } from '@oclif/core';
7
- import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
8
- import { searchJobExecutions, getJobExecution, getJobLog, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
7
+ import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
8
+ import { getJobExecution as ocapiGetJobExecution, searchJobExecutions as ocapiSearchJobExecutions, scapiGetJobExecution, scapiSearchJobExecutions, mapOcapiExecution, mapOcapiSearchResult, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
9
9
  import { t, withDocs } from '../../i18n/index.js';
10
10
  import { highlightLogText } from '../../utils/logs/index.js';
11
- export default class JobLog extends InstanceCommand {
11
+ export default class JobLog extends JobCommand {
12
12
  static args = {
13
13
  jobId: Args.string({
14
14
  description: 'Job ID',
@@ -28,7 +28,7 @@ export default class JobLog extends InstanceCommand {
28
28
  '<%= config.bin %> <%= command.id %> my-job --json',
29
29
  ];
30
30
  static flags = {
31
- ...InstanceCommand.baseFlags,
31
+ ...JobCommand.baseFlags,
32
32
  failed: Flags.boolean({
33
33
  description: 'Find the most recent failed execution with a log',
34
34
  default: false,
@@ -38,22 +38,22 @@ export default class JobLog extends InstanceCommand {
38
38
  default: false,
39
39
  }),
40
40
  };
41
- operations = {
42
- searchJobExecutions,
43
- getJobExecution,
44
- getJobLog,
45
- };
46
41
  async run() {
47
42
  this.requireOAuthCredentials();
48
43
  const { jobId, executionId } = this.args;
49
44
  const { failed } = this.flags;
45
+ const dispatcher = this.createJobsDispatcher();
46
+ const tenantId = this.resolvedConfig.values.tenantId;
50
47
  let execution;
51
48
  if (executionId) {
52
49
  this.log(t('commands.job.log.fetchingSpecific', 'Fetching log for job {{jobId}} execution {{executionId}}...', {
53
50
  jobId,
54
51
  executionId,
55
52
  }));
56
- execution = await this.operations.getJobExecution(this.instance, jobId, executionId);
53
+ execution = await dispatcher.run({
54
+ scapi: (client) => scapiGetJobExecution(client, jobId, executionId, tenantId),
55
+ ocapi: async () => mapOcapiExecution(await ocapiGetJobExecution(this.instance, jobId, executionId)),
56
+ });
57
57
  }
58
58
  else {
59
59
  this.log(failed
@@ -61,14 +61,18 @@ export default class JobLog extends InstanceCommand {
61
61
  : t('commands.job.log.searching', 'Searching for most recent execution with log for job {{jobId}}...', {
62
62
  jobId,
63
63
  }));
64
- const results = await this.operations.searchJobExecutions(this.instance, {
64
+ const searchOptions = {
65
65
  jobId,
66
66
  status: failed ? ['ERROR'] : undefined,
67
67
  count: 10,
68
68
  sortBy: 'start_time',
69
69
  sortOrder: 'desc',
70
+ };
71
+ const results = await dispatcher.run({
72
+ scapi: (client) => scapiSearchJobExecutions(client, { ...searchOptions, tenantId: tenantId }),
73
+ ocapi: async () => mapOcapiSearchResult(await ocapiSearchJobExecutions(this.instance, searchOptions)),
70
74
  });
71
- const match = results.hits.find((hit) => hit.is_log_file_existing);
75
+ const match = results.hits.find((hit) => hit.isLogFileExisting);
72
76
  if (!match) {
73
77
  const msg = failed
74
78
  ? t('commands.job.log.noFailedExecutionFound', 'No failed execution with a log file found for job {{jobId}}', { jobId })
@@ -79,14 +83,19 @@ export default class JobLog extends InstanceCommand {
79
83
  }
80
84
  execution = match;
81
85
  }
82
- if (!execution.is_log_file_existing) {
86
+ if (!execution.isLogFileExisting) {
83
87
  this.error(t('commands.job.log.noLogFile', 'No log file exists for this execution'));
84
88
  }
85
89
  this.log(t('commands.job.log.foundExecution', 'Found execution {{executionId}} ({{status}})', {
86
90
  executionId: execution.id ?? 'unknown',
87
- status: execution.exit_status?.code || execution.execution_status || 'unknown',
91
+ status: execution.exitStatus?.code || execution.executionStatus || 'unknown',
88
92
  }));
89
- const log = await this.operations.getJobLog(this.instance, execution);
93
+ if (!execution.logFilePath) {
94
+ this.error(t('commands.job.log.noLogFile', 'No log file exists for this execution'));
95
+ }
96
+ const webdavPath = execution.logFilePath.replace(/^\/Sites\//, '');
97
+ const content = await this.instance.webdav.get(webdavPath);
98
+ const log = new TextDecoder().decode(content);
90
99
  if (!this.jsonEnabled()) {
91
100
  const useColor = !this.flags['no-color'] && process.stdout.isTTY;
92
101
  process.stdout.write(useColor ? highlightLogText(log) : log);
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/commands/job/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/commands/job/log.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
2
- import { executeJob, waitForJob, type JobExecution } from '@salesforce/b2c-tooling-sdk/operations/jobs';
2
+ import { type JobExecutionInfo } from '@salesforce/b2c-tooling-sdk/operations/jobs';
3
3
  export default class JobRun extends JobCommand<typeof JobRun> {
4
4
  static args: {
5
5
  jobId: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
@@ -24,6 +24,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
24
24
  passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
25
25
  selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
26
26
  verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
27
+ 'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
27
28
  'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
28
29
  'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
29
30
  'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -48,11 +49,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
48
49
  'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
49
50
  };
50
51
  static hiddenAliases: string[];
51
- protected operations: {
52
- executeJob: typeof executeJob;
53
- waitForJob: typeof waitForJob;
54
- };
55
- run(): Promise<JobExecution>;
52
+ run(): Promise<JobExecutionInfo>;
56
53
  private handleExecutionError;
57
54
  private handleWaitError;
58
55
  private parseBody;
@@ -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 { Args, Flags } from '@oclif/core';
7
- import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
8
- import { executeJob, waitForJob, JobExecutionError, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
7
+ import { JobCommand, BackendDispatcher } from '@salesforce/b2c-tooling-sdk/cli';
8
+ import { executeJob as ocapiExecuteJob, getJobExecution as ocapiGetJobExecution, scapiExecuteJob, 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 JobRun extends JobCommand {
11
11
  static args = {
@@ -61,16 +61,10 @@ export default class JobRun extends JobCommand {
61
61
  }),
62
62
  };
63
63
  static hiddenAliases = ['job:run'];
64
- operations = {
65
- executeJob,
66
- waitForJob,
67
- };
68
64
  async run() {
69
65
  this.requireOAuthCredentials();
70
66
  const { jobId } = this.args;
71
67
  const { wait, timeout, 'poll-interval': pollInterval, param, body, 'no-wait-running': noWaitRunning, 'show-log': showLog, } = this.flags;
72
- // Safety evaluation — check rules for this job before executing.
73
- // Command-level rules are already evaluated generically in BaseCommand.init().
74
68
  const jobEvaluation = this.safetyGuard.evaluate({ type: 'job', jobId });
75
69
  if (jobEvaluation.action === 'block') {
76
70
  this.error(jobEvaluation.reason, { exit: 1 });
@@ -78,10 +72,10 @@ export default class JobRun extends JobCommand {
78
72
  if (jobEvaluation.action === 'confirm') {
79
73
  await this.confirmOrBlock(jobEvaluation);
80
74
  }
81
- // Parse parameters or body
82
75
  const parameters = this.parseParameters(param || []);
83
76
  const rawBody = body ? this.parseBody(body) : undefined;
84
- // Create lifecycle context
77
+ const dispatcher = this.createJobsDispatcher();
78
+ const tenantId = this.resolvedConfig.values.tenantId;
85
79
  const context = this.createContext('job:run', {
86
80
  jobId,
87
81
  parameters: rawBody ? undefined : parameters,
@@ -89,37 +83,47 @@ export default class JobRun extends JobCommand {
89
83
  wait,
90
84
  hostname: this.resolvedConfig.values.hostname,
91
85
  });
92
- // Run beforeOperation hooks - check for skip
93
86
  const beforeResult = await this.runBeforeHooks(context);
94
87
  if (beforeResult.skip) {
95
88
  this.log(t('commands.job.run.skipped', 'Job execution skipped: {{reason}}', {
96
89
  reason: beforeResult.skipReason || 'skipped by plugin',
97
90
  }));
98
- // Return a mock execution for JSON output
99
- return { execution_status: 'finished', exit_status: { code: 'skipped' } };
91
+ return {
92
+ id: '',
93
+ jobId,
94
+ executionStatus: 'finished',
95
+ };
100
96
  }
101
97
  this.log(t('commands.job.run.executing', 'Executing job {{jobId}} on {{hostname}}...', {
102
98
  jobId,
103
99
  hostname: this.resolvedConfig.values.hostname,
104
100
  }));
101
+ const ocapiOptions = {
102
+ parameters: rawBody ? undefined : parameters,
103
+ body: rawBody,
104
+ waitForRunning: !noWaitRunning,
105
+ };
105
106
  let execution;
106
107
  try {
107
- execution = await this.operations.executeJob(this.instance, jobId, {
108
- parameters: rawBody ? undefined : parameters,
109
- body: rawBody,
110
- waitForRunning: !noWaitRunning,
108
+ execution = await dispatcher.run({
109
+ scapi: (client) => scapiExecuteJob(client, jobId, {
110
+ ...ocapiOptions,
111
+ tenantId: tenantId,
112
+ }),
113
+ ocapi: async () => mapOcapiExecution(await ocapiExecuteJob(this.instance, jobId, ocapiOptions)),
111
114
  });
112
115
  }
113
116
  catch (error) {
114
117
  this.handleExecutionError(error, context);
115
118
  }
119
+ this.logger.debug(`Used ${dispatcher.active} backend for job execution`);
116
120
  this.log(t('commands.job.run.started', 'Job started: {{executionId}} (status: {{status}})', {
117
121
  executionId: execution.id,
118
- status: execution.execution_status,
122
+ status: execution.executionStatus,
119
123
  }));
120
- // Wait for completion if requested
121
124
  if (wait) {
122
125
  execution = await this.waitForJobCompletion({
126
+ dispatcher,
123
127
  jobId,
124
128
  executionId: execution.id,
125
129
  timeout,
@@ -129,7 +133,6 @@ export default class JobRun extends JobCommand {
129
133
  });
130
134
  }
131
135
  else {
132
- // Not waiting - run afterOperation hooks with current state
133
136
  await this.runAfterHooks(context, {
134
137
  success: true,
135
138
  duration: Date.now() - context.startTime,
@@ -139,9 +142,6 @@ export default class JobRun extends JobCommand {
139
142
  return execution;
140
143
  }
141
144
  handleExecutionError(error, context) {
142
- // Fire-and-forget: we're already on the error path and rethrow below; surface
143
- // hook failures in the debug log so they aren't completely invisible, but
144
- // don't shadow the original error.
145
145
  this.runAfterHooks(context, {
146
146
  success: false,
147
147
  error: error instanceof Error ? error : new Error(String(error)),
@@ -155,19 +155,18 @@ export default class JobRun extends JobCommand {
155
155
  throw error;
156
156
  }
157
157
  async handleWaitError(error, showLog, context) {
158
- // Run afterOperation hooks with failure
159
158
  await this.runAfterHooks(context, {
160
159
  success: false,
161
160
  error: error instanceof Error ? error : new Error(String(error)),
162
161
  duration: Date.now() - context.startTime,
163
- data: error instanceof JobExecutionError ? error.execution : undefined,
162
+ data: error instanceof CanonicalJobExecutionError ? error.execution : undefined,
164
163
  });
165
- if (error instanceof JobExecutionError) {
164
+ if (error instanceof CanonicalJobExecutionError) {
166
165
  if (showLog) {
167
166
  await this.showJobLog(error.execution);
168
167
  }
169
168
  this.error(t('commands.job.run.jobFailed', 'Job failed: {{status}}', {
170
- status: error.execution.exit_status?.code || 'ERROR',
169
+ status: error.execution.exitStatus?.code || 'ERROR',
171
170
  }));
172
171
  }
173
172
  throw error;
@@ -193,10 +192,15 @@ export default class JobRun extends JobCommand {
193
192
  });
194
193
  }
195
194
  async waitForJobCompletion(options) {
196
- const { jobId, executionId, timeout, pollInterval, showLog, context } = options;
195
+ const { dispatcher, jobId, executionId, timeout, pollInterval, showLog, context } = options;
196
+ const tenantId = this.resolvedConfig.values.tenantId;
197
197
  this.log(t('commands.job.run.waiting', 'Waiting for job to complete...'));
198
198
  try {
199
- const execution = await this.operations.waitForJob(this.instance, jobId, executionId, {
199
+ const getExecution = (jid, eid) => dispatcher.run({
200
+ scapi: (client) => scapiGetJobExecution(client, jid, eid, tenantId),
201
+ ocapi: async () => mapOcapiExecution(await ocapiGetJobExecution(this.instance, jid, eid)),
202
+ });
203
+ const execution = await waitForJobExecution(getExecution, jobId, executionId, {
200
204
  timeoutSeconds: timeout,
201
205
  pollIntervalSeconds: pollInterval,
202
206
  onPoll: (info) => {
@@ -210,10 +214,9 @@ export default class JobRun extends JobCommand {
210
214
  });
211
215
  const durationSec = execution.duration ? (execution.duration / 1000).toFixed(1) : 'N/A';
212
216
  this.log(t('commands.job.run.completed', 'Job completed: {{status}} (duration: {{duration}}s)', {
213
- status: execution.exit_status?.code || execution.execution_status,
217
+ status: execution.exitStatus?.code || execution.executionStatus,
214
218
  duration: durationSec,
215
219
  }));
216
- // Run afterOperation hooks with success
217
220
  await this.runAfterHooks(context, {
218
221
  success: true,
219
222
  duration: Date.now() - context.startTime,
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/job/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/job/run.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
- import { InstanceCommand } from '@salesforce/b2c-tooling-sdk/cli';
2
- import { searchJobExecutions, type JobExecutionSearchResult } from '@salesforce/b2c-tooling-sdk/operations/jobs';
3
- export default class JobSearch extends InstanceCommand<typeof JobSearch> {
1
+ import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
2
+ import { type JobExecutionSearchResults } from '@salesforce/b2c-tooling-sdk/operations/jobs';
3
+ export default class JobSearch extends JobCommand<typeof JobSearch> {
4
4
  static description: string;
5
5
  static enableJsonFlag: boolean;
6
6
  static examples: string[];
@@ -22,6 +22,7 @@ export default class JobSearch extends InstanceCommand<typeof JobSearch> {
22
22
  passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
23
23
  selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
24
24
  verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
25
+ 'api-backend': import("@oclif/core/interfaces").OptionFlag<"ocapi" | "scapi" | "auto" | undefined, import("@oclif/core/interfaces").CustomOptions>;
25
26
  'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
26
27
  'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
27
28
  'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -45,8 +46,5 @@ export default class JobSearch extends InstanceCommand<typeof JobSearch> {
45
46
  'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
46
47
  'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
47
48
  };
48
- protected operations: {
49
- searchJobExecutions: typeof searchJobExecutions;
50
- };
51
- run(): Promise<JobExecutionSearchResult>;
49
+ run(): Promise<JobExecutionSearchResults>;
52
50
  }
@@ -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 { InstanceCommand, TableRenderer, columnFlagsFor, selectColumns, } from '@salesforce/b2c-tooling-sdk/cli';
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.job_id ?? '-',
17
+ get: (e) => e.jobId ?? '-',
18
18
  },
19
19
  status: {
20
20
  header: 'Status',
21
- get: (e) => e.exit_status?.code || e.execution_status || '-',
21
+ get: (e) => e.exitStatus?.code || e.executionStatus || '-',
22
22
  },
23
23
  startTime: {
24
24
  header: 'Start Time',
25
- get: (e) => (e.start_time ? new Date(e.start_time).toISOString().replace('T', ' ').slice(0, 19) : '-'),
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 InstanceCommand {
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
- ...InstanceCommand.baseFlags,
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 results = await this.operations.searchJobExecutions(this.instance, {
83
- jobId,
84
- status,
85
- count,
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":"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"}
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 { waitForJob, type JobExecution } from '@salesforce/b2c-tooling-sdk/operations/jobs';
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
- protected operations: {
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 { waitForJob, JobExecutionError } from '@salesforce/b2c-tooling-sdk/operations/jobs';
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 execution = await this.operations.waitForJob(this.instance, jobId, executionId, {
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.exit_status?.code || execution.execution_status,
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 JobExecutionError) {
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.exit_status?.code || 'ERROR',
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":"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"}
1
+ {"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/commands/job/wait.ts"],"names":[],"mappings":"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"}