@dcupl/cli 1.4.0-beta.5 → 1.4.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +20 -20
- package/dist/cli.js +650 -167
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/app-id.js +34 -2
- package/dist/functions/app/app-id.js.map +1 -1
- package/dist/functions/app/client/daemon-client.js.map +1 -1
- package/dist/functions/app/commands/cdn-host.js +11 -1
- package/dist/functions/app/commands/cdn-host.js.map +1 -1
- package/dist/functions/app/commands/create.js +50 -34
- package/dist/functions/app/commands/create.js.map +1 -1
- package/dist/functions/app/commands/destroy.js +10 -4
- package/dist/functions/app/commands/destroy.js.map +1 -1
- package/dist/functions/app/commands/detect-serve.js +17 -6
- package/dist/functions/app/commands/detect-serve.js.map +1 -1
- package/dist/functions/app/commands/fn/_fn-helpers.js +11 -3
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.js +4 -1
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.js.map +1 -1
- package/dist/functions/app/commands/list.js +6 -2
- package/dist/functions/app/commands/list.js.map +1 -1
- package/dist/functions/app/commands/loader-hash.js.map +1 -1
- package/dist/functions/app/commands/loaders/process-flags.js +4 -1
- package/dist/functions/app/commands/loaders/process-flags.js.map +1 -1
- package/dist/functions/app/commands/loaders/process.js +3 -1
- package/dist/functions/app/commands/loaders/process.js.map +1 -1
- package/dist/functions/app/commands/models/get.js.map +1 -1
- package/dist/functions/app/commands/models/keys.js.map +1 -1
- package/dist/functions/app/commands/models/remove.js.map +1 -1
- package/dist/functions/app/commands/models/set.js +3 -1
- package/dist/functions/app/commands/models/set.js.map +1 -1
- package/dist/functions/app/commands/query/execute.js +5 -2
- package/dist/functions/app/commands/query/execute.js.map +1 -1
- package/dist/functions/app/commands/query/one.js +3 -1
- package/dist/functions/app/commands/query/one.js.map +1 -1
- package/dist/functions/app/commands/render.js +9 -3
- package/dist/functions/app/commands/render.js.map +1 -1
- package/dist/functions/app/commands/resolve-app.js.map +1 -1
- package/dist/functions/app/commands/resolve-source.js +5 -4
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- package/dist/functions/app/commands/validate-report.d.ts +31 -0
- package/dist/functions/app/commands/validate-report.js +20 -1
- package/dist/functions/app/commands/validate-report.js.map +1 -1
- package/dist/functions/app/commands/validate.js +30 -10
- package/dist/functions/app/commands/validate.js.map +1 -1
- package/dist/functions/app/daemon/app-server.module.js +6 -1
- package/dist/functions/app/daemon/app-server.module.js.map +1 -1
- package/dist/functions/app/daemon/controllers/data.controller.js +17 -6
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/lifecycle.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/query.controller.js +4 -1
- package/dist/functions/app/daemon/controllers/query.controller.js.map +1 -1
- package/dist/functions/app/daemon/daemon-args.js +2 -2
- package/dist/functions/app/daemon/daemon-args.js.map +1 -1
- package/dist/functions/app/daemon/main.js +14 -7
- package/dist/functions/app/daemon/main.js.map +1 -1
- package/dist/functions/app/daemon/services/attribute-validation.js +6 -3
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -1
- package/dist/functions/app/daemon/services/dcupl-host.service.js +10 -14
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.js +8 -4
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/init-options.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +2 -1
- package/dist/functions/app/daemon/services/loaders.service.js +5 -5
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/e2e/port-lock.js +23 -9
- package/dist/functions/app/e2e/port-lock.js.map +1 -1
- package/dist/functions/app/registry/registry.js +11 -10
- package/dist/functions/app/registry/registry.js.map +1 -1
- package/dist/functions/app/registry/serve-registry.js +13 -9
- package/dist/functions/app/registry/serve-registry.js.map +1 -1
- package/dist/functions/config/commands/set.js +2 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.js +1 -3
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/config/prompts.js +1 -3
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +7 -2
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-key.js +1 -4
- package/dist/functions/generate/model-from-data/infer-key.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js +1 -2
- package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.js +9 -2
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/output.js +3 -1
- package/dist/functions/helper/output.js.map +1 -1
- package/dist/functions/helper/parse-fail.js +4 -1
- package/dist/functions/helper/parse-fail.js.map +1 -1
- package/dist/functions/schemas/command.js.map +1 -1
- package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
- package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
- package/dist/functions/schemas/examples/ModelDefinition.example.json +8 -1
- package/dist/functions/schemas/examples/ScriptStepConfig.example.json +3 -1
- package/dist/functions/schemas/examples/TemplateV3.example.json +5 -1
- package/dist/functions/schemas/extract.js +1 -1
- package/dist/functions/schemas/extract.js.map +1 -1
- package/dist/functions/schemas/format.js +4 -4
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.js +83 -31
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.js +1 -2
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/schemas/validate.js.map +1 -1
- package/dist/functions/serve/commands/list.js +2 -1
- package/dist/functions/serve/commands/list.js.map +1 -1
- package/dist/functions/serve/commands/stop.js +10 -5
- package/dist/functions/serve/commands/stop.js.map +1 -1
- package/dist/functions/serve/main.js +4 -1
- package/dist/functions/serve/main.js.map +1 -1
- package/dist/functions/serve/serve-self-register.js +2 -1
- package/dist/functions/serve/serve-self-register.js.map +1 -1
- package/dist/functions/version/command.js +1 -6
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +1 -0
- package/dist/functions/workflow/commands/deploy.js +14 -6
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/get.js.map +1 -1
- package/dist/functions/workflow/commands/history.js.map +1 -1
- package/dist/functions/workflow/commands/run.js +25 -9
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/runners-get.js.map +1 -1
- package/dist/functions/workflow/commands/status.js.map +1 -1
- package/dist/functions/workflow/commands/template.js.map +1 -1
- package/dist/functions/workflow/commands/test.js +10 -3
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/commands/trace.js.map +1 -1
- package/dist/functions/workflow/commands/undeploy.js +3 -1
- package/dist/functions/workflow/commands/undeploy.js.map +1 -1
- package/dist/functions/workflow/commands/validate.d.ts +2 -0
- package/dist/functions/workflow/commands/validate.js +8 -1
- package/dist/functions/workflow/commands/validate.js.map +1 -1
- package/dist/functions/workflow/resolve-runner.d.ts +17 -0
- package/dist/functions/workflow/resolve-runner.js +41 -0
- package/dist/functions/workflow/resolve-runner.js.map +1 -0
- package/dist/functions/workflow/runner-health.js.map +1 -1
- package/dist/functions/workflow/script-lint.js +32 -7
- package/dist/functions/workflow/script-lint.js.map +1 -1
- package/dist/functions/workflow/trace.js.map +1 -1
- package/dist/functions/workflow/workflow-api.js +3 -1
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/package.json +14 -9
|
@@ -33,7 +33,8 @@ async function serveListCommand(output, deps = {}) {
|
|
|
33
33
|
const daemons = listDaemons();
|
|
34
34
|
const rows = listServes().map((s) => ({
|
|
35
35
|
...s,
|
|
36
|
-
daemonCount: daemons.filter((d) => d.serveKey?.port === s.port && d.serveKey?.cwd === s.cwd && isAlive(d.pid))
|
|
36
|
+
daemonCount: daemons.filter((d) => d.serveKey?.port === s.port && d.serveKey?.cwd === s.cwd && isAlive(d.pid))
|
|
37
|
+
.length,
|
|
37
38
|
}));
|
|
38
39
|
if (output.isJson()) {
|
|
39
40
|
output.success(rows);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/functions/serve/commands/list.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/functions/serve/commands/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,14 @@ async function serveStopCommand(output, deps) {
|
|
|
8
8
|
const removeEntry = deps.removeServeEntry ?? serve_registry_js_1.removeServeEntry;
|
|
9
9
|
const listDaemons = deps.listDaemonEntries ?? registry_js_1.listEntries;
|
|
10
10
|
const isAlive = deps.isPidAlive ?? registry_js_1.isPidAlive;
|
|
11
|
-
const kill = deps.kill ??
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
const kill = deps.kill ??
|
|
12
|
+
((pid, sig = 'SIGTERM') => {
|
|
13
|
+
try {
|
|
14
|
+
process.kill(pid, sig);
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
}
|
|
18
|
+
});
|
|
15
19
|
const entry = readEntry(deps.port);
|
|
16
20
|
if (!entry) {
|
|
17
21
|
output.error(`No serve registered on port ${deps.port}`, 'SERVE_NOT_FOUND');
|
|
@@ -26,7 +30,8 @@ async function serveStopCommand(output, deps) {
|
|
|
26
30
|
try {
|
|
27
31
|
kill(entry.pid, 'SIGTERM');
|
|
28
32
|
}
|
|
29
|
-
catch {
|
|
33
|
+
catch {
|
|
34
|
+
}
|
|
30
35
|
}
|
|
31
36
|
removeEntry(entry.port);
|
|
32
37
|
output.success(output.isJson() ? { stopped: entry.port } : `Stopped serve on port ${entry.port}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../src/functions/serve/commands/stop.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../src/functions/serve/commands/stop.ts"],"names":[],"mappings":";;AAiBA,4CAsCC;AArDD,4EAG8C;AAC9C,gEAAoH;AAW7G,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,IAAmB;IACxE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,IAAI,kCAAqB,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,IAAI,oCAAuB,CAAC;IACrE,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,IAAI,yBAAkB,CAAC;IACjE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC;IACrD,MAAM,IAAI,GACR,IAAI,CAAC,IAAI;QACT,CAAC,CAAC,GAAW,EAAE,MAAsB,SAAS,EAAQ,EAAE;YACtD,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;QACH,CAAC,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,IAAI,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC,MAAM,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAC1F,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,mCAAmC,IAAI,gCAAgC,CAAC,CAAC;IACzG,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;IACD,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,yBAAyB,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;AACtG,CAAC"}
|
|
@@ -80,7 +80,10 @@ async function bootstrap(argv) {
|
|
|
80
80
|
loaderPath: loaderAbs,
|
|
81
81
|
projectId: projectId.value,
|
|
82
82
|
});
|
|
83
|
-
const onExit = () => {
|
|
83
|
+
const onExit = () => {
|
|
84
|
+
cleanup();
|
|
85
|
+
process.exit(0);
|
|
86
|
+
};
|
|
84
87
|
process.on('SIGTERM', onExit);
|
|
85
88
|
process.on('SIGINT', onExit);
|
|
86
89
|
process.on('beforeExit', () => cleanup());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":";;AA0CA,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-self-register.js","sourceRoot":"","sources":["../../../src/functions/serve/serve-self-register.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"serve-self-register.js","sourceRoot":"","sources":["../../../src/functions/serve/serve-self-register.ts"],"names":[],"mappings":";;AAiBA,sCA4BC;AA7CD,yEAAkH;AAClH,mEAAgE;AAgBhE,SAAgB,aAAa,CAAC,IAA0B;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,8CAA0B,CAAC;IAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjF,IAAA,mCAAe,EACb;QACE,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW;QACX,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU;KACX,EACD,QAAQ,CACT,CAAC;IAEF,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,OAAO,GAAS,EAAE;QAChB,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,CAAC;YACH,IAAA,oCAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -11,12 +11,7 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
11
11
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
12
12
|
const CLI_PACKAGE = '@dcupl/cli';
|
|
13
13
|
const REGISTRY_TIMEOUT_MS = 1500;
|
|
14
|
-
exports.DCUPL_PACKAGES = [
|
|
15
|
-
'@dcupl/core',
|
|
16
|
-
'@dcupl/common',
|
|
17
|
-
'@dcupl/common-internal',
|
|
18
|
-
'@dcupl/loader',
|
|
19
|
-
];
|
|
14
|
+
exports.DCUPL_PACKAGES = ['@dcupl/core', '@dcupl/common', '@dcupl/common-internal', '@dcupl/loader'];
|
|
20
15
|
function repoRoot() {
|
|
21
16
|
return path.join(__dirname, '../../..');
|
|
22
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/functions/version/command.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/functions/version/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,5 +32,6 @@ export interface DeployDeps {
|
|
|
32
32
|
}) => Promise<SwapResult>;
|
|
33
33
|
getRunner?: (client: ApiClient, uid: string) => Promise<RunnerInfo>;
|
|
34
34
|
probeHealth?: (url: string) => Promise<RunnerHealth>;
|
|
35
|
+
listRunners?: (client: ApiClient) => Promise<RunnerInfo[]>;
|
|
35
36
|
}
|
|
36
37
|
export declare function deployCommand(output: Output, client: ApiClient, opts: DeployOptions, deps?: DeployDeps): Promise<void>;
|
|
@@ -4,6 +4,7 @@ exports.checkRunnerReachable = checkRunnerReachable;
|
|
|
4
4
|
exports.deployCommand = deployCommand;
|
|
5
5
|
const template_io_js_1 = require("../template-io.js");
|
|
6
6
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
7
|
+
const resolve_runner_js_1 = require("../resolve-runner.js");
|
|
7
8
|
const confirm_js_1 = require("../../files/helper/confirm.js");
|
|
8
9
|
const wait_for_swap_js_1 = require("../wait-for-swap.js");
|
|
9
10
|
const runner_health_js_1 = require("../runner-health.js");
|
|
@@ -16,8 +17,8 @@ async function checkRunnerReachable(client, runnerUid, deps) {
|
|
|
16
17
|
return null;
|
|
17
18
|
const health = await probe(runner.url);
|
|
18
19
|
if (health.status === 'unreachable') {
|
|
19
|
-
return `Runner ${runnerUid} (${runner.runnerKey ?? runner.url}) is unreachable: ${health.reason}. `
|
|
20
|
-
|
|
20
|
+
return (`Runner ${runnerUid} (${runner.runnerKey ?? runner.url}) is unreachable: ${health.reason}. ` +
|
|
21
|
+
`Check the runner or pick a healthy one via 'dcupl workflow runners list'.`);
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
24
|
catch {
|
|
@@ -31,23 +32,30 @@ async function deployCommand(output, client, opts, deps = {}) {
|
|
|
31
32
|
const confirm = deps.confirm ?? confirm_js_1.confirmDestructive;
|
|
32
33
|
const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
|
|
33
34
|
const template = load(opts.file);
|
|
34
|
-
const
|
|
35
|
+
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => (deps.listRunners ?? workflow_api_js_1.listRunners)(client), opts.runner);
|
|
36
|
+
if (!resolved.ok) {
|
|
37
|
+
output.error(resolved.message, resolved.code);
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const runnerUid = resolved.uid;
|
|
41
|
+
const runnerLabel = resolved.runner ? `${resolved.runner.runnerKey} (${runnerUid})` : runnerUid;
|
|
42
|
+
const unreachable = await checkRunnerReachable(client, runnerUid, deps);
|
|
35
43
|
if (unreachable) {
|
|
36
44
|
output.error(unreachable, 'RUNNER_UNREACHABLE');
|
|
37
45
|
return;
|
|
38
46
|
}
|
|
39
|
-
const result = await validate(client, { runnerUid
|
|
47
|
+
const result = await validate(client, { runnerUid, template });
|
|
40
48
|
if (!result.valid) {
|
|
41
49
|
const summary = (result.errors ?? []).map((e) => `✗ ${e.type}: ${e.message}`).join('\n');
|
|
42
50
|
output.error(summary, 'WORKFLOW_INVALID');
|
|
43
51
|
return;
|
|
44
52
|
}
|
|
45
|
-
const decision = await confirm(`Deploy workflow "${template.key}" to runner ${
|
|
53
|
+
const decision = await confirm(`Deploy workflow "${template.key}" to runner ${runnerLabel}? This goes live immediately.`, { yes: !!opts.yes });
|
|
46
54
|
if (decision !== 'execute') {
|
|
47
55
|
output.error('Deploy aborted (not confirmed).', 'WORKFLOW_DEPLOY_ABORTED');
|
|
48
56
|
return;
|
|
49
57
|
}
|
|
50
|
-
const deployed = await doDeploy(client, [{ runnerUid
|
|
58
|
+
const deployed = await doDeploy(client, [{ runnerUid, template }]);
|
|
51
59
|
const head = deployed[0];
|
|
52
60
|
if (!head) {
|
|
53
61
|
output.error('Deploy returned no workflow; check the runner uid.', 'DEPLOY_EMPTY_RESPONSE');
|
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/get.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/get.ts"],"names":[],"mappings":";;AAaA,gCASC;AAnBD,wDAAuE;AAUhE,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,MAAiB,EACjB,IAAgB,EAChB,OAAgB,EAAE;IAElB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,6BAAkB,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/history.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/history.ts"],"names":[],"mappings":";;AAaA,wCA0BC;AApCD,wDAAqE;AAU9D,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,MAAiB,EACjB,IAAoB,EACpB,OAAoB,EAAE;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAG3C,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;QACjE,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE;KAC9B,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;QACjD,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -7,6 +7,7 @@ const comment_json_1 = require("comment-json");
|
|
|
7
7
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
8
8
|
const trace_js_1 = require("../trace.js");
|
|
9
9
|
const run_failure_js_1 = require("../run-failure.js");
|
|
10
|
+
const resolve_runner_js_1 = require("../resolve-runner.js");
|
|
10
11
|
function findDeployed(workflows, key, runnerUid, projectId) {
|
|
11
12
|
const onRunner = workflows.filter((w) => w.runnerUid === runnerUid);
|
|
12
13
|
return onRunner.find((w) => w.key === key) ?? onRunner.find((w) => w.key === `${projectId}-${key}`);
|
|
@@ -23,11 +24,12 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
23
24
|
}
|
|
24
25
|
let payload;
|
|
25
26
|
try {
|
|
26
|
-
payload =
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
payload =
|
|
28
|
+
opts.body !== undefined
|
|
29
|
+
? (0, comment_json_1.parse)(opts.body)
|
|
30
|
+
: opts.input
|
|
31
|
+
? (0, comment_json_1.parse)(fs.readFileSync(opts.input, 'utf-8'))
|
|
32
|
+
: undefined;
|
|
31
33
|
}
|
|
32
34
|
catch (err) {
|
|
33
35
|
const source = opts.body !== undefined ? '--body is not valid JSON' : `--input could not be read as JSON (${opts.input})`;
|
|
@@ -38,9 +40,24 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
38
40
|
let reachedRun = false;
|
|
39
41
|
try {
|
|
40
42
|
const workflows = await listWorkflows(client);
|
|
41
|
-
|
|
43
|
+
let runnerUid = opts.runner;
|
|
44
|
+
let runner;
|
|
45
|
+
let runnerLabel = opts.runner;
|
|
46
|
+
let deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
|
|
47
|
+
if (!deployed || !opts.node) {
|
|
48
|
+
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
|
|
49
|
+
if (!resolved.ok) {
|
|
50
|
+
output.error(resolved.message, resolved.code);
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
runnerUid = resolved.uid;
|
|
54
|
+
runner = resolved.runner;
|
|
55
|
+
if (runner)
|
|
56
|
+
runnerLabel = `${runner.runnerKey} (${runnerUid})`;
|
|
57
|
+
deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
|
|
58
|
+
}
|
|
42
59
|
if (!deployed) {
|
|
43
|
-
output.error(`Workflow "${opts.key}" is not deployed on runner ${
|
|
60
|
+
output.error(`Workflow "${opts.key}" is not deployed on runner ${runnerLabel}. \`dcupl workflow list\` shows what is deployed where.`, 'WORKFLOW_NOT_FOUND');
|
|
44
61
|
return;
|
|
45
62
|
}
|
|
46
63
|
template = deployed.template ?? (await getWorkflow(client, deployed.uid)).template;
|
|
@@ -50,8 +67,6 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
50
67
|
raw = await doTestNode(client, deployed.uid, opts.node, { inputData: payload ?? { main: [] } });
|
|
51
68
|
}
|
|
52
69
|
else {
|
|
53
|
-
const runners = await listRunners(client);
|
|
54
|
-
const runner = runners.find((r) => r.uid === opts.runner);
|
|
55
70
|
if (!runner) {
|
|
56
71
|
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
57
72
|
return;
|
|
@@ -73,6 +88,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
73
88
|
});
|
|
74
89
|
}
|
|
75
90
|
const trace = (0, trace_js_1.toTrace)(raw);
|
|
91
|
+
trace.workflowKey ??= deployed.key;
|
|
76
92
|
output.success(trace, () => (0, trace_js_1.renderTrace)(trace));
|
|
77
93
|
if ((0, trace_js_1.hasErrors)(trace)) {
|
|
78
94
|
output.error('Workflow run reported node errors (see trace above).', 'WORKFLOW_RUN_ERROR');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runners-get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/runners-get.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"runners-get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/runners-get.ts"],"names":[],"mappings":";;AAaA,4CASC;AAnBD,wDAAmE;AAU5D,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,MAAiB,EACjB,IAAsB,EACtB,OAAsB,EAAE;IAExB,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,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -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,sCASC;AAnBD,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,CAAC,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,CAAC;AAC1F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/template.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/template.ts"],"names":[],"mappings":";;AAYA,0CASC;AAnBD,wDAAuF;AAUhF,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,MAAiB,EACjB,IAAqB,EACrB,OAAqB,EAAE;IAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,IAAI,qCAA0B,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -11,6 +11,7 @@ const trace_js_1 = require("../trace.js");
|
|
|
11
11
|
const run_failure_js_1 = require("../run-failure.js");
|
|
12
12
|
const wait_for_swap_js_1 = require("../wait-for-swap.js");
|
|
13
13
|
const deploy_js_1 = require("./deploy.js");
|
|
14
|
+
const resolve_runner_js_1 = require("../resolve-runner.js");
|
|
14
15
|
function readJson(file) {
|
|
15
16
|
if (!file)
|
|
16
17
|
return undefined;
|
|
@@ -31,14 +32,20 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
31
32
|
output.error(summary, 'WORKFLOW_INVALID');
|
|
32
33
|
return;
|
|
33
34
|
}
|
|
34
|
-
const
|
|
35
|
+
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
|
|
36
|
+
if (!resolved.ok) {
|
|
37
|
+
output.error(resolved.message, resolved.code);
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const runnerUid = resolved.uid;
|
|
41
|
+
const unreachable = await (0, deploy_js_1.checkRunnerReachable)(client, runnerUid, deps);
|
|
35
42
|
if (unreachable) {
|
|
36
43
|
output.error(unreachable, 'RUNNER_UNREACHABLE');
|
|
37
44
|
return;
|
|
38
45
|
}
|
|
39
46
|
let reachedRun = false;
|
|
40
47
|
try {
|
|
41
|
-
const deployedList = await doDeploy(client, [{ runnerUid
|
|
48
|
+
const deployedList = await doDeploy(client, [{ runnerUid, template }]);
|
|
42
49
|
const deployed = deployedList[0];
|
|
43
50
|
if (!deployed) {
|
|
44
51
|
output.error('Deploy returned no workflow; check the runner uid.', 'DEPLOY_EMPTY_RESPONSE');
|
|
@@ -69,7 +76,7 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
69
76
|
}
|
|
70
77
|
else {
|
|
71
78
|
const runners = await listRunners(client);
|
|
72
|
-
const runner = runners.find((r) => r.uid ===
|
|
79
|
+
const runner = runners.find((r) => r.uid === runnerUid);
|
|
73
80
|
if (!runner) {
|
|
74
81
|
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
75
82
|
return;
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/trace.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/trace.ts"],"names":[],"mappings":";;AAgBA,oCA0DC;AAvED,wDAA4G;AAarG,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,MAAiB,EACjB,IAAkB,EAClB,OAAkB,EAAE;IAEpB,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,IAAI,+BAAoB,CAAC;IAGvD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,kEAAkE,EAAE,oBAAoB,CAAC,CAAC;QACvG,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CACV,gGAAgG,EAChG,oBAAoB,CACrB,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,yDAAyD,EAAE,eAAe,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC;QAG3B,MAAM,CAAC,IAAI,CACT,0BAA0B,KAAK,KAAK,MAAM,CAAC,MAAM,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,GAAG,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAGhD,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM;QACN,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;KACrB,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,MAAM,mBAAmB,CAAC,CAAC;QACzF,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -6,7 +6,9 @@ const confirm_js_1 = require("../../files/helper/confirm.js");
|
|
|
6
6
|
async function undeployCommand(output, client, opts, deps = {}) {
|
|
7
7
|
const doUndeploy = deps.undeploy ?? workflow_api_js_1.undeploy;
|
|
8
8
|
const confirm = deps.confirm ?? confirm_js_1.confirmDestructive;
|
|
9
|
-
const decision = await confirm(`Undeploy workflow ${opts.workflowId}? It stops running immediately.`, {
|
|
9
|
+
const decision = await confirm(`Undeploy workflow ${opts.workflowId}? It stops running immediately.`, {
|
|
10
|
+
yes: !!opts.yes,
|
|
11
|
+
});
|
|
10
12
|
if (decision !== 'execute') {
|
|
11
13
|
output.error('Undeploy aborted (not confirmed).', 'WORKFLOW_UNDEPLOY_ABORTED');
|
|
12
14
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undeploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/undeploy.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"undeploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/undeploy.ts"],"names":[],"mappings":";;AAeA,0CAkBC;AA/BD,wDAAiE;AACjE,8DAAmE;AAY5D,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,MAAiB,EACjB,IAAqB,EACrB,OAAqB,EAAE;IAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,IAAI,0BAAe,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,+BAAkB,CAAC;IAEnD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,qBAAqB,IAAI,CAAC,UAAU,iCAAiC,EAAE;QACpG,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG;KAChB,CAAC,CAAC;IACH,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,2BAA2B,CAAC,CAAC;QAC/E,OAAO;IACT,CAAC;IACD,MAAM,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;AAC3F,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
3
|
import type { TemplateV3, ValidationResult } from '../types.js';
|
|
4
|
+
import type { RunnerInfo } from '../types.js';
|
|
4
5
|
export interface ValidateOptions {
|
|
5
6
|
file: string;
|
|
6
7
|
runner?: string;
|
|
@@ -14,5 +15,6 @@ export interface ValidateDeps {
|
|
|
14
15
|
runnerUid: string;
|
|
15
16
|
template: TemplateV3;
|
|
16
17
|
}) => Promise<ValidationResult>;
|
|
18
|
+
listRunners?: (client: ApiClient) => Promise<RunnerInfo[]>;
|
|
17
19
|
}
|
|
18
20
|
export declare function validateCommand(output: Output, opts: ValidateOptions, deps?: ValidateDeps): Promise<void>;
|
|
@@ -4,6 +4,7 @@ exports.validateCommand = validateCommand;
|
|
|
4
4
|
const template_io_js_1 = require("../template-io.js");
|
|
5
5
|
const validate_js_1 = require("../validate.js");
|
|
6
6
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
7
|
+
const resolve_runner_js_1 = require("../resolve-runner.js");
|
|
7
8
|
function merge(a, b) {
|
|
8
9
|
return {
|
|
9
10
|
valid: a.valid && b.valid,
|
|
@@ -18,7 +19,13 @@ async function validateCommand(output, opts, deps = {}) {
|
|
|
18
19
|
const template = load(opts.file);
|
|
19
20
|
let result = local(template);
|
|
20
21
|
if (!opts.localOnly && opts.runner && deps.client) {
|
|
21
|
-
const
|
|
22
|
+
const apiClient = deps.client;
|
|
23
|
+
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => (deps.listRunners ?? workflow_api_js_1.listRunners)(apiClient), opts.runner);
|
|
24
|
+
if (!resolved.ok) {
|
|
25
|
+
output.error(resolved.message, resolved.code);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const remote = await remoteFn(apiClient, { runnerUid: resolved.uid, template });
|
|
22
29
|
result = merge(result, {
|
|
23
30
|
valid: remote.valid,
|
|
24
31
|
errors: remote.errors ?? [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/validate.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { RunnerInfo } from './types.js';
|
|
2
|
+
export type RunnerResolution = {
|
|
3
|
+
ok: true;
|
|
4
|
+
runner: RunnerInfo;
|
|
5
|
+
} | {
|
|
6
|
+
ok: false;
|
|
7
|
+
code: 'RUNNER_NOT_FOUND' | 'RUNNER_AMBIGUOUS';
|
|
8
|
+
message: string;
|
|
9
|
+
};
|
|
10
|
+
export declare function resolveRunner(runners: RunnerInfo[], ref: string): RunnerResolution;
|
|
11
|
+
export declare function resolveRunnerRef(listRunners: () => Promise<RunnerInfo[]>, ref: string): Promise<{
|
|
12
|
+
ok: true;
|
|
13
|
+
uid: string;
|
|
14
|
+
runner?: RunnerInfo;
|
|
15
|
+
} | Extract<RunnerResolution, {
|
|
16
|
+
ok: false;
|
|
17
|
+
}>>;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveRunner = resolveRunner;
|
|
4
|
+
exports.resolveRunnerRef = resolveRunnerRef;
|
|
5
|
+
function resolveRunner(runners, ref) {
|
|
6
|
+
const byUid = runners.find((r) => r.uid === ref);
|
|
7
|
+
if (byUid)
|
|
8
|
+
return { ok: true, runner: byUid };
|
|
9
|
+
const byKey = runners.filter((r) => r.runnerKey === ref);
|
|
10
|
+
if (byKey.length === 1)
|
|
11
|
+
return { ok: true, runner: byKey[0] };
|
|
12
|
+
if (byKey.length > 1) {
|
|
13
|
+
return {
|
|
14
|
+
ok: false,
|
|
15
|
+
code: 'RUNNER_AMBIGUOUS',
|
|
16
|
+
message: `Runner key "${ref}" matches ${byKey.length} runners (${byKey
|
|
17
|
+
.map((r) => r.uid)
|
|
18
|
+
.join(', ')}); pass the uid instead.`,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
const known = runners.map((r) => `${r.runnerKey} (${r.uid})`).join(', ');
|
|
22
|
+
return {
|
|
23
|
+
ok: false,
|
|
24
|
+
code: 'RUNNER_NOT_FOUND',
|
|
25
|
+
message: `Runner "${ref}" not found for this project.${known ? ` Available: ${known}.` : ''} \`dcupl workflow runners\` lists them.`,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
async function resolveRunnerRef(listRunners, ref) {
|
|
29
|
+
let runners;
|
|
30
|
+
try {
|
|
31
|
+
runners = await listRunners();
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return { ok: true, uid: ref };
|
|
35
|
+
}
|
|
36
|
+
if (!Array.isArray(runners))
|
|
37
|
+
return { ok: true, uid: ref };
|
|
38
|
+
const res = resolveRunner(runners, ref);
|
|
39
|
+
return res.ok ? { ok: true, uid: res.runner.uid, runner: res.runner } : res;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=resolve-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-runner.js","sourceRoot":"","sources":["../../../src/functions/workflow/resolve-runner.ts"],"names":[],"mappings":";;AAeA,sCAyBC;AASD,4CAaC;AA/CD,SAAgB,aAAa,CAAC,OAAqB,EAAE,GAAW;IAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IACjD,IAAI,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC;IACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,eAAe,GAAG,aAAa,KAAK,CAAC,MAAM,aAAa,KAAK;iBACnE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;iBACjB,IAAI,CAAC,IAAI,CAAC,0BAA0B;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO;QACL,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,WAAW,GAAG,gCACrB,KAAK,CAAC,CAAC,CAAC,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,EACpC,yCAAyC;KAC1C,CAAC;AACJ,CAAC;AASM,KAAK,UAAU,gBAAgB,CACpC,WAAwC,EACxC,GAAW;IAEX,IAAI,OAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,WAAW,EAAE,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAC3D,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AAC9E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner-health.js","sourceRoot":"","sources":["../../../src/functions/workflow/runner-health.ts"],"names":[],"mappings":";;;AAeA,
|
|
1
|
+
{"version":3,"file":"runner-health.js","sourceRoot":"","sources":["../../../src/functions/workflow/runner-health.ts"],"names":[],"mappings":";;;AAeA,8CAiBC;AAGD,oCAIC;;AAvCD,0DAA0B;AAOb,QAAA,yBAAyB,GAAG,IAAI,CAAC;AAQvC,KAAK,UAAU,iBAAiB,CAAC,SAAiB,EAAE,OAA+B,EAAE;IAC1F,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC;YAC9B,MAAM,EAAE,KAAK;YACb,GAAG;YACH,OAAO,EAAE,IAAI,CAAC,SAAS,IAAI,iCAAyB;YACpD,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;SAC3B,CAAC,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG;YAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;QAC3F,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG;YACnB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,iCAAiC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;QAClH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAgC,CAAC;QAC3C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IACpF,CAAC;AACH,CAAC;AAGD,SAAgB,YAAY,CAAC,MAAoB;IAC/C,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACxC,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAClD,OAAO,gBAAgB,MAAM,CAAC,MAAM,GAAG,CAAC;AAC1C,CAAC"}
|