feat: extract flows and templates #984
Conversation
|
Totally agree, |
loicmathieu
force-pushed
the
extract-flows-and-templates
branch
7 times, most recently
from
cbf4d51 to
acfeaed
Compare
|
|
||
| try(DefaultHttpClient client = client()) { | ||
| MutableHttpRequest<Object> request = HttpRequest | ||
| .GET("/api/v1/flows/extract/by_query?namespace=" + namespace).accept(MediaType.APPLICATION_OCTET_STREAM); |
There was a problem hiding this comment.
| .GET("/api/v1/flows/extract/by_query?namespace=" + namespace).accept(MediaType.APPLICATION_OCTET_STREAM); | |
| .GET("/api/v1/flows/extract/query?namespace=" + namespace).accept(MediaType.APPLICATION_OCTET_STREAM); |
There was a problem hiding this comment.
Well, see your comment bellow
Totally agree, /extract/by-ids and /extract/by-query is better I think
I'm OK to change it but as extract is a verb by-query reads better than just query.
There was a problem hiding this comment.
Moreover, if we keep by-ids we should use by-query
| @@ -25,6 +31,16 @@ | |||
| @ToString | |||
| @EqualsAndHashCode | |||
| public class Template implements DeletedInterface { | |||
|
|
|||
| private static final ObjectMapper jsonMapper = JacksonMapper.ofJson().copy() | |||
There was a problem hiding this comment.
Too many duplicate from flow
| @@ -93,6 +109,23 @@ public Optional<ConstraintViolationException> validateUpdate(Template updated) { | |||
| } | |||
| } | |||
|
|
|||
| public String generateSource() { | |||
There was a problem hiding this comment.
this method is not necessary, a simple mapper will generate the source on templates
There was a problem hiding this comment.
Yes, I setup the object mapper once for all and use it directly.
By the way, I think the same can be done on the flow class, as the Flow.generateSource() method is now only used in tests this should be fine to change it the same way I did for templates.
| @@ -416,4 +421,59 @@ public List<ValidateConstraintViolation> validateFlows( | |||
| }) | |||
| .collect(Collectors.toList()); | |||
| } | |||
|
|
|||
| @ExecuteOn(TaskExecutors.IO) | |||
| @Get(uri = "/extract/by_query", produces = MediaType.APPLICATION_OCTET_STREAM) | |||
There was a problem hiding this comment.
| @Get(uri = "/extract/by_query", produces = MediaType.APPLICATION_OCTET_STREAM) | |
| @Get(uri = "/extract/query", produces = MediaType.APPLICATION_OCTET_STREAM) |
webserver/src/main/java/io/kestra/webserver/controllers/FlowController.java
Outdated
Show resolved
Hide resolved
| ZipOutputStream archive = new ZipOutputStream(bos)) { | ||
|
|
||
| List<FlowWithSource> toExtract = flowRepository.findWithSource(query, namespace, RequestUtils.toMap(labels)); | ||
| for(var flowWithSource : toExtract) { |
There was a problem hiding this comment.
too many duplication, create a service that create the zip
There was a problem hiding this comment.
We cannot share the zip code between template and flow easily so I create private methods in each class to avoid duplication (this was my originla plan but I forgot to do it).
loicmathieu
force-pushed
the
extract-flows-and-templates
branch
2 times, most recently
from
1f6706b to
924f391
Compare
loicmathieu
force-pushed
the
extract-flows-and-templates
branch
3 times, most recently
from
e1a4b67 to
4ef4aba
Compare
tchiotludo
force-pushed
the
extract-flows-and-templates
branch
3 times, most recently
from
cdbd192 to
9d9c672
Compare
So that we can extract flows and templates from different namespace in one call.
tchiotludo
force-pushed
the
extract-flows-and-templates
branch
from
f840eed to
b690831
Compare
Allow extracting Flows and Templates