Skip to content

Commit 505d440

Browse files
committed
Merge branch 'master' into workflow-ui
2 parents f7e9b2f + 7b07616 commit 505d440

227 files changed

Lines changed: 9216 additions & 1187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,50 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
---
88

9+
## [17.3.2] - 2025-06-05
10+
11+
12+
https://github.com/MAIF/otoroshi/milestone/118?closed=1
13+
https://github.com/MAIF/otoroshi/compare/v17.3.1...v17.3.2
14+
https://github.com/MAIF/otoroshi/releases/tag/v17.3.2
15+
16+
17+
18+
19+
### Fixed
20+
21+
- Bad JMS data exporter parsing (#2197 fixed by [mathieuancelin](https://github.com/mathieuancelin))
22+
23+
24+
### Contributors
25+
26+
* @mathieuancelin
27+
28+
## [17.3.1] - 2025-06-04
29+
30+
31+
https://github.com/MAIF/otoroshi/milestone/117?closed=1
32+
https://github.com/MAIF/otoroshi/compare/v17.3.0...v17.3.1
33+
https://github.com/MAIF/otoroshi/releases/tag/v17.3.1
34+
35+
36+
### Added
37+
38+
- add a `value` node in workflow (#2195 fixed by [mathieuancelin](https://github.com/mathieuancelin))
39+
40+
41+
### Fixed
42+
43+
- Map, FlatMap and Filter workflow nodes does not work as expected (#2193 fixed by [mathieuancelin](https://github.com/mathieuancelin))
44+
45+
### Documentation
46+
47+
- Add documentation for workflows (#2194 fixed by [mathieuancelin](https://github.com/mathieuancelin))
48+
49+
### Contributors
50+
51+
* @mathieuancelin
52+
953
## [17.3.0] - 2025-06-03
1054

1155

docs/helm/index.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ entries:
33
otoroshi:
44
- apiVersion: v3
55
appVersion: 1.5.10
6-
created: "2025-06-03T11:40:13.090957251Z"
6+
created: "2025-06-05T13:58:22.386472901Z"
77
dependencies:
88
- condition: global.prod
99
name: redis
@@ -28,7 +28,7 @@ entries:
2828
version: 1.5.10
2929
- apiVersion: v3
3030
appVersion: 1.5.9
31-
created: "2025-06-03T11:40:13.125545122Z"
31+
created: "2025-06-05T13:58:22.422995424Z"
3232
dependencies:
3333
- condition: global.prod
3434
name: redis
@@ -53,7 +53,7 @@ entries:
5353
version: 1.5.9
5454
- apiVersion: v3
5555
appVersion: 1.5.8
56-
created: "2025-06-03T11:40:13.120234307Z"
56+
created: "2025-06-05T13:58:22.418394984Z"
5757
dependencies:
5858
- condition: global.prod
5959
name: redis
@@ -78,7 +78,7 @@ entries:
7878
version: 1.5.8
7979
- apiVersion: v3
8080
appVersion: 1.5.6
81-
created: "2025-06-03T11:40:13.115165118Z"
81+
created: "2025-06-05T13:58:22.4130599Z"
8282
dependencies:
8383
- condition: global.prod
8484
name: redis
@@ -103,7 +103,7 @@ entries:
103103
version: 1.5.6
104104
- apiVersion: v3
105105
appVersion: 1.5.5
106-
created: "2025-06-03T11:40:13.110711411Z"
106+
created: "2025-06-05T13:58:22.407775162Z"
107107
dependencies:
108108
- condition: global.prod
109109
name: redis
@@ -128,7 +128,7 @@ entries:
128128
version: 1.5.5
129129
- apiVersion: v3
130130
appVersion: 1.5.4
131-
created: "2025-06-03T11:40:13.105589944Z"
131+
created: "2025-06-05T13:58:22.40306627Z"
132132
dependencies:
133133
- condition: global.prod
134134
name: redis
@@ -153,7 +153,7 @@ entries:
153153
version: 1.5.4
154154
- apiVersion: v3
155155
appVersion: 1.5.3
156-
created: "2025-06-03T11:40:13.101065495Z"
156+
created: "2025-06-05T13:58:22.395868634Z"
157157
dependencies:
158158
- condition: global.prod
159159
name: redis
@@ -178,7 +178,7 @@ entries:
178178
version: 1.5.3
179179
- apiVersion: v3
180180
appVersion: 1.5.2
181-
created: "2025-06-03T11:40:13.095919059Z"
181+
created: "2025-06-05T13:58:22.390877388Z"
182182
dependencies:
183183
- condition: global.prod
184184
name: redis
@@ -203,7 +203,7 @@ entries:
203203
version: 1.5.2
204204
- apiVersion: v3
205205
appVersion: 1.5.1
206-
created: "2025-06-03T11:40:13.086470993Z"
206+
created: "2025-06-05T13:58:22.380921267Z"
207207
dependencies:
208208
- condition: global.prod
209209
name: redis
@@ -228,7 +228,7 @@ entries:
228228
version: 1.5.1
229229
- apiVersion: v3
230230
appVersion: 1.5.0
231-
created: "2025-06-03T11:40:13.081116791Z"
231+
created: "2025-06-05T13:58:22.375879807Z"
232232
dependencies:
233233
- condition: global.prod
234234
name: redis
@@ -253,7 +253,7 @@ entries:
253253
version: 1.5.0
254254
- apiVersion: v3
255255
appVersion: 1.5.0-rc.4
256-
created: "2025-06-03T11:40:13.075958333Z"
256+
created: "2025-06-05T13:58:22.371464119Z"
257257
dependencies:
258258
- condition: global.prod
259259
name: redis
@@ -276,4 +276,4 @@ entries:
276276
urls:
277277
- https://maif.github.io/otoroshi/helm/otoroshi-1.5.0-rc.4.tgz
278278
version: 1.5.0-rc.4
279-
generated: "2025-06-03T11:40:13.066185748Z"
279+
generated: "2025-06-05T13:58:22.365752117Z"

docs/manual/about.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
9696
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
9797
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
98+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
9899
</ul></li>
99100
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
100101
<ul>
@@ -220,6 +221,7 @@
220221
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
221222
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
222223
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
224+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
223225
</ul></li>
224226
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
225227
<ul>

docs/manual/api.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
9696
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
9797
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
98+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
9899
</ul></li>
99100
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
100101
<ul>
@@ -220,6 +221,7 @@
220221
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
221222
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
222223
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
224+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
223225
</ul></li>
224226
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
225227
<ul>

docs/manual/architecture.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
9696
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
9797
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
98+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
9899
</ul></li>
99100
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
100101
<ul>
@@ -220,6 +221,7 @@
220221
<li><a href="topics/green-score.html" class="page">Green Score</a></li>
221222
<li><a href="topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
222223
<li><a href="topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
224+
<li><a href="topics/workflows.html" class="page">Otoroshi Workflows</a></li>
223225
</ul></li>
224226
<li><a href="how-to-s/index.html" class="page">How to&rsquo;s</a>
225227
<ul>

docs/manual/code/openapi.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"info" : {
44
"title" : "Otoroshi Admin API",
55
"description" : "Admin API of the Otoroshi reverse proxy",
6-
"version" : "17.3.0",
6+
"version" : "17.3.2",
77
"contact" : {
88
"name" : "Otoroshi Team",
99
"email" : "oss@maif.fr"
@@ -18,7 +18,7 @@
1818
"description" : "Otoroshi website"
1919
},
2020
"servers" : [ {
21-
"url" : "http://otoroshi-api.oto.tools:35363",
21+
"url" : "http://otoroshi-api.oto.tools:43859",
2222
"description" : "your local otoroshi server"
2323
} ],
2424
"tags" : [ {
@@ -88,8 +88,8 @@
8888
"name" : "apiconsumersubscription",
8989
"description" : "all the operations about the apiconsumersubscription entity"
9090
}, {
91-
"name" : "workflows",
92-
"description" : "all the operations about the workflows entity"
91+
"name" : "workflow",
92+
"description" : "all the operations about the workflow entity"
9393
}, {
9494
"name" : "coraza-config",
9595
"description" : "all the operations about the coraza-config entity"
@@ -7826,7 +7826,7 @@
78267826
},
78277827
"/apis/plugins.otoroshi.io/v1/workflows/_template" : {
78287828
"get" : {
7829-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
7829+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
78307830
"summary" : "Return a template of a resource of kind Workflow",
78317831
"operationId" : "plugins.otoroshi.io.Workflow.template",
78327832
"parameters" : [ ],
@@ -11367,7 +11367,7 @@
1136711367
},
1136811368
"/apis/plugins.otoroshi.io/v1/workflows/_count" : {
1136911369
"get" : {
11370-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
11370+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1137111371
"summary" : "Get number of entity of kind Workflow",
1137211372
"operationId" : "plugins.otoroshi.io.Workflow.count",
1137311373
"parameters" : [ ],
@@ -15849,7 +15849,7 @@
1584915849
},
1585015850
"/apis/plugins.otoroshi.io/v1/workflows/{id}" : {
1585115851
"get" : {
15852-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
15852+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1585315853
"summary" : "Find resource of kind Workflow by its id",
1585415854
"operationId" : "plugins.otoroshi.io.Workflow.findById",
1585515855
"parameters" : [ {
@@ -15909,7 +15909,7 @@
1590915909
}
1591015910
},
1591115911
"put" : {
15912-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
15912+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1591315913
"summary" : "Updates a specific Workflow using its id",
1591415914
"operationId" : "plugins.otoroshi.io.Workflow.updateById",
1591515915
"parameters" : [ {
@@ -15979,7 +15979,7 @@
1597915979
}
1598015980
},
1598115981
"patch" : {
15982-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
15982+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1598315983
"summary" : "Updates (using json-patch) a specific Workflow using its id",
1598415984
"operationId" : "plugins.otoroshi.io.Workflow.pathById",
1598515985
"parameters" : [ {
@@ -16049,7 +16049,7 @@
1604916049
}
1605016050
},
1605116051
"delete" : {
16052-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
16052+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1605316053
"summary" : "Deletes a specific Workflow using its id",
1605416054
"operationId" : "plugins.otoroshi.io.Workflow.deleteById",
1605516055
"parameters" : [ {
@@ -19328,7 +19328,7 @@
1932819328
},
1932919329
"/apis/plugins.otoroshi.io/v1/workflows/_bulk" : {
1933019330
"post" : {
19331-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
19331+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1933219332
"summary" : "Create multiple Workflow at the same time",
1933319333
"operationId" : "plugins.otoroshi.io.Workflow.bulk_create",
1933419334
"parameters" : [ ],
@@ -19393,7 +19393,7 @@
1939319393
}
1939419394
},
1939519395
"put" : {
19396-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
19396+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1939719397
"summary" : "Update multiple Workflow at the same time",
1939819398
"operationId" : "plugins.otoroshi.io.Workflow.bulk_update",
1939919399
"parameters" : [ ],
@@ -19458,7 +19458,7 @@
1945819458
}
1945919459
},
1946019460
"patch" : {
19461-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
19461+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1946219462
"summary" : "Update (using json-patch) multiple Workflow at the same time",
1946319463
"operationId" : "plugins.otoroshi.io.Workflow.bulk_patch",
1946419464
"parameters" : [ ],
@@ -19520,7 +19520,7 @@
1952019520
}
1952119521
},
1952219522
"delete" : {
19523-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
19523+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
1952419524
"summary" : "Delete multiple Workflow at the same time",
1952519525
"operationId" : "plugins.otoroshi.io.Workflow.bulk_delete",
1952619526
"parameters" : [ ],
@@ -20392,7 +20392,7 @@
2039220392
},
2039320393
"/apis/plugins.otoroshi.io/v1/workflows" : {
2039420394
"get" : {
20395-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
20395+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
2039620396
"summary" : "Find all possible Workflow entities",
2039720397
"operationId" : "plugins.otoroshi.io.Workflow.findAll",
2039820398
"parameters" : [ ],
@@ -20446,7 +20446,7 @@
2044620446
}
2044720447
},
2044820448
"post" : {
20449-
"tags" : [ "workflows", "plugins.otoroshi.io" ],
20449+
"tags" : [ "workflow", "plugins.otoroshi.io" ],
2045020450
"summary" : "Creates a Workflow",
2045120451
"operationId" : "plugins.otoroshi.io.Workflow.create",
2045220452
"parameters" : [ ],
@@ -27213,10 +27213,16 @@
2721327213
"properties" : {
2721427214
"x$1" : {
2721527215
"type" : "number"
27216+
},
27217+
"x$2" : {
27218+
"type" : "number"
27219+
},
27220+
"x$3" : {
27221+
"type" : "number"
2721627222
}
2721727223
},
2721827224
"title" : "Local time",
27219-
"required" : [ "x$1" ]
27225+
"required" : [ "x$1", "x$2", "x$3" ]
2722027226
},
2722127227
"mappingsettings" : {
2722227228
"type" : "object",

docs/manual/content-pretty.json

Lines changed: 17 additions & 10 deletions
Large diffs are not rendered by default.

docs/manual/content.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/manual/deploy/aws.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<li><a href="../topics/green-score.html" class="page">Green Score</a></li>
9696
<li><a href="../topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
9797
<li><a href="../topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
98+
<li><a href="../topics/workflows.html" class="page">Otoroshi Workflows</a></li>
9899
</ul></li>
99100
<li><a href="../how-to-s/index.html" class="page">How to&rsquo;s</a>
100101
<ul>
@@ -220,6 +221,7 @@
220221
<li><a href="../topics/green-score.html" class="page">Green Score</a></li>
221222
<li><a href="../topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
222223
<li><a href="../topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
224+
<li><a href="../topics/workflows.html" class="page">Otoroshi Workflows</a></li>
223225
</ul></li>
224226
<li><a href="../how-to-s/index.html" class="page">How to&rsquo;s</a>
225227
<ul>

docs/manual/deploy/clever-cloud.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<li><a href="../topics/green-score.html" class="page">Green Score</a></li>
9696
<li><a href="../topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
9797
<li><a href="../topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
98+
<li><a href="../topics/workflows.html" class="page">Otoroshi Workflows</a></li>
9899
</ul></li>
99100
<li><a href="../how-to-s/index.html" class="page">How to&rsquo;s</a>
100101
<ul>
@@ -220,6 +221,7 @@
220221
<li><a href="../topics/green-score.html" class="page">Green Score</a></li>
221222
<li><a href="../topics/http-listeners.html" class="page">Custom HTTP Listeners</a></li>
222223
<li><a href="../topics/deprecating-sd.html" class="page">Sunsetting Service Descriptors</a></li>
224+
<li><a href="../topics/workflows.html" class="page">Otoroshi Workflows</a></li>
223225
</ul></li>
224226
<li><a href="../how-to-s/index.html" class="page">How to&rsquo;s</a>
225227
<ul>

0 commit comments

Comments
 (0)