@jahia/jahia-cli 0.3.1 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/environment/create.d.ts.map +1 -1
- package/dist/commands/environment/create.js +1 -0
- package/dist/commands/environment/create.js.map +1 -1
- package/dist/commands/environment/list.d.ts.map +1 -1
- package/dist/commands/environment/list.js +1 -0
- package/dist/commands/environment/list.js.map +1 -1
- package/dist/commands/jahia/alive.d.ts.map +1 -1
- package/dist/commands/jahia/alive.js +28 -10
- package/dist/commands/jahia/alive.js.map +1 -1
- package/dist/commands/tests/build.d.ts +1 -0
- package/dist/commands/tests/build.d.ts.map +1 -1
- package/dist/commands/tests/build.js +8 -0
- package/dist/commands/tests/build.js.map +1 -1
- package/dist/commands/tests/run.d.ts +17 -2
- package/dist/commands/tests/run.d.ts.map +1 -1
- package/dist/commands/tests/run.js +70 -6
- package/dist/commands/tests/run.js.map +1 -1
- package/dist/commands/workflow/run.d.ts.map +1 -1
- package/dist/commands/workflow/run.js +26 -18
- package/dist/commands/workflow/run.js.map +1 -1
- package/dist/lib/components/index.d.ts.map +1 -1
- package/dist/lib/components/index.js +3 -0
- package/dist/lib/components/index.js.map +1 -1
- package/dist/lib/components/types.d.ts +16 -0
- package/dist/lib/components/types.d.ts.map +1 -1
- package/dist/lib/config/parser.d.ts.map +1 -1
- package/dist/lib/config/parser.js +11 -0
- package/dist/lib/config/parser.js.map +1 -1
- package/dist/lib/config/types.d.ts +1 -0
- package/dist/lib/config/types.d.ts.map +1 -1
- package/dist/lib/output/formatter.d.ts +2 -0
- package/dist/lib/output/formatter.d.ts.map +1 -1
- package/dist/lib/output/formatter.js +58 -21
- package/dist/lib/output/formatter.js.map +1 -1
- package/dist/lib/providers/docker/container.d.ts +16 -0
- package/dist/lib/providers/docker/container.d.ts.map +1 -1
- package/dist/lib/providers/docker/container.js +22 -0
- package/dist/lib/providers/docker/container.js.map +1 -1
- package/dist/lib/providers/docker/index.d.ts.map +1 -1
- package/dist/lib/providers/docker/index.js +12 -2
- package/dist/lib/providers/docker/index.js.map +1 -1
- package/dist/lib/providers/types.d.ts +6 -1
- package/dist/lib/providers/types.d.ts.map +1 -1
- package/dist/lib/state/types.d.ts +18 -0
- package/dist/lib/state/types.d.ts.map +1 -1
- package/dist/lib/tests/build-image.d.ts +1 -0
- package/dist/lib/tests/build-image.d.ts.map +1 -1
- package/dist/lib/tests/build-image.js +2 -5
- package/dist/lib/tests/build-image.js.map +1 -1
- package/dist/lib/workflow/format-workflow-sources.d.ts +1 -1
- package/dist/lib/workflow/format-workflow-sources.d.ts.map +1 -1
- package/dist/lib/workflow/format-workflow-sources.js +19 -19
- package/dist/lib/workflow/format-workflow-sources.js.map +1 -1
- package/dist/lib/workflow/merge-workflow-sources.d.ts +4 -1
- package/dist/lib/workflow/merge-workflow-sources.d.ts.map +1 -1
- package/dist/lib/workflow/merge-workflow-sources.js +4 -4
- package/dist/lib/workflow/merge-workflow-sources.js.map +1 -1
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts +14 -5
- package/dist/lib/workflow/resolve-workflows-file-path.d.ts.map +1 -1
- package/dist/lib/workflow/resolve-workflows-file-path.js +13 -7
- package/dist/lib/workflow/resolve-workflows-file-path.js.map +1 -1
- package/dist/lib/workflow/types.d.ts +3 -0
- package/dist/lib/workflow/types.d.ts.map +1 -1
- package/dist/lib/workflow/types.js +8 -3
- package/dist/lib/workflow/types.js.map +1 -1
- package/oclif.manifest.json +287 -278
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/environment/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAQ7C,OAAO,KAAK,EAAE,eAAe,EAAqB,MAAM,2BAA2B,CAAC;AAYpF;;GAEG;AACH,eAAO,MAAM,oBAAoB,QAAa,OAAO,CAAC;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAOA,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,QAAa,OAAO,CAAC,SAAS,eAAe,EAAE,CAYtF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,OAAO;IACpD,OAAgB,WAAW,SAG4C;IAEvE,OAAgB,QAAQ,WAOtB;IAEF,OAAgB,KAAK;;;;;;MAoBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/environment/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAQ7C,OAAO,KAAK,EAAE,eAAe,EAAqB,MAAM,2BAA2B,CAAC;AAYpF;;GAEG;AACH,eAAO,MAAM,oBAAoB,QAAa,OAAO,CAAC;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAOA,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,QAAa,OAAO,CAAC,SAAS,eAAe,EAAE,CAYtF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,OAAO;IACpD,OAAgB,WAAW,SAG4C;IAEvE,OAAgB,QAAQ,WAOtB;IAEF,OAAgB,KAAK;;;;;;MAoBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAyGnB,aAAa;CAyB5B"}
|
|
@@ -134,6 +134,7 @@ export default class EnvironmentCreate extends Command {
|
|
|
134
134
|
image: resolved.find((r) => r.definition.name === c.name)?.effectiveImage ?? 'unknown',
|
|
135
135
|
tag: resolved.find((r) => r.definition.name === c.name)?.effectiveTag ?? 'latest',
|
|
136
136
|
containerId: c.containerId ?? '',
|
|
137
|
+
endpoints: c.endpoints,
|
|
137
138
|
})),
|
|
138
139
|
config,
|
|
139
140
|
createdAt: result.environment.createdAt ?? new Date().toISOString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/environment/create.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/environment/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/environment/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAQ7C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO;IAClD,OAAgB,WAAW,SAEyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;MAMnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/environment/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAQ7C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO;IAClD,OAAgB,WAAW,SAEyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;MAMnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmDlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/environment/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,OAAO;IAClD,MAAM,CAAU,WAAW,GACzB,8EAA8E;QAC9E,iEAAiE,CAAC;IAEpE,MAAM,CAAU,QAAQ,GAAG;QACzB,oCAAoC;QACpC,2CAA2C;QAC3C,qEAAqE;KACtE,CAAC;IAEF,MAAM,CAAU,KAAK,GAAG;QACtB,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,gEAAgE;YAC7E,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC;QAClC,MAAM,SAAS,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,GAAG,GAAG,8DAA8D,CAAC;YAC3E,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YAC5G,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAElD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CACN,IAAI,CAAC,SAAS,CAAC;gBACb,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,UAAU,CAAC,IAAI;gBAC5B,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5C,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,GAAG,EAAE,CAAC,CAAC,GAAG;oBACV,WAAW,EAAE,CAAC,CAAC,WAAW;oBAC1B,MAAM,EAAE,CAAC,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/environment/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkFlC"}
|
|
@@ -59,19 +59,30 @@ export default class JahiaAlive extends Command {
|
|
|
59
59
|
async run() {
|
|
60
60
|
const { flags } = await this.parse(JahiaAlive);
|
|
61
61
|
const stateOverride = flags.state;
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
const
|
|
65
|
-
const
|
|
66
|
-
const
|
|
62
|
+
// When --url is explicitly provided, the state file is not used at all.
|
|
63
|
+
// The command operates in "direct URL" mode without environment context.
|
|
64
|
+
const directUrl = flags.url;
|
|
65
|
+
const useDirectUrl = directUrl !== undefined;
|
|
66
|
+
const env = useDirectUrl ? undefined : await getActiveEnvironment(stateOverride);
|
|
67
|
+
const defaults = useDirectUrl
|
|
68
|
+
? { url: directUrl, username: 'root', password: 'root1234' }
|
|
69
|
+
: getJahiaConnectionDefaults(env);
|
|
70
|
+
const url = directUrl ?? defaults.url;
|
|
67
71
|
const username = flags.username ?? defaults.username;
|
|
68
72
|
const password = flags.password ?? defaults.password;
|
|
73
|
+
const envName = env?.name ?? (useDirectUrl ? 'direct' : 'unknown');
|
|
69
74
|
if (!flags.json) {
|
|
70
|
-
|
|
75
|
+
if (useDirectUrl) {
|
|
76
|
+
this.log(`Waiting for Jahia at "${url}" to become alive (direct URL mode — state file not used)...`);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const statePath = stateFilePath(stateOverride);
|
|
80
|
+
this.log(`Waiting for Jahia environment "${envName}" to become alive...`);
|
|
81
|
+
this.log(` State: ${statePath}`);
|
|
82
|
+
}
|
|
71
83
|
this.log(` URL: ${url}`);
|
|
72
84
|
this.log(` Requires: ${String(flags.count)} consecutive GREEN at ${String(flags.interval)}s interval`);
|
|
73
85
|
this.log(` Timeout: ${String(flags.timeout)}s`);
|
|
74
|
-
this.log(` State: ${statePath}`);
|
|
75
86
|
this.log('');
|
|
76
87
|
}
|
|
77
88
|
const onPoll = (event) => {
|
|
@@ -94,18 +105,25 @@ export default class JahiaAlive extends Command {
|
|
|
94
105
|
onPoll,
|
|
95
106
|
});
|
|
96
107
|
if (flags.json) {
|
|
97
|
-
|
|
108
|
+
const jsonBase = useDirectUrl
|
|
109
|
+
? { ...result, url, mode: 'direct' }
|
|
110
|
+
: { ...result, environment: envName, stateFile: stateFilePath(stateOverride) };
|
|
111
|
+
this.log(JSON.stringify(jsonBase, null, 2));
|
|
98
112
|
}
|
|
99
113
|
else {
|
|
100
114
|
this.log('');
|
|
101
|
-
|
|
115
|
+
const label = useDirectUrl ? `Jahia at "${url}"` : `Environment "${envName}"`;
|
|
116
|
+
this.log(`✓ ${label} is alive and responding GREEN`);
|
|
102
117
|
this.log(` Confirmed in ${String(result.elapsedSeconds)}s with ${String(result.consecutiveGreen)} consecutive checks`);
|
|
103
118
|
}
|
|
104
119
|
}
|
|
105
120
|
catch (error) {
|
|
106
121
|
const message = error instanceof Error ? error.message : String(error);
|
|
107
122
|
if (flags.json) {
|
|
108
|
-
|
|
123
|
+
const jsonBase = useDirectUrl
|
|
124
|
+
? { success: false, url, mode: 'direct', error: 'timeout', message }
|
|
125
|
+
: { success: false, environment: envName, stateFile: stateFilePath(stateOverride), error: 'timeout', message };
|
|
126
|
+
this.log(JSON.stringify(jsonBase, null, 2));
|
|
109
127
|
}
|
|
110
128
|
else {
|
|
111
129
|
this.log('');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,MAAM,CAAU,WAAW,GACzB,wEAAwE;QACxE,gFAAgF;QAChF,uEAAuE,CAAC;IAE1E,MAAM,CAAU,QAAQ,GAAG;QACzB,+BAA+B;QAC/B,wDAAwD;QACxD,kEAAkE;QAClE,gEAAgE;KACjE,CAAC;IAEF,MAAM,CAAU,KAAK,GAAG;QACtB,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;YAChB,WAAW,EAAE,gEAAgE;SAC9E,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,sEAAsE;SACpF,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0EAA0E;SACxF,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,8DAA8D;YAC3E,OAAO,EAAE,gBAAgB;SAC1B,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,+BAA+B;YAC5C,OAAO,EAAE,gBAAgB;SAC1B,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,eAAe;SACzB,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,gDAAgD;YAC7D,OAAO,EAAE,aAAa;SACvB,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,gEAAgE;YAC7E,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export default class TestsBuild extends Command {
|
|
|
22
22
|
static examples: string[];
|
|
23
23
|
static flags: {
|
|
24
24
|
config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
|
+
context: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
26
|
'no-cache': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
26
27
|
json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
27
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAQrE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,KACrC,MAAgE,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,mBAAmB,GAAG,SAAS,KAC/C,MAAsD,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,YAAY,MAAM,KAAG,MACG,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,MACV,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAIU;IAErC,OAAgB,QAAQ,
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAQrE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,KACrC,MAAgE,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,mBAAmB,GAAG,SAAS,KAC/C,MAAsD,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,YAAY,MAAM,KAAG,MACG,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,MACV,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAIU;IAErC,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;MAkBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgDlC"}
|
|
@@ -28,6 +28,7 @@ export default class TestsBuild extends Command {
|
|
|
28
28
|
static examples = [
|
|
29
29
|
'<%= config.bin %> tests build -c config.yml',
|
|
30
30
|
'<%= config.bin %> tests build -c config.yml --no-cache',
|
|
31
|
+
'<%= config.bin %> tests build -c config.yml --context /path/to/test/root',
|
|
31
32
|
'<%= config.bin %> tests build -c config.yml --json',
|
|
32
33
|
];
|
|
33
34
|
static flags = {
|
|
@@ -36,6 +37,10 @@ export default class TestsBuild extends Command {
|
|
|
36
37
|
description: 'Path to jahia-cli config file',
|
|
37
38
|
required: true,
|
|
38
39
|
}),
|
|
40
|
+
context: Flags.string({
|
|
41
|
+
description: 'Docker build context directory (default: current working directory)',
|
|
42
|
+
default: '.',
|
|
43
|
+
}),
|
|
39
44
|
'no-cache': Flags.boolean({
|
|
40
45
|
description: 'Build without using cache',
|
|
41
46
|
default: false,
|
|
@@ -54,10 +59,12 @@ export default class TestsBuild extends Command {
|
|
|
54
59
|
const imageName = resolveImageName(containerConfig);
|
|
55
60
|
const dockerfile = containerConfig?.dockerfile ?? DEFAULT_DOCKERFILE;
|
|
56
61
|
const tag = resolveImageTag(imageName, version);
|
|
62
|
+
const context = containerConfig?.context ?? flags.context;
|
|
57
63
|
const args = buildBuildxArgs({
|
|
58
64
|
dockerfile,
|
|
59
65
|
tag,
|
|
60
66
|
baseVersion: version,
|
|
67
|
+
context,
|
|
61
68
|
platform: containerConfig?.platform,
|
|
62
69
|
noCache: flags['no-cache'],
|
|
63
70
|
extraBuildArgs: containerConfig?.buildArgs,
|
|
@@ -65,6 +72,7 @@ export default class TestsBuild extends Command {
|
|
|
65
72
|
if (!flags.json) {
|
|
66
73
|
this.log(`Building test image: ${tag}`);
|
|
67
74
|
this.log(` Dockerfile: ${dockerfile}`);
|
|
75
|
+
this.log(` Context: ${context}`);
|
|
68
76
|
this.log(` BASE_VERSION: ${version}`);
|
|
69
77
|
}
|
|
70
78
|
await execa('docker', [...args], { stdio: 'inherit' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,28 @@
|
|
|
1
1
|
import { Command } from '@oclif/core';
|
|
2
2
|
import type { ResolvedComponent } from '../../lib/components/types.js';
|
|
3
3
|
import type { TestContainerConfig } from '../../lib/config/types.js';
|
|
4
|
+
import type { BindMount } from '../../lib/providers/docker/container.js';
|
|
4
5
|
/**
|
|
5
6
|
* Formats a human-readable test run start message.
|
|
7
|
+
* When stateMount is provided, includes state file mount info for debugging.
|
|
6
8
|
*/
|
|
7
|
-
export declare const formatRunStart: (image: string, network: string, name: string
|
|
9
|
+
export declare const formatRunStart: (image: string, network: string, name: string, stateMount?: {
|
|
10
|
+
readonly host: string;
|
|
11
|
+
readonly container: string;
|
|
12
|
+
}) => string;
|
|
8
13
|
/**
|
|
9
|
-
*
|
|
14
|
+
* Well-known path inside the test container where the environment state file is mounted.
|
|
15
|
+
* jahia-cli inside the container discovers it via the JAHIA_CLI_STATE env var.
|
|
10
16
|
*/
|
|
17
|
+
export declare const CONTAINER_STATE_PATH = "/jahia-cli/state.json";
|
|
18
|
+
/**
|
|
19
|
+
* Builds the bind mount and env var for mounting the state file into the test container.
|
|
20
|
+
* Returns undefined if the state file does not exist on disk.
|
|
21
|
+
*/
|
|
22
|
+
export declare const buildStateMountArgs: (hostStatePath: string) => Promise<{
|
|
23
|
+
readonly bindMount: BindMount;
|
|
24
|
+
readonly envVar: readonly [string, string];
|
|
25
|
+
} | undefined>;
|
|
11
26
|
export declare const formatRunComplete: (name: string, exitCode: number) => string;
|
|
12
27
|
/**
|
|
13
28
|
* Builds a ResolvedComponent for the cypress test runner using the component registry.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAMzE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,aAAa;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KACjE,MAUW,CAAC;AAEf;;;GAGG;AACH,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAc5D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,eAAe,MAAM,KACpB,OAAO,CAAC;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,SAAS,CAWnG,CAAC;AACF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,MAIF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,eAAe,SAAS,MAAM,EAAE,EAChC,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,EACtC,UAAU,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KACzC,iBAgCF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,OAAgB,WAAW,SAG2E;IAEtG,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgIlC"}
|
|
@@ -1,26 +1,60 @@
|
|
|
1
1
|
import { resolve } from 'node:path';
|
|
2
|
+
import { access } from 'node:fs/promises';
|
|
2
3
|
import { Command, Flags } from '@oclif/core';
|
|
3
4
|
import { execa } from 'execa';
|
|
4
5
|
import { applyEnvInjections, getComponent, resolveComponent } from '../../lib/components/index.js';
|
|
5
6
|
import { loadConfigFile } from '../../lib/config/parser.js';
|
|
6
|
-
import { buildRunArgs, containerName, removeContainer } from '../../lib/providers/docker/container.js';
|
|
7
|
+
import { buildRunArgs, containerName, removeContainer, stopContainer } from '../../lib/providers/docker/container.js';
|
|
7
8
|
import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
|
|
8
9
|
import { stateFilePath } from '../../lib/state/state-file-path.js';
|
|
9
10
|
import { stateFlag } from '../../lib/state/state-flag.js';
|
|
10
11
|
import { DEFAULT_IMAGE_NAME, parseKeyValueArgs } from '../../lib/tests/build-image.js';
|
|
11
12
|
/**
|
|
12
13
|
* Formats a human-readable test run start message.
|
|
14
|
+
* When stateMount is provided, includes state file mount info for debugging.
|
|
13
15
|
*/
|
|
14
|
-
export const formatRunStart = (image, network, name) => [
|
|
16
|
+
export const formatRunStart = (image, network, name, stateMount) => [
|
|
15
17
|
`▶ Running tests`,
|
|
16
18
|
` Image: ${image}`,
|
|
17
19
|
` Network: ${network}`,
|
|
18
20
|
` Container: ${name}`,
|
|
21
|
+
...(stateMount !== undefined
|
|
22
|
+
? [` State: ${stateMount.host} → ${stateMount.container} (read-only)`]
|
|
23
|
+
: []),
|
|
19
24
|
'',
|
|
20
25
|
].join('\n');
|
|
21
26
|
/**
|
|
22
|
-
*
|
|
27
|
+
* Well-known path inside the test container where the environment state file is mounted.
|
|
28
|
+
* jahia-cli inside the container discovers it via the JAHIA_CLI_STATE env var.
|
|
23
29
|
*/
|
|
30
|
+
export const CONTAINER_STATE_PATH = '/jahia-cli/state.json';
|
|
31
|
+
/**
|
|
32
|
+
* Checks whether a file exists on disk (async, no exceptions).
|
|
33
|
+
*/
|
|
34
|
+
const fileExists = async (filePath) => {
|
|
35
|
+
try {
|
|
36
|
+
await access(filePath);
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
/**
|
|
44
|
+
* Builds the bind mount and env var for mounting the state file into the test container.
|
|
45
|
+
* Returns undefined if the state file does not exist on disk.
|
|
46
|
+
*/
|
|
47
|
+
export const buildStateMountArgs = async (hostStatePath) => {
|
|
48
|
+
const absolutePath = resolve(hostStatePath);
|
|
49
|
+
const exists = await fileExists(absolutePath);
|
|
50
|
+
if (!exists) {
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
return {
|
|
54
|
+
bindMount: { host: absolutePath, container: CONTAINER_STATE_PATH, readOnly: true },
|
|
55
|
+
envVar: ['JAHIA_CLI_STATE', CONTAINER_STATE_PATH],
|
|
56
|
+
};
|
|
57
|
+
};
|
|
24
58
|
export const formatRunComplete = (name, exitCode) => {
|
|
25
59
|
const icon = exitCode === 0 ? '✓' : '✗';
|
|
26
60
|
const status = exitCode === 0 ? 'passed' : `failed (exit code ${String(exitCode)})`;
|
|
@@ -102,6 +136,21 @@ export default class TestsRun extends Command {
|
|
|
102
136
|
const component = buildCypressComponent(activeEnv.components.map((c) => c.name), containerConfig, config.tests?.scaffolding?.version, userEnv);
|
|
103
137
|
const imageRef = `${component.effectiveImage}:${component.effectiveTag}`;
|
|
104
138
|
const name = containerName(activeEnv.name, 'cypress');
|
|
139
|
+
// Mount the environment state file into the test container so that
|
|
140
|
+
// jahia-cli inside the container can discover the environment.
|
|
141
|
+
const stateMount = await buildStateMountArgs(statePath);
|
|
142
|
+
const bindMounts = stateMount !== undefined ? [stateMount.bindMount] : [];
|
|
143
|
+
const stateEnv = stateMount !== undefined
|
|
144
|
+
? { [stateMount.envVar[0]]: stateMount.envVar[1] }
|
|
145
|
+
: {};
|
|
146
|
+
if (stateMount === undefined) {
|
|
147
|
+
this.warn(`State file not found at "${statePath}" — skipping mount into test container.\n` +
|
|
148
|
+
` Commands inside the container that depend on environment state will not work.\n` +
|
|
149
|
+
` Verify the state file exists or pass --state with a valid path.`);
|
|
150
|
+
}
|
|
151
|
+
else if (!flags.json) {
|
|
152
|
+
this.log(`📁 Mounting state: ${stateMount.bindMount.host} → ${CONTAINER_STATE_PATH} (read-only)`);
|
|
153
|
+
}
|
|
105
154
|
const args = buildRunArgs({
|
|
106
155
|
envName: activeEnv.name,
|
|
107
156
|
componentName: component.definition.name,
|
|
@@ -109,20 +158,32 @@ export default class TestsRun extends Command {
|
|
|
109
158
|
tag: component.effectiveTag,
|
|
110
159
|
networkName: activeEnv.network,
|
|
111
160
|
ports: component.effectivePorts,
|
|
112
|
-
env: component.effectiveEnv,
|
|
161
|
+
env: { ...component.effectiveEnv, ...stateEnv },
|
|
113
162
|
volumes: component.definition.volumes,
|
|
114
|
-
networkAliases: component.
|
|
163
|
+
networkAliases: component.effectiveNetworkAliases,
|
|
164
|
+
bindMounts,
|
|
115
165
|
detached: false,
|
|
116
166
|
});
|
|
117
167
|
if (!flags.json) {
|
|
118
|
-
this.log(formatRunStart(imageRef, activeEnv.network, name
|
|
168
|
+
this.log(formatRunStart(imageRef, activeEnv.network, name, stateMount !== undefined
|
|
169
|
+
? { host: stateMount.bindMount.host, container: CONTAINER_STATE_PATH }
|
|
170
|
+
: undefined));
|
|
119
171
|
}
|
|
120
172
|
// Remove any leftover container from a previous run
|
|
121
173
|
await removeContainer(name);
|
|
174
|
+
// Register SIGINT handler to stop the container on Ctrl+C
|
|
175
|
+
const onSigint = () => {
|
|
176
|
+
process.stderr.write(`\n⚠ Interrupted — stopping container "${name}"...\n`);
|
|
177
|
+
void stopContainer(name).finally(() => {
|
|
178
|
+
process.exit(130);
|
|
179
|
+
});
|
|
180
|
+
};
|
|
181
|
+
process.on('SIGINT', onSigint);
|
|
122
182
|
const result = await execa('docker', [...args], {
|
|
123
183
|
stdio: 'inherit',
|
|
124
184
|
reject: false,
|
|
125
185
|
});
|
|
186
|
+
process.removeListener('SIGINT', onSigint);
|
|
126
187
|
const exitCode = result.exitCode ?? 1;
|
|
127
188
|
if (flags.json) {
|
|
128
189
|
this.log(JSON.stringify({
|
|
@@ -131,6 +192,9 @@ export default class TestsRun extends Command {
|
|
|
131
192
|
container: name,
|
|
132
193
|
image: imageRef,
|
|
133
194
|
network: activeEnv.network,
|
|
195
|
+
stateMount: stateMount !== undefined
|
|
196
|
+
? { host: stateMount.bindMount.host, container: CONTAINER_STATE_PATH }
|
|
197
|
+
: null,
|
|
134
198
|
}, null, 2));
|
|
135
199
|
}
|
|
136
200
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,KAAG,MAa3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,cAAc,MAAM,EACpB,OAAO,SAAS,UAAU,EAAE,EAC5B,SAAS,OAAO,EAChB,iBAAiB,MAAM,KACtB,MAoBF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,KAAG,MAa3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,cAAc,MAAM,EACpB,OAAO,SAAS,UAAU,EAAE,EAC5B,SAAS,OAAO,EAChB,iBAAiB,MAAM,KACtB,MAoBF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAQsC;IAEjE,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;MA0BnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0GlC"}
|
|
@@ -41,9 +41,10 @@ export const buildWorkflowSummary = (workflowName, steps, success, totalDuration
|
|
|
41
41
|
};
|
|
42
42
|
export default class WorkflowRun extends Command {
|
|
43
43
|
static description = 'Execute a named workflow defined in a configuration file. ' +
|
|
44
|
-
'Supports loading shared workflows from a
|
|
45
|
-
'(via --workflows-file flag or workflowsFile config key
|
|
46
|
-
'
|
|
44
|
+
'Supports loading shared workflows from a dedicated workflows file ' +
|
|
45
|
+
'(via --workflows-file flag or workflowsFile config key, ' +
|
|
46
|
+
'defaults to jahia-cli.workflows.global.yml in CWD). ' +
|
|
47
|
+
'Config workflows override workflow file ones with the same name. ' +
|
|
47
48
|
'Runs steps sequentially — shell commands via execa, ' +
|
|
48
49
|
'jahia-cli commands via subprocess. Stops on first failure. ' +
|
|
49
50
|
'Use --name to select a workflow, or omit to run the default.';
|
|
@@ -65,9 +66,10 @@ export default class WorkflowRun extends Command {
|
|
|
65
66
|
}),
|
|
66
67
|
'workflows-file': Flags.string({
|
|
67
68
|
char: 'w',
|
|
68
|
-
description: 'Path to a
|
|
69
|
-
'Merged with
|
|
70
|
-
'Resolved relative to CWD. Overrides the workflowsFile config key.'
|
|
69
|
+
description: 'Path to a dedicated workflows YAML file. ' +
|
|
70
|
+
'Merged with config workflows (config takes precedence). ' +
|
|
71
|
+
'Resolved relative to CWD. Overrides the workflowsFile config key. ' +
|
|
72
|
+
'Defaults to jahia-cli.workflows.global.yml in CWD.',
|
|
71
73
|
}),
|
|
72
74
|
json: Flags.boolean({
|
|
73
75
|
description: 'Output result as structured JSON (for AI agents and scripting)',
|
|
@@ -83,19 +85,25 @@ export default class WorkflowRun extends Command {
|
|
|
83
85
|
const configPath = resolve(flags.config);
|
|
84
86
|
const configDir = dirname(configPath);
|
|
85
87
|
const config = await loadConfigFile(configPath);
|
|
86
|
-
// Resolve
|
|
87
|
-
const
|
|
88
|
-
// Load
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
88
|
+
// Resolve workflows file path (flag > config key > default)
|
|
89
|
+
const { path: workflowsFilePath, isExplicit } = resolveWorkflowsFilePath(configDir, config.workflowsFile, flags['workflows-file']);
|
|
90
|
+
// Load workflows file — always attempt since we now have a default
|
|
91
|
+
const workflowFileResult = await loadGlobalWorkflows(workflowsFilePath);
|
|
92
|
+
// If the user explicitly specified a file that doesn't exist, warn but continue
|
|
93
|
+
if (!workflowFileResult.found && isExplicit) {
|
|
94
|
+
this.warn(`Workflows file not found: ${workflowsFilePath}\n` +
|
|
95
|
+
` The command will continue using workflows from the config file only.`);
|
|
96
|
+
}
|
|
97
|
+
// Only pass the result downstream when the file was found or explicitly requested
|
|
98
|
+
// (so the UI can show the "not found" warning). Skip silently for missing defaults.
|
|
99
|
+
const effectiveFileResult = workflowFileResult.found || isExplicit ? workflowFileResult : undefined;
|
|
100
|
+
// Merge workflow file + config (config wins)
|
|
101
|
+
const mergedResult = mergeWorkflowSources(workflowFileResult.workflows, config.workflows);
|
|
94
102
|
const effectiveWorkflows = mergedResult?.workflows;
|
|
95
103
|
if (effectiveWorkflows === undefined || Object.keys(effectiveWorkflows).length === 0) {
|
|
96
|
-
this.error('No workflows found in
|
|
104
|
+
this.error('No workflows found in config or workflows file.\n\n' +
|
|
97
105
|
' Run "jahia-cli workflow init" to generate sample workflows,\n' +
|
|
98
|
-
' or specify a
|
|
106
|
+
' or specify a workflows file with --workflows-file.');
|
|
99
107
|
return;
|
|
100
108
|
}
|
|
101
109
|
// mergedResult is guaranteed defined when effectiveWorkflows is defined
|
|
@@ -107,7 +115,7 @@ export default class WorkflowRun extends Command {
|
|
|
107
115
|
const { steps } = workflow;
|
|
108
116
|
// Log verbose source/selection info
|
|
109
117
|
if (!flags.json) {
|
|
110
|
-
this.log(formatWorkflowSources(configPath, config.workflows !== undefined ? Object.keys(config.workflows).length : 0,
|
|
118
|
+
this.log(formatWorkflowSources(configPath, config.workflows !== undefined ? Object.keys(config.workflows).length : 0, effectiveFileResult));
|
|
111
119
|
this.log('');
|
|
112
120
|
this.log(formatAvailableWorkflows(merged, workflowName));
|
|
113
121
|
this.log('');
|
|
@@ -130,7 +138,7 @@ export default class WorkflowRun extends Command {
|
|
|
130
138
|
onStepComplete: undefined,
|
|
131
139
|
});
|
|
132
140
|
if (flags.json) {
|
|
133
|
-
const sourcesJson = buildWorkflowSourcesJson(configPath, config.workflows,
|
|
141
|
+
const sourcesJson = buildWorkflowSourcesJson(configPath, config.workflows, effectiveFileResult, merged, workflowName);
|
|
134
142
|
this.log(JSON.stringify({ ...sourcesJson, ...result, workflowName }, undefined, 2));
|
|
135
143
|
}
|
|
136
144
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AACvG,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAG7F;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAU,EAAE;IACnD,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACd,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QACjB,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;IAC/B,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAG,OAAO,GAAG,EAAE,CAAC;IACtC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC;AAC5D,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,YAAoB,EACpB,KAA4B,EAC5B,OAAgB,EAChB,eAAuB,EACf,EAAE;IACV,MAAM,MAAM,GAAG,OAAO;QACpB,CAAC,CAAC,eAAe,YAAY,0BAA0B;QACvD,CAAC,CAAC,eAAe,YAAY,UAAU,CAAC;IAE1C,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CACzB,CAAC,IAAI,EAAE,EAAE,CACP,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAC5E,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAC5D,EAAE,CACL,CAAC;IAEF,OAAO;QACL,MAAM;QACN,EAAE;QACF,UAAU;QACV,GAAG,SAAS;QACZ,EAAE;QACF,iBAAiB,cAAc,CAAC,eAAe,CAAC,EAAE;KACnD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,MAAM,CAAU,WAAW,GACzB,4DAA4D;QAC5D,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAOhH;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAK5E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAO,SAAS,MAAM,EAAqC,CAAC;AAE3F;;GAEG;AACH,eAAO,MAAM,cAAc,QAAO,SAAS,mBAAmB,EAC3B,CAAC;AAEpC;;GAEG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAAS,mBAAmB,EACT,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAO,SAAS,mBAAmB,EACP,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,wBAAwB,GAAI,UAAU,iBAAiB,KAAG,SAAS,mBAAmB,EACzB,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,mBAAmB,GAAG,SACxC,CAAC;AAE3B;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,MAAM,KACV;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAgB5D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,GAC3B,YAAY,mBAAmB,EAC/B,YAAW,kBAAuB,KACjC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAOhH;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAK5E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,QAAO,SAAS,MAAM,EAAqC,CAAC;AAE3F;;GAEG;AACH,eAAO,MAAM,cAAc,QAAO,SAAS,mBAAmB,EAC3B,CAAC;AAEpC;;GAEG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAAS,mBAAmB,EACT,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAO,SAAS,mBAAmB,EACP,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,wBAAwB,GAAI,UAAU,iBAAiB,KAAG,SAAS,mBAAmB,EACzB,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,mBAAmB,GAAG,SACxC,CAAC;AAE3B;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,MAAM,KACV;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAgB5D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,GAC3B,YAAY,mBAAmB,EAC/B,YAAW,kBAAuB,KACjC,iBAmBF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,YAAY,SAAS,iBAAiB,EAAE,KACvC,SAAS,iBAAiB,EAsB5B,CAAC;AAEF,YAAY,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -81,6 +81,9 @@ export const resolveComponent = (definition, overrides = {}) => {
|
|
|
81
81
|
effectiveEnv: resolveEnvVarsInRecord(mergedEnv),
|
|
82
82
|
effectivePorts: overrides.ports ?? definition.ports,
|
|
83
83
|
effectiveArtifacts: [...(definition.artifacts ?? []), ...(overrides.artifacts ?? [])],
|
|
84
|
+
effectiveNetworkAliases: overrides.alias
|
|
85
|
+
? [overrides.alias, ...definition.networkAliases]
|
|
86
|
+
: definition.networkAliases,
|
|
84
87
|
};
|
|
85
88
|
};
|
|
86
89
|
/**
|