Skip to content

Commit 904e230

Browse files
CarlosCarmonaCarlosCarmona
committedMay 31, 2021
build: 3.2.2
·
3.4.33.2.2
1 parent 2a042cd commit 904e230

7 files changed

+497
-9706
lines changed
 

‎CHANGELOG.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
# Runnerty ChangeLog
22

3+
<a name="3.2.2"></a>
4+
5+
# [3.2.2](31/05/2021)
6+
7+
### Bug Fixes
8+
9+
- **common:** correction in the loading of default configuration values from config.json file
10+
11+
### Tests
12+
13+
- **common:** specific test for load testing and overwriting of default values
14+
315
<a name="3.2.1"></a>
416

517
# [3.2.1](21/05/2021)
18+
619
### Bug Fixes
720

821
- **common:** downgrade of the ajv dependency due to compatibility issues with "better-ajv-errors", caused error when trying to display a clearer description of schema compliance errors
922

10-
1123
<a name="3.2.0"></a>
1224

1325
# [3.2.0](25/04/2021)

‎__tests__/end2end.spec.js

+59
Original file line numberDiff line numberDiff line change
@@ -809,3 +809,62 @@ describe('PlanForcedProcForcedfdfpfpd', () => {
809809
);
810810
});
811811
});
812+
813+
describe('TestDefaultsConfigIterableChain', () => {
814+
const successOutput = `info: CN - START OF THE CHAIN: CHAIN-LAUNCHER
815+
info: CHDP - START: PROCESS PROCESS-LAUNCHER
816+
info: CDP - END: PROCESS PROCESS-LAUNCHER:
817+
info: CDC - START OF THE CHAIN: CHAIN-ITERABLE
818+
info: CDP - START: PROCESS PROCESS-ITER-ONE
819+
info: CDP - END: PROCESS PROCESS-ITER-ONE: PROCESS-ITER-ONE
820+
info: CDP - START: PROCESS PROCESS-ITER-TWO
821+
info: PN - END: PROCESS PROCESS-ITER-TWO: PROCESS-LAUNCHER_1
822+
info: CDC - END OF THE CHAIN: CHAIN-ITERABLE
823+
info: CDC - START OF THE CHAIN: CHAIN-ITERABLE
824+
info: CDP - START: PROCESS PROCESS-ITER-ONE
825+
info: CDP - END: PROCESS PROCESS-ITER-ONE: PROCESS-ITER-ONE
826+
info: CDP - START: PROCESS PROCESS-ITER-TWO
827+
info: PN - END: PROCESS PROCESS-ITER-TWO: PROCESS-LAUNCHER_2
828+
info: CDC - END OF THE CHAIN: CHAIN-ITERABLE
829+
info: CDC - START OF THE CHAIN: CHAIN-ITERABLE
830+
info: CDP - START: PROCESS PROCESS-ITER-ONE
831+
info: CDP - END: PROCESS PROCESS-ITER-ONE: PROCESS-ITER-ONE
832+
info: CDP - START: PROCESS PROCESS-ITER-TWO
833+
info: PN - END: PROCESS PROCESS-ITER-TWO: PROCESS-LAUNCHER_3
834+
info: CDC - END OF THE CHAIN: CHAIN-ITERABLE
835+
info: CDC - START OF THE CHAIN: CHAIN-ITERABLE
836+
info: CDP - START: PROCESS PROCESS-ITER-ONE
837+
info: CDP - END: PROCESS PROCESS-ITER-ONE: PROCESS-ITER-ONE
838+
info: CDP - START: PROCESS PROCESS-ITER-TWO
839+
info: PN - END: PROCESS PROCESS-ITER-TWO: PROCESS-LAUNCHER_4
840+
info: CDC - END OF THE CHAIN: CHAIN-ITERABLE
841+
info: CDC - START OF THE CHAIN: CHAIN-ITERABLE
842+
info: CDP - START: PROCESS PROCESS-ITER-ONE
843+
info: CDP - END: PROCESS PROCESS-ITER-ONE: PROCESS-ITER-ONE
844+
info: CDP - START: PROCESS PROCESS-ITER-TWO
845+
info: PN - END: PROCESS PROCESS-ITER-TWO: PROCESS-LAUNCHER_5
846+
info: CDC - END OF THE CHAIN: CHAIN-ITERABLE
847+
info: CDC - END OF THE CHAIN: CHAIN-LAUNCHER`;
848+
849+
test('Execution End2End: PlanForcedProcForcedfdfpfpd', done => {
850+
exec(
851+
'node',
852+
[
853+
'index.js',
854+
'-c',
855+
'./__tests__/end2end/config_defaults.json',
856+
'-p',
857+
'./__tests__/end2end/plan_simple_iter_config_defaults.json',
858+
'-f',
859+
'CHAIN-LAUNCHER',
860+
'-fd',
861+
'--end'
862+
],
863+
3000,
864+
res => {
865+
expect(flatOutput(res)).toEqual(flatSuccessOutput(successOutput));
866+
done();
867+
}
868+
);
869+
});
870+
});

