@dcupl/cli 1.4.0-beta.7 → 1.4.0-beta.9
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/functions/files/files-push.js +1 -1
- package/dist/functions/files/files-push.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.js +4 -7
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/status.d.ts +1 -1
- package/dist/functions/workflow/commands/status.js +7 -1
- package/dist/functions/workflow/commands/status.js.map +1 -1
- package/dist/functions/workflow/commands/test.js +5 -7
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/run-failure.js +1 -1
- package/dist/functions/workflow/run-failure.js.map +1 -1
- package/dist/functions/workflow/types.d.ts +11 -2
- package/dist/functions/workflow/types.js +4 -0
- package/dist/functions/workflow/types.js.map +1 -1
- package/dist/functions/workflow/wait-for-swap.d.ts +24 -1
- package/dist/functions/workflow/wait-for-swap.js +58 -0
- package/dist/functions/workflow/wait-for-swap.js.map +1 -1
- package/package.json +5 -5
|
@@ -53,7 +53,7 @@ const pushFiles = async (args, output) => {
|
|
|
53
53
|
const config = {
|
|
54
54
|
method: 'post',
|
|
55
55
|
url: `${apiUrl}/projects/${projectId.value}/files/versions/${versionId}/push/`,
|
|
56
|
-
headers: { ...form.getHeaders(),
|
|
56
|
+
headers: { ...form.getHeaders(), apikey: apiKey.value },
|
|
57
57
|
data: form,
|
|
58
58
|
maxContentLength: Infinity,
|
|
59
59
|
maxBodyLength: Infinity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-push.js","sourceRoot":"","sources":["../../../src/functions/files/files-push.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"files-push.js","sourceRoot":"","sources":["../../../src/functions/files/files-push.ts"],"names":[],"mappings":";;;;AAAA,8DAA6B;AAC7B,0DAA0B;AAC1B,kEAAiC;AACjC,uCAAoD;AAEpD,+BAA4B;AAC5B,+BAA4B;AAC5B,iCAA6B;AAC7B,mCAAgD;AAChD,2DAA6D;AAC7D,qEAAkE;AAQ3D,MAAM,SAAS,GAAG,KAAK,EAAE,IAAsB,EAAE,MAAe,EAAiB,EAAE;IACxF,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAE5C,MAAM,SAAS,GAAG,IAAA,kCAAkB,EAAC,eAAe,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,uCAAkB,EAAC,eAAe,CAAC,CAAC;IAElE,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpD,IAAI,MAAM;YAAE,MAAM,CAAC,KAAK,CAAC,+GAA+G,EAAE,cAAc,CAAC,CAAC;;YACrJ,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAErD,IAAI,CAAC,IAAA,qBAAU,EAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,gCAAgC,aAAa,EAAE,CAAC;QAC5D,IAAI,MAAM;YAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;;YACzC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,iBAAM,EAAE,CAAC;IAEzB,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,OAAO,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACxF,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,OAAO,IAAI,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,OAAO,CAAC;IAEnD,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAClG,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAElG,MAAM,iBAAiB,GAAG,IAAA,gBAAO,EAAC,aAAa,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,IAAA,gBAAO,EAAC,aAAa,CAAC,CAAC;IAEjD,MAAM,SAAS,GAAG,IAAA,aAAI,EAAC,iBAAiB,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,IAAA,gBAAO,EAAC,SAAS,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAE5D,MAAM,uBAAuB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAChG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE7G,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAEjC,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAC;IAE5B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAEvD,MAAM,MAAM,GAAG,SAAS,CAAC,aAAa,IAAI,uBAAuB,CAAC;IAElE,MAAM,gBAAgB,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAElD,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,IAAI,gBAAgB,CAAC;IAEjD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,MAAe;QACvB,GAAG,EAAE,GAAG,MAAM,aAAa,SAAS,CAAC,KAAM,mBAAmB,SAAS,QAAQ;QAI/E,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,KAAM,EAAE;QACxD,IAAI,EAAE,IAAI;QACV,gBAAgB,EAAE,QAAQ;QAC1B,aAAa,EAAE,QAAQ;KACxB,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,IAAA,YAAI,EAAC,iCAAiC,CAAC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,uBAAuB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAA,eAAK,EAAC,MAAM,CAAC,CAAC;QAEpB,IAAI,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;YACrB,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,GAAG,IAAA,YAAI,EAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;YACpD,OAAO,CAAC,GAAG,CACT,wCAAwC,SAAS,CAAC,KAAM,IAAI,SAAS,IAAI,uBAAuB,CAAC,CAAC,CAAC,EAAE,CACtG,CAAC;YACF,IAAI,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CACT,wCAAwC,SAAS,CAAC,KAAM,IAAI,SAAS,IAAI,uBAAuB,CAAC,CAAC,CAAC,EAAE,CACtG,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAnGW,QAAA,SAAS,aAmGpB;AAEF,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,MAAc,EAAqB,EAAE;IACtE,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,IAAA,WAAI,EAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC"}
|
|
@@ -63,14 +63,11 @@ async function deployCommand(output, client, opts, deps = {}) {
|
|
|
63
63
|
}
|
|
64
64
|
let liveNote = '';
|
|
65
65
|
if (opts.wait !== false) {
|
|
66
|
+
const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
|
|
66
67
|
const swap = await wait(client, head.uid, head.v, {}, { timeoutMs: opts.swapTimeout });
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
if (swap.outcome === 'timeout') {
|
|
72
|
-
const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
|
|
73
|
-
output.error(`swap not confirmed after ${secs}s; deployed v=${swap.deployedV}, runner still serving v=${swap.liveV ?? 'unknown'}`, 'WORKFLOW_SWAP_TIMEOUT');
|
|
68
|
+
const failure = (0, wait_for_swap_js_1.describeSwapFailure)(swap, { workflowUid: head.uid, runnerLabel, timeoutMs });
|
|
69
|
+
if (failure) {
|
|
70
|
+
output.error(failure.message, failure.code, failure.extra);
|
|
74
71
|
return;
|
|
75
72
|
}
|
|
76
73
|
if (swap.outcome === 'skipped') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":";;AA2BA,oDAwBC;AA2BD,sCAyEC;AApJD,sDAAgE;AAChE,wDAK4B;AAC5B,4DAAwD;AACxD,8DAAmE;AACnE,0DAK6B;AAC7B,0DAAiG;AAS1F,KAAK,UAAU,oBAAoB,CACxC,MAAiB,EACjB,SAAiB,EACjB,IAGC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,2BAAgB,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,IAAI,oCAAkB,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,GAAG;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YACpC,OAAO,CACL,UAAU,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,GAAG,qBAAqB,MAAM,CAAC,MAAM,IAAI;gBAC5F,2EAA2E,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA2BM,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,MAAiB,EACjB,IAAmB,EACnB,OAAmB,EAAE;IAErB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,6BAAW,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,IAAI,gCAAqB,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,IAAI,wBAAa,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,+BAAkB,CAAC;IACnD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,IAAI,8BAAkB,CAAC;IAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAGjC,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,6BAAkB,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7G,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC;IAC/B,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IAEhG,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACxE,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzF,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAC5B,oBAAoB,QAAQ,CAAC,GAAG,eAAe,WAAW,+BAA+B,EACzF,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACpB,CAAC;IACF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,yBAAyB,CAAC,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,uBAAuB,CAAC,CAAC;QAC5F,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,IAAI,0CAAuB,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACvF,MAAM,OAAO,GAAG,IAAA,sCAAmB,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7F,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YAClF,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,CAC5B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1F,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
|
-
import type
|
|
3
|
+
import { type WorkflowStatusResponse } from '../types.js';
|
|
4
4
|
export interface StatusOptions {
|
|
5
5
|
id: string;
|
|
6
6
|
}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.statusCommand = statusCommand;
|
|
4
|
+
const types_js_1 = require("../types.js");
|
|
4
5
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
5
6
|
async function statusCommand(output, client, opts, deps = {}) {
|
|
6
7
|
const get = deps.getStatus ?? workflow_api_js_1.getStatus;
|
|
7
8
|
const status = await get(client, opts.id);
|
|
8
|
-
output.success(status, (s) =>
|
|
9
|
+
output.success(status, (s) => {
|
|
10
|
+
if ((0, types_js_1.isFailedStatus)(s)) {
|
|
11
|
+
return `${s.key}: ${s.status} — ${s.reason}`;
|
|
12
|
+
}
|
|
13
|
+
return `${s.key}: ${s.status}${s.error ? ` — ${s.error}` : ''}`;
|
|
14
|
+
});
|
|
9
15
|
}
|
|
10
16
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/status.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/status.ts"],"names":[],"mappings":";;AAaA,sCAeC;AA1BD,0CAA0E;AAC1E,wDAAmE;AAU5D,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,MAAiB,EACjB,IAAmB,EACnB,OAAmB,EAAE;IAErB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,2BAAgB,CAAC;IAC/C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;QAE3B,IAAI,IAAA,yBAAc,EAAC,CAAC,CAAC,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -52,14 +52,12 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
if (opts.wait !== false) {
|
|
55
|
+
const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
|
|
55
56
|
const swap = await wait(client, deployed.uid, deployed.v, {}, { timeoutMs: opts.swapTimeout });
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (swap.outcome === 'timeout') {
|
|
61
|
-
const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
|
|
62
|
-
output.error(`swap not confirmed after ${secs}s; deployed v=${swap.deployedV}, runner still serving v=${swap.liveV ?? 'unknown'}`, 'WORKFLOW_SWAP_TIMEOUT');
|
|
57
|
+
const runnerLabel = resolved.runner ? `${resolved.runner.runnerKey} (${runnerUid})` : runnerUid;
|
|
58
|
+
const failure = (0, wait_for_swap_js_1.describeSwapFailure)(swap, { workflowUid: deployed.uid, runnerLabel, timeoutMs });
|
|
59
|
+
if (failure) {
|
|
60
|
+
output.error(failure.message, failure.code, failure.extra);
|
|
63
61
|
return;
|
|
64
62
|
}
|
|
65
63
|
if (swap.outcome === 'skipped') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ function looks403(status, runError) {
|
|
|
32
32
|
const hay = `${runError?.message ?? ''} ${runError?.errorType ?? ''} ${runError?.detail ?? ''}`.toLowerCase();
|
|
33
33
|
return /\b403\b|forbidden|unauthor/.test(hay);
|
|
34
34
|
}
|
|
35
|
-
const FILES_AUTH_HINT = 'dcupl-files auth failed (403) — check auth.apiKey
|
|
35
|
+
const FILES_AUTH_HINT = 'dcupl-files auth failed (403) — check auth.apiKey: use {{variables.dcupl_api_key}} or the api-key id from the console, never the key value';
|
|
36
36
|
function filesAuthHint(template, status, runError, reachedRun) {
|
|
37
37
|
if (!looks403(status, runError))
|
|
38
38
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-failure.js","sourceRoot":"","sources":["../../../src/functions/workflow/run-failure.ts"],"names":[],"mappings":";;AAcA,8BAGC;AAGD,kCAGC;AAED,oCAEC;
|
|
1
|
+
{"version":3,"file":"run-failure.js","sourceRoot":"","sources":["../../../src/functions/workflow/run-failure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
|
-
import type { TemplateV3, WorkflowVariable, ValidationError, ValidationErrorType, ValidationResult, TestNodeRequest, TestNodeResult, WorkflowStatusResponse, WorkflowHistoryResponse, ExecutionHistoryEntry, GraphStateResponse } from '@dcupl/common-internal';
|
|
2
|
-
export type { TemplateV3, WorkflowVariable, ValidationError, ValidationErrorType, ValidationResult, TestNodeRequest, TestNodeResult,
|
|
1
|
+
import type { TemplateV3, WorkflowVariable, ValidationError, ValidationErrorType, ValidationResult, TestNodeRequest, TestNodeResult, WorkflowStatusResponse as RunnerWorkflowStatusResponse, WorkflowHistoryResponse, ExecutionHistoryEntry, GraphStateResponse } from '@dcupl/common-internal';
|
|
2
|
+
export type { TemplateV3, WorkflowVariable, ValidationError, ValidationErrorType, ValidationResult, TestNodeRequest, TestNodeResult, WorkflowHistoryResponse, ExecutionHistoryEntry, GraphStateResponse, };
|
|
3
|
+
export interface WorkflowStatusFailed {
|
|
4
|
+
key: string;
|
|
5
|
+
status: 'unreachable' | 'rejected';
|
|
6
|
+
reason: string;
|
|
7
|
+
runnerStatus?: number;
|
|
8
|
+
retryable?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export type WorkflowStatusResponse = RunnerWorkflowStatusResponse | WorkflowStatusFailed;
|
|
11
|
+
export declare function isFailedStatus(status: WorkflowStatusResponse): status is WorkflowStatusFailed;
|
|
3
12
|
export interface RunnerInfo {
|
|
4
13
|
uid: string;
|
|
5
14
|
runnerKey: string;
|
|
@@ -1,3 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isFailedStatus = isFailedStatus;
|
|
4
|
+
function isFailedStatus(status) {
|
|
5
|
+
return status.status === 'unreachable' || status.status === 'rejected';
|
|
6
|
+
}
|
|
3
7
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/functions/workflow/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/functions/workflow/types.ts"],"names":[],"mappings":";;AA+CA,wCAEC;AAFD,SAAgB,cAAc,CAAC,MAA8B;IAC3D,OAAO,MAAM,CAAC,MAAM,KAAK,aAAa,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC;AACzE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ApiClient } from '../helper/api-client.js';
|
|
2
|
-
import type
|
|
2
|
+
import { type WorkflowStatusResponse } from './types.js';
|
|
3
3
|
export declare const DEFAULT_SWAP_TIMEOUT_MS = 30000;
|
|
4
4
|
export type SwapResult = {
|
|
5
5
|
outcome: 'confirmed';
|
|
@@ -10,6 +10,16 @@ export type SwapResult = {
|
|
|
10
10
|
} | {
|
|
11
11
|
outcome: 'error';
|
|
12
12
|
message: string;
|
|
13
|
+
} | {
|
|
14
|
+
outcome: 'unreachable';
|
|
15
|
+
reason: string;
|
|
16
|
+
runnerStatus?: number;
|
|
17
|
+
} | {
|
|
18
|
+
outcome: 'rejected';
|
|
19
|
+
reason: string;
|
|
20
|
+
runnerStatus?: number;
|
|
21
|
+
retryable: boolean;
|
|
22
|
+
deployedV: string;
|
|
13
23
|
} | {
|
|
14
24
|
outcome: 'timeout';
|
|
15
25
|
deployedV: string;
|
|
@@ -25,3 +35,16 @@ export interface WaitForSwapOptions {
|
|
|
25
35
|
intervalMs?: number;
|
|
26
36
|
}
|
|
27
37
|
export declare function waitForSwap(client: ApiClient, id: string, deployedV: string, deps?: WaitForSwapDeps, opts?: WaitForSwapOptions): Promise<SwapResult>;
|
|
38
|
+
export interface SwapFailure {
|
|
39
|
+
message: string;
|
|
40
|
+
code: 'WORKFLOW_RUNNER_UNREACHABLE' | 'WORKFLOW_SWAP_REJECTED' | 'WORKFLOW_SWAP_ERROR' | 'WORKFLOW_SWAP_TIMEOUT';
|
|
41
|
+
extra: {
|
|
42
|
+
retryable: boolean;
|
|
43
|
+
runnerStatus?: number;
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
export declare function describeSwapFailure(swap: SwapResult, ctx: {
|
|
47
|
+
workflowUid: string;
|
|
48
|
+
runnerLabel: string;
|
|
49
|
+
timeoutMs: number;
|
|
50
|
+
}): SwapFailure | null;
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DEFAULT_SWAP_TIMEOUT_MS = void 0;
|
|
4
4
|
exports.waitForSwap = waitForSwap;
|
|
5
|
+
exports.describeSwapFailure = describeSwapFailure;
|
|
6
|
+
const types_js_1 = require("./types.js");
|
|
5
7
|
const workflow_api_js_1 = require("./workflow-api.js");
|
|
6
8
|
exports.DEFAULT_SWAP_TIMEOUT_MS = 30_000;
|
|
7
9
|
async function waitForSwap(client, id, deployedV, deps = {}, opts = {}) {
|
|
@@ -14,6 +16,17 @@ async function waitForSwap(client, id, deployedV, deps = {}, opts = {}) {
|
|
|
14
16
|
let liveV;
|
|
15
17
|
for (;;) {
|
|
16
18
|
const status = await getStatus(client, id);
|
|
19
|
+
if ((0, types_js_1.isFailedStatus)(status)) {
|
|
20
|
+
if (status.status === 'unreachable') {
|
|
21
|
+
return { outcome: 'unreachable', reason: status.reason, runnerStatus: status.runnerStatus };
|
|
22
|
+
}
|
|
23
|
+
const retryable = status.retryable === true;
|
|
24
|
+
if (!retryable || now() - start >= timeoutMs) {
|
|
25
|
+
return { outcome: 'rejected', reason: status.reason, runnerStatus: status.runnerStatus, retryable, deployedV };
|
|
26
|
+
}
|
|
27
|
+
await sleep(intervalMs);
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
17
30
|
if (status.status === 'error') {
|
|
18
31
|
return { outcome: 'error', message: status.error ?? 'runner reported an error' };
|
|
19
32
|
}
|
|
@@ -30,4 +43,49 @@ async function waitForSwap(client, id, deployedV, deps = {}, opts = {}) {
|
|
|
30
43
|
await sleep(intervalMs);
|
|
31
44
|
}
|
|
32
45
|
}
|
|
46
|
+
function describeSwapFailure(swap, ctx) {
|
|
47
|
+
const secs = ctx.timeoutMs / 1000;
|
|
48
|
+
const check = `Check with 'dcupl workflow status ${ctx.workflowUid}'`;
|
|
49
|
+
switch (swap.outcome) {
|
|
50
|
+
case 'unreachable':
|
|
51
|
+
return {
|
|
52
|
+
code: 'WORKFLOW_RUNNER_UNREACHABLE',
|
|
53
|
+
message: `runner ${ctx.runnerLabel} did not answer during swap (${swap.reason}): it is down or unreachable, ` +
|
|
54
|
+
`not rejecting the workflow. The deployment is stored and goes live once the runner is back — ` +
|
|
55
|
+
`${check} or 'dcupl workflow runners list', then retry.`,
|
|
56
|
+
extra: { retryable: true, runnerStatus: swap.runnerStatus },
|
|
57
|
+
};
|
|
58
|
+
case 'rejected':
|
|
59
|
+
if (swap.retryable) {
|
|
60
|
+
return {
|
|
61
|
+
code: 'WORKFLOW_SWAP_REJECTED',
|
|
62
|
+
message: `runner ${ctx.runnerLabel} did not load v=${swap.deployedV} within ${secs}s; last answer: ${swap.reason}. ` +
|
|
63
|
+
`The runner is up but its config reload after the deploy did not pick the workflow up — ` +
|
|
64
|
+
`retrying the deploy triggers another reload; if that fails too, check the runner's logs.`,
|
|
65
|
+
extra: { retryable: true, runnerStatus: swap.runnerStatus },
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
code: 'WORKFLOW_SWAP_REJECTED',
|
|
70
|
+
message: `runner ${ctx.runnerLabel} refused console-api's status request (${swap.reason}). A retry will not help: ` +
|
|
71
|
+
`this is usually the runner key console-api holds for the runner not matching the runner's own — ` +
|
|
72
|
+
`check the runner record, then ${check}.`,
|
|
73
|
+
extra: { retryable: false, runnerStatus: swap.runnerStatus },
|
|
74
|
+
};
|
|
75
|
+
case 'error':
|
|
76
|
+
return {
|
|
77
|
+
code: 'WORKFLOW_SWAP_ERROR',
|
|
78
|
+
message: `runner reported an error during swap: ${swap.message}`,
|
|
79
|
+
extra: { retryable: false },
|
|
80
|
+
};
|
|
81
|
+
case 'timeout':
|
|
82
|
+
return {
|
|
83
|
+
code: 'WORKFLOW_SWAP_TIMEOUT',
|
|
84
|
+
message: `swap not confirmed after ${secs}s; deployed v=${swap.deployedV}, runner still serving v=${swap.liveV ?? 'unknown'}`,
|
|
85
|
+
extra: { retryable: true },
|
|
86
|
+
};
|
|
87
|
+
default:
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
33
91
|
//# sourceMappingURL=wait-for-swap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-for-swap.js","sourceRoot":"","sources":["../../../src/functions/workflow/wait-for-swap.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"wait-for-swap.js","sourceRoot":"","sources":["../../../src/functions/workflow/wait-for-swap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcupl/cli",
|
|
3
|
-
"version": "1.4.0-beta.
|
|
3
|
+
"version": "1.4.0-beta.9",
|
|
4
4
|
"description": "The official dcupl CLI",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"vitest": "^4.1.11"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@dcupl/common": "2.0.0-beta.
|
|
63
|
-
"@dcupl/common-internal": "2.0.0-beta.
|
|
64
|
-
"@dcupl/core": "2.0.0-beta.
|
|
65
|
-
"@dcupl/loader": "2.0.0-beta.
|
|
62
|
+
"@dcupl/common": "2.0.0-beta.23",
|
|
63
|
+
"@dcupl/common-internal": "2.0.0-beta.23",
|
|
64
|
+
"@dcupl/core": "2.0.0-beta.23",
|
|
65
|
+
"@dcupl/loader": "2.0.0-beta.23",
|
|
66
66
|
"@nestjs/common": "^11.1.27",
|
|
67
67
|
"@nestjs/core": "^11.1.27",
|
|
68
68
|
"@nestjs/platform-express": "^11.1.27",
|