‎__tests__/end2end/config_defaults.json

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/runnerty/schemas/master/schemas/3.2/config.json",
3+
"general": {
4+
"planFilePath": "plan.json",
5+
"runnerty.io": {
6+
"host": "https://ws.runnerty.io",
7+
"apikey": "YOUR_APIKEY_PROJECT",
8+
"healthChecker": true,
9+
"remoteControl": true,
10+
"debug": false,
11+
"disable": true,
12+
"waitForConnection": true,
13+
"connectionTimeout": 5000
14+
},
15+
"queues": {
16+
"refreshInterval": 100
17+
}
18+
},
19+
"triggers": [
20+
{
21+
"id": "schedule_default",
22+
"type": "@runnerty-trigger-schedule"
23+
},
24+
{
25+
"id": "immediate",
26+
"type": "@runnerty-trigger-immediate"
27+
}
28+
],
29+
"executors": [
30+
{
31+
"id": "iterable_default",
32+
"type": "@runnerty-executor-iterable"
33+
},
34+
{
35+
"id": "shell_default",
36+
"type": "@runnerty-executor-shell"
37+
},
38+
{
39+
"id": "wait_default",
40+
"type": "@runnerty-executor-wait",
41+
"time": "60s"
42+
}
43+
],
44+
"notifiers": [
45+
{
46+
"id": "console_default",
47+
"type": "@runnerty-notifier-console"
48+
}
49+
],
50+
"defaults": {
51+
"chain": {
52+
"notifications": {
53+
"on_start": [
54+
{
55+
"id": "console_default",
56+
"message": "CDC - START OF THE CHAIN: @GV(CHAIN_ID)"
57+
}
58+
],
59+
"on_end": [
60+
{
61+
"id": "console_default",
62+
"message": "CDC - END OF THE CHAIN: @GV(CHAIN_ID)"
63+
}
64+
],
65+
"on_fail": [
66+
{
67+
"id": "console_default",
68+
"message": "CDC - FAIL OF THE CHAIN: @GV(CHAIN_ID)",
69+
"mode": "error"
70+
}
71+
]
72+
}
73+
},
74+
"process": {
75+
"notifications": {
76+
"on_start": [
77+
{
78+
"id": "console_default",
79+
"message": "CDP - START: PROCESS @GV(PROCESS_ID)"
80+
}
81+
],
82+
"on_fail": [
83+
{
84+
"id": "console_default",
85+
"message": "CDP - ERROR: PROCESS @GV(PROCESS_ID): @GV(PROCESS_EXEC_ERR_OUTPUT)",
86+
"mode": "error"
87+
}
88+
],
89+
"on_end": [
90+
{
91+
"id": "console_default",
92+
"message": "CDP - END: PROCESS @GV(PROCESS_ID): @GV(PROCESS_EXEC_MSG_OUTPUT)"
93+
}
94+
]
95+
},
96+
"output": [
97+
{
98+
"file_name": "./@GETVALUE(PROCESS_ID).log",
99+
"write": ["CDO - EXECUTION @GV(PROCESS_ID) - @GV(PROCESS_EXEC_ERR_OUTPUT) @GV(PROCESS_EXEC_MSG_OUTPUT)"],
100+
"concat": true,
101+
"maxsize": "1mb"
102+
}
103+
]
104+
}
105+
},
106+
"global_values": [
107+
{
108+
"myparams": {
109+
"sample": "sample_value"
110+
}
111+
}
112+
]
113+
}

‎__tests__/end2end/plan_simple_iter_config_defaults.json

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/runnerty/schemas/master/schemas/3.2/plan.json",
3+
"chains": [
4+
{
5+
"id": "CHAIN-LAUNCHER",
6+
"name": "CHAIN-LAUNCHER",
7+
"notifications": {
8+
"on_start": [
9+
{
10+
"id": "console_default",
11+
"message": "CN - START OF THE CHAIN: @GV(CHAIN_ID)"
12+
}
13+
]
14+
},
15+
"defaults_processes": {
16+
"notifications": {
17+
"on_start": [
18+
{
19+
"id": "console_default",
20+
"message": "CHDP - START: PROCESS @GV(PROCESS_ID)"
21+
}
22+
]
23+
}
24+
},
25+
"processes": [
26+
{
27+
"id": "PROCESS-LAUNCHER",
28+
"name": "PROCESS-LAUNCHER",
29+
"exec": {
30+
"id": "iterable_default",
31+
"objects": [
32+
{
33+
"CMDPROC": "echo @GV(PROCESS_ID)_1"
34+
},
35+
{
36+
"CMDPROC": "echo @GV(PROCESS_ID)_2"
37+
},
38+
{
39+
"CMDPROC": "echo @GV(PROCESS_ID)_3"
40+
},
41+
{
42+
"CMDPROC": "echo @GV(PROCESS_ID)_4"
43+
},
44+
{
45+
"CMDPROC": "echo @GV(PROCESS_ID)_5"
46+
}
47+
]
48+
},
49+
"output_iterable": "PROCESS_EXEC_DATA_OUTPUT"
50+
}
51+
]
52+
},
53+
{
54+
"id": "CHAIN-ITERABLE",
55+
"name": "CHAIN-ITERABLE",
56+
"iterable": "serie",
57+
"depends_chains": {
58+
"chain_id": "CHAIN-LAUNCHER",
59+
"process_id": "PROCESS-LAUNCHER"
60+
},
61+
"input": [
62+
{
63+
"CMDPROC": "CMDPROC"
64+
}
65+
],
66+
"meta": {
67+
"extra_id": "@GV(CMDPROC)"
68+
},
69+
"processes": [
70+
{
71+
"id": "PROCESS-ITER-ONE",
72+
"name": "PROCESS-ITER-ONE",
73+
"exec": {
74+
"id": "shell_default",
75+
"command": "echo @GV(PROCESS_ID)"
76+
}
77+
},
78+
{
79+
"id": "PROCESS-ITER-TWO",
80+
"name": "PROCESS-ITER-TWO",
81+
"depend_process": ["PROCESS-ITER-ONE"],
82+
"exec": {
83+
"id": "shell_default",
84+
"command": "@GV(CMDPROC)"
85+
},
86+
"notifications": {
87+
"on_end": [
88+
{
89+
"id": "console_default",
90+
"message": "PN - END: PROCESS @GV(PROCESS_ID): @GV(PROCESS_EXEC_MSG_OUTPUT)"
91+
}
92+
]
93+
}
94+
}
95+
]
96+
}
97+
]
98+
}

‎lib/classes/chain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Chain {
8383
// Global defaults chains notifications:
8484
if (globalDefaultsChain) {
8585
if (globalDefaultsChain.notifications && !this.notifications) {
86-
this.notifications = globalDefaultsChain.notifications;
86+
this.notifications_plane = globalDefaultsChain.notifications;
8787
} else {
8888
for (const notifEvent in globalDefaultsChain.notifications) {
8989
if (!this.notifications[notifEvent]) {

‎package-lock.json

+211-9,702
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "runnerty",
33
"description": "Process orchestrator",
4-
"version": "3.2.1",
4+
"version": "3.2.2",
55
"preferGlobal": true,
66
"main": "index.js",
77
"license": "MIT",
@@ -96,7 +96,7 @@
9696
},
9797
"devDependencies": {
9898
"babel-eslint": "^10.1.0",
99-
"eslint": "^7.25.0",
99+
"eslint": "^7.27.0",
100100
"eslint-config-prettier": "^8.3.0",
101101
"eslint-plugin-jest": "^24.3.6",
102102
"eslint-plugin-prettier": "^3.4.0",

0 commit comments

Comments
 (0)
Please sign in to comment.