Compare commits

...

19 Commits

Author SHA1 Message Date
Loïc Mathieu
b3bbedaeff chore(system): replace DSL.trueCondition by DSL.noCondition
jOOQ will then generates a query with no WHERE clause or no AND clause instead of WHERE true or WHERE 1=1
2025-11-19 13:35:31 +01:00
Piyush Bhaskar
312ec2c36b chore(core): remove import warning (#13071) 2025-11-19 17:27:00 +05:30
Piyush Bhaskar
d57150e69c chore(test): fix frontend failing test (#13070) 2025-11-19 17:23:16 +05:30
Miloš Paunović
4b25232d4e build(core): remove unused dependency (#13064) 2025-11-19 12:33:19 +01:00
Loïc Mathieu
1d1a065833 fix(tests): lower termination grace period
If a test mis-behave, for ex starting an execution but not terminating it, as the default termination grace period is 5mn it can take very long time to wait for post-test terminaison.
Switching to a termination grace period of 5s may help.

I also detect that the ExecutionControllerRunner test when launching the test suite, would not properly kill the `sleep-long` flow so waiting for it to complete, or the termination grace period. When a test that use this flow is launched separatly it works properly. As a safety net I reduce the sleep from 5mn to 30s.
2025-11-19 11:58:06 +01:00
dependabot[bot]
d6ecbadee1 build(deps): bump kafkaVersion from 4.1.0 to 4.1.1
Bumps `kafkaVersion` from 4.1.0 to 4.1.1.

Updates `org.apache.kafka:kafka-clients` from 4.1.0 to 4.1.1

Updates `org.apache.kafka:kafka-streams` from 4.1.0 to 4.1.1

Updates `org.apache.kafka:kafka-streams-test-utils` from 4.1.0 to 4.1.1

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-version: 4.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.kafka:kafka-streams
  dependency-version: 4.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.kafka:kafka-streams-test-utils
  dependency-version: 4.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:51:01 +01:00
dependabot[bot]
205605060d build(deps): bump com.google.cloud:libraries-bom from 26.71.0 to 26.72.0
Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.71.0 to 26.72.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.71.0...v26.72.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-version: 26.72.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:50:38 +01:00
dependabot[bot]
6ef3a00e16 build(deps): bump peter-evans/repository-dispatch from 4.0.0 to 4.0.1
Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/peter-evans/repository-dispatch/releases)
- [Commits](5fc4efd1a4...28959ce8df)

---
updated-dependencies:
- dependency-name: peter-evans/repository-dispatch
  dependency-version: 4.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:48:57 +01:00
dependabot[bot]
f70d612878 build(deps): bump actions/github-script from 7 to 8
Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:48:35 +01:00
dependabot[bot]
0b345c03d1 build(deps): bump net.e175.klaus:zip-prefixer from 0.3.1 to 0.4.0
Bumps [net.e175.klaus:zip-prefixer](https://github.com/klausbrunner/zip-prefixer) from 0.3.1 to 0.4.0.
- [Commits](https://github.com/klausbrunner/zip-prefixer/commits)

---
updated-dependencies:
- dependency-name: net.e175.klaus:zip-prefixer
  dependency-version: 0.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:48:03 +01:00
dependabot[bot]
ecb508f797 build(deps): bump io.qameta.allure:allure-bom from 2.30.0 to 2.31.0
Bumps [io.qameta.allure:allure-bom](https://github.com/allure-framework/allure-java) from 2.30.0 to 2.31.0.
- [Release notes](https://github.com/allure-framework/allure-java/releases)
- [Commits](https://github.com/allure-framework/allure-java/compare/2.30.0...2.31.0)

---
updated-dependencies:
- dependency-name: io.qameta.allure:allure-bom
  dependency-version: 2.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:47:43 +01:00
dependabot[bot]
38caea2568 build(deps): bump flyingSaucerVersion from 10.0.3 to 10.0.4
Bumps `flyingSaucerVersion` from 10.0.3 to 10.0.4.

Updates `org.xhtmlrenderer:flying-saucer-core` from 10.0.3 to 10.0.4
- [Release notes](https://github.com/flyingsaucerproject/flyingsaucer/releases)
- [Changelog](https://github.com/flyingsaucerproject/flyingsaucer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyingsaucerproject/flyingsaucer/compare/v10.0.3...v10.0.4)

Updates `org.xhtmlrenderer:flying-saucer-pdf` from 10.0.3 to 10.0.4
- [Release notes](https://github.com/flyingsaucerproject/flyingsaucer/releases)
- [Changelog](https://github.com/flyingsaucerproject/flyingsaucer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyingsaucerproject/flyingsaucer/compare/v10.0.3...v10.0.4)

---
updated-dependencies:
- dependency-name: org.xhtmlrenderer:flying-saucer-core
  dependency-version: 10.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.xhtmlrenderer:flying-saucer-pdf
  dependency-version: 10.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:47:22 +01:00
dependabot[bot]
cdad732576 build(deps): bump org.wiremock:wiremock-jetty12 from 3.13.1 to 3.13.2
Bumps [org.wiremock:wiremock-jetty12](https://github.com/wiremock/wiremock) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/wiremock/wiremock/releases)
- [Commits](https://github.com/wiremock/wiremock/compare/3.13.1...3.13.2)

---
updated-dependencies:
- dependency-name: org.wiremock:wiremock-jetty12
  dependency-version: 3.13.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:46:15 +01:00
dependabot[bot]
0dd4cb963f build(deps): bump org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0
Bumps org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:45:46 +01:00
dependabot[bot]
c35ca82356 build(deps): bump software.amazon.awssdk:bom from 2.38.4 to 2.38.9
Bumps software.amazon.awssdk:bom from 2.38.4 to 2.38.9.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-version: 2.38.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 11:45:21 +01:00
Miloš Paunović
db6cb93df4 chore(deps): regular dependency update (#13065)
Performing a weekly round of dependency updates in the NPM ecosystem to keep everything up to date.
2025-11-19 09:45:28 +01:00
YannC
1f8d2ea918 fix: use pull request head sha instead of commit.sha (#13063) 2025-11-19 09:34:34 +01:00
dependabot[bot]
3c09a38eed build(deps): bump the patch group in /ui with 6 updates (#13057)
Bumps the patch group in /ui with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [el-table-infinite-scroll](https://github.com/yujinpan/el-table-infinite-scroll) | `3.0.7` | `3.0.8` |
| [element-plus](https://github.com/element-plus/element-plus) | `2.11.7` | `2.11.8` |
| [@vitejs/plugin-vue](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue) | `6.0.1` | `6.0.2` |
| [@vitejs/plugin-vue-jsx](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue-jsx) | `5.1.1` | `5.1.2` |
| [rolldown-vite](https://github.com/vitejs/rolldown-vite/tree/HEAD/packages/vite) | `7.2.5` | `7.2.6` |
| [vue-tsc](https://github.com/vuejs/language-tools/tree/HEAD/packages/tsc) | `3.1.3` | `3.1.4` |


Updates `el-table-infinite-scroll` from 3.0.7 to 3.0.8
- [Changelog](https://github.com/yujinpan/el-table-infinite-scroll/blob/v3/CHANGELOG.md)
- [Commits](https://github.com/yujinpan/el-table-infinite-scroll/compare/v3.0.7...v3.0.8)

Updates `element-plus` from 2.11.7 to 2.11.8
- [Release notes](https://github.com/element-plus/element-plus/releases)
- [Changelog](https://github.com/element-plus/element-plus/blob/dev/CHANGELOG.en-US.md)
- [Commits](https://github.com/element-plus/element-plus/compare/2.11.7...2.11.8)

Updates `@vitejs/plugin-vue` from 6.0.1 to 6.0.2
- [Release notes](https://github.com/vitejs/vite-plugin-vue/releases)
- [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite-plugin-vue/commits/plugin-vue@6.0.2/packages/plugin-vue)

Updates `@vitejs/plugin-vue-jsx` from 5.1.1 to 5.1.2
- [Release notes](https://github.com/vitejs/vite-plugin-vue/releases)
- [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue-jsx/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite-plugin-vue/commits/plugin-vue@5.1.2/packages/plugin-vue-jsx)

Updates `rolldown-vite` from 7.2.5 to 7.2.6
- [Release notes](https://github.com/vitejs/rolldown-vite/releases)
- [Changelog](https://github.com/vitejs/rolldown-vite/blob/rolldown-vite/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/rolldown-vite/commits/v7.2.6/packages/vite)

Updates `vue-tsc` from 3.1.3 to 3.1.4
- [Release notes](https://github.com/vuejs/language-tools/releases)
- [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/language-tools/commits/v3.1.4/packages/tsc)

---
updated-dependencies:
- dependency-name: el-table-infinite-scroll
  dependency-version: 3.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch
- dependency-name: element-plus
  dependency-version: 2.11.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch
- dependency-name: "@vitejs/plugin-vue"
  dependency-version: 6.0.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: patch
- dependency-name: "@vitejs/plugin-vue-jsx"
  dependency-version: 5.1.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: patch
- dependency-name: rolldown-vite
  dependency-version: 7.2.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: patch
- dependency-name: vue-tsc
  dependency-version: 3.1.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-11-19 08:54:11 +01:00
dependabot[bot]
0525e3ece6 build(deps): bump the build group in /ui with 6 updates (#13044)
Bumps the build group in /ui with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@rollup/rollup-darwin-arm64](https://github.com/rollup/rollup) | `4.53.2` | `4.53.3` |
| [@rollup/rollup-darwin-x64](https://github.com/rollup/rollup) | `4.53.2` | `4.53.3` |
| [@rollup/rollup-linux-x64-gnu](https://github.com/rollup/rollup) | `4.53.2` | `4.53.3` |
| [@swc/core-darwin-arm64](https://github.com/swc-project/swc) | `1.15.1` | `1.15.2` |
| [@swc/core-darwin-x64](https://github.com/swc-project/swc) | `1.15.1` | `1.15.2` |
| [@swc/core-linux-x64-gnu](https://github.com/swc-project/swc) | `1.15.1` | `1.15.2` |


Updates `@rollup/rollup-darwin-arm64` from 4.53.2 to 4.53.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.53.2...v4.53.3)

Updates `@rollup/rollup-darwin-x64` from 4.53.2 to 4.53.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.53.2...v4.53.3)

Updates `@rollup/rollup-linux-x64-gnu` from 4.53.2 to 4.53.3
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.53.2...v4.53.3)

Updates `@swc/core-darwin-arm64` from 1.15.1 to 1.15.2
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.15.1...v1.15.2)

Updates `@swc/core-darwin-x64` from 1.15.1 to 1.15.2
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.15.1...v1.15.2)

Updates `@swc/core-linux-x64-gnu` from 1.15.1 to 1.15.2
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.15.1...v1.15.2)

---
updated-dependencies:
- dependency-name: "@rollup/rollup-darwin-arm64"
  dependency-version: 4.53.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
- dependency-name: "@rollup/rollup-darwin-x64"
  dependency-version: 4.53.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
- dependency-name: "@rollup/rollup-linux-x64-gnu"
  dependency-version: 4.53.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
- dependency-name: "@swc/core-darwin-arm64"
  dependency-version: 1.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
- dependency-name: "@swc/core-darwin-x64"
  dependency-version: 1.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
- dependency-name: "@swc/core-linux-x64-gnu"
  dependency-version: 1.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-11-19 08:31:51 +01:00
43 changed files with 1757 additions and 2810 deletions

View File

@@ -28,7 +28,7 @@ jobs:
steps:
# Targeting develop branch from develop
- name: Trigger EE Workflow (develop push, no payload)
uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
with:
token: ${{ secrets.GH_PERSONAL_TOKEN }}

View File

@@ -16,7 +16,7 @@ jobs:
- name: Check EE repo for branch with same name
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false }}
id: check-ee-branch
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GH_PERSONAL_TOKEN }}
script: |
@@ -40,7 +40,7 @@ jobs:
# Targeting pull request (only if not from a fork and EE has no branch with same name)
- name: Trigger EE Workflow (pull request, with payload)
uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
if: ${{ github.event_name == 'pull_request'
&& github.event.pull_request.number != ''
&& github.event.pull_request.head.repo.fork == false
@@ -50,7 +50,7 @@ jobs:
repository: kestra-io/kestra-ee
event-type: "oss-updated"
client-payload: >-
{"commit_sha":"${{ github.sha }}","pr_repo":"${{ github.repository }}"}
{"commit_sha":"${{ github.event.pull_request.head.sha }}","pr_repo":"${{ github.repository }}"}
file-changes:
if: ${{ github.event.pull_request.draft == false }}

View File

@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath "net.e175.klaus:zip-prefixer:0.3.1"
classpath "net.e175.klaus:zip-prefixer:0.4.0"
}
}

View File

@@ -21,6 +21,7 @@ kestra:
server:
liveness:
enabled: false
termination-grace-period: 5s
micronaut:
http:
services:

View File

@@ -58,7 +58,8 @@ kestra:
purge:
initial-delay: 1h
fixed-delay: 1d
retention: 30d
retention: 30dPeriod
termination-grace-period: 5s
anonymous-usage-report:
enabled: false

View File

@@ -4,7 +4,7 @@ namespace: io.kestra.tests
tasks:
- id: sleep-long
type: io.kestra.plugin.core.flow.Sleep
duration: PT300S
duration: PT30S
afterExecution:
- id: output

View File

@@ -54,6 +54,7 @@ kestra:
- "/api/v1/executions/webhook/"
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

View File

@@ -16,6 +16,6 @@ public abstract class H2DashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -32,7 +32,7 @@ public abstract class H2ExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -64,6 +64,6 @@ public abstract class H2ExecutionRepositoryService {
if (!inConditions.isEmpty()) {
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -31,7 +31,7 @@ public abstract class H2FlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -54,6 +54,6 @@ public abstract class H2FlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -16,6 +16,6 @@ public abstract class H2KvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -76,7 +76,7 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
if (fields.size() > 1) {
@@ -105,12 +105,12 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
.sort(select, pageable)
.asTable("page")
)
.where(DSL.trueCondition()),
.where(DSL.noCondition()),
pageable
)
.fetch();
Integer totalCount = results.size() > 0 ? results.getFirst().get("total_count", Integer.class) : 0;
Integer totalCount = !results.isEmpty() ? results.getFirst().get("total_count", Integer.class) : 0;
List<E> map = results
.map((Record record) -> mapper.map((R) record));

View File

@@ -19,6 +19,7 @@ kestra:
server:
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

View File

@@ -17,6 +17,6 @@ public abstract class MysqlDashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(Arrays.asList("title"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -27,7 +27,7 @@ public abstract class MysqlExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -63,7 +63,7 @@ public abstract class MysqlExecutionRepositoryService {
if(!inConditions.isEmpty()){
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -27,7 +27,7 @@ public abstract class MysqlFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -45,6 +45,6 @@ public abstract class MysqlFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -16,6 +16,6 @@ public abstract class MysqlKvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("name"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -43,7 +43,7 @@ public class MysqlRepository<T> extends AbstractJdbcRepository<T> {
@Override
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
String match = Arrays

View File

@@ -33,7 +33,7 @@ public class MysqlTriggerRepository extends AbstractJdbcTriggerRepository {
@Override
protected Condition fullTextCondition(String query) {
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
}
@Override

View File

@@ -25,6 +25,7 @@ kestra:
server:
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

View File

@@ -17,6 +17,6 @@ public abstract class PostgresDashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(Collections.singletonList("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -26,7 +26,7 @@ public abstract class PostgresExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -60,7 +60,7 @@ public abstract class PostgresExecutionRepositoryService {
if (!inConditions.isEmpty()) {
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition statesFilter(List<State.Type> state) {

View File

@@ -28,7 +28,7 @@ public abstract class PostgresFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -49,7 +49,7 @@ public abstract class PostgresFlowRepositoryService {
}
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}

View File

@@ -16,6 +16,6 @@ public abstract class PostgresKvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

View File

@@ -42,7 +42,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
@Override
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
if (fields.size() > 1) {
@@ -106,7 +106,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
.sort(select, pageable)
.asTable("page")
)
.where(DSL.trueCondition()),
.where(DSL.noCondition()),
pageable
)
.fetch();

View File

@@ -40,6 +40,7 @@ kestra:
server:
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

View File

@@ -74,7 +74,7 @@ public abstract class AbstractJdbcRepository<T> {
.of(io.kestra.jdbc.repository.AbstractJdbcRepository.field("value"), MAPPER.writeValueAsString(entity))
);
}
public int count(Condition condition) {
return getDslContextWrapper()
.transactionResult(configuration -> DSL
@@ -85,7 +85,7 @@ public abstract class AbstractJdbcRepository<T> {
.fetchOne(0, Integer.class)
);
}
public void persist(T entity) {
this.persist(entity, null);
}
@@ -223,8 +223,7 @@ public abstract class AbstractJdbcRepository<T> {
.from(this
.sort(select, Pageable.from(Sort.of(Order.asc(orderField))))
.asTable("page")
)
.where(DSL.trueCondition());
);
}
@SneakyThrows

View File

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
* NOTE: it uses the <code>defaultFilter(tenantId)</code> for querying.
* If the child repository uses a default filter, it should override it.
* <p>
* For example, to avoid supporting allowDeleted:
* For example, to avoid supporting the <code>deleted</code> column:
* <pre>{@code
* @Override
* protected Condition defaultFilter(String tenantId) {
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
*
* @Override
* protected Condition defaultFilter() {
* return DSL.trueCondition();
* return DSL.noCondition();
* }
* }</pre>
*

View File

@@ -770,18 +770,16 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcCrudRe
.from(this.jdbcRepository.getTable())
.where(this.defaultFilter(tenantId))
.and(NORMAL_KIND_CONDITION)
.and(DSL.or(
ListUtils.emptyOnNull(flows).isEmpty() ?
DSL.trueCondition()
.and(ListUtils.isEmpty(flows) ?
DSL.noCondition()
:
DSL.or(
flows.stream()
.map(flow -> DSL.and(
field("namespace").eq(flow.getNamespace()),
field("flow_id").eq(flow.getId())
))
.toList()
)
DSL.or(
flows.stream()
.map(flow -> DSL.and(
field("namespace").eq(flow.getNamespace()),
field("flow_id").eq(flow.getId())
))
.toList()
)
);

View File

@@ -55,7 +55,7 @@ public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcCrudR
boolean allowExpired,
FetchVersion fetchBehavior
) {
var condition = allowExpired ? DSL.trueCondition() : DSL.or(
var condition = allowExpired ? DSL.noCondition() : DSL.or(
field("expiration_date").greaterThan(Instant.now()),
field("expiration_date").isNull());

View File

@@ -34,12 +34,12 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
@Override
public Optional<Setting> findByKey(String key) {
return findOne(DSL.trueCondition(), field("key").eq(key));
return findOne(DSL.noCondition(), field("key").eq(key));
}
@Override
public List<Setting> findAll() {
return findAll(DSL.trueCondition());
return findAll(DSL.noCondition());
}
@Override
@@ -72,6 +72,6 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
@Override
protected Condition defaultFilter() {
return DSL.trueCondition();
return DSL.noCondition();
}
}

View File

@@ -64,7 +64,7 @@ public abstract class AbstractJdbcTemplateRepository extends AbstractJdbcCrudRep
}
private Condition computeCondition(@Nullable String query, @Nullable String namespace) {
Condition condition = DSL.trueCondition();
Condition condition = DSL.noCondition();
if (query != null) {
condition = condition.and(this.findCondition(query));

View File

@@ -72,7 +72,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
@Override
public Optional<Trigger> findLast(TriggerContext trigger) {
return findOne(DSL.trueCondition(), field("key").eq(trigger.uid()));
return findOne(DSL.noCondition(), field("key").eq(trigger.uid()));
}
@Override
@@ -82,7 +82,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
public List<Trigger> findByNextExecutionDateReadyForAllTenants(ZonedDateTime now, ScheduleContextInterface scheduleContextInterface) {
JdbcSchedulerContext jdbcSchedulerContext = (JdbcSchedulerContext) scheduleContextInterface;
return jdbcSchedulerContext.getContext()
.select(field("value"))
.from(this.jdbcRepository.getTable())
@@ -98,9 +98,9 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
.fetch()
.map(r -> this.jdbcRepository.deserialize(r.get("value", String.class)));
}
public List<Trigger> findByNextExecutionDateReadyButLockedTriggers(ZonedDateTime now) {
return this.jdbcRepository.getDslContextWrapper()
.transactionResult(configuration -> DSL.using(configuration)
.select(field("value"))
@@ -115,7 +115,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
.fetch()
.map(r -> this.jdbcRepository.deserialize(r.get("value", String.class))));
}
protected Temporal toNextExecutionTime(ZonedDateTime now) {
return now.toOffsetDateTime();
}
@@ -231,7 +231,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
}
protected Condition fullTextCondition(String query) {
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
}
@Override
@@ -246,7 +246,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
@Override
protected Condition defaultFilter() {
return DSL.trueCondition();
return DSL.noCondition();
}
@Override

View File

@@ -68,7 +68,7 @@ public abstract class JdbcFlowRepositoryService {
});
}
return conditions.size() == 0 ? DSL.trueCondition() : DSL.and(conditions);
return conditions.size() == 0 ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query) {

View File

@@ -17,10 +17,10 @@ dependencies {
def mavenResolverVersion = "2.0.10"
def jollydayVersion = "1.5.6"
def jsonschemaVersion = "4.38.0"
def kafkaVersion = "4.1.0"
def kafkaVersion = "4.1.1"
def opensearchVersion = "3.2.0"
def opensearchRestVersion = "3.3.2"
def flyingSaucerVersion = "10.0.3"
def flyingSaucerVersion = "10.0.4"
def jacksonVersion = "2.20.1"
def jacksonAnnotationsVersion = "2.20"
def jugVersion = "5.1.1"
@@ -31,11 +31,11 @@ dependencies {
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
api enforcedPlatform("org.slf4j:slf4j-api:$slf4jVersion")
api platform("io.micronaut.platform:micronaut-platform:4.9.4")
api platform("io.qameta.allure:allure-bom:2.30.0")
api platform("io.qameta.allure:allure-bom:2.31.0")
// we define cloud bom here for GCP, Azure and AWS so they are aligned for all plugins that use them (secret, storage, oss and ee plugins)
api platform('com.google.cloud:libraries-bom:26.71.0')
api platform('com.google.cloud:libraries-bom:26.72.0')
api platform("com.azure:azure-sdk-bom:1.3.2")
api platform('software.amazon.awssdk:bom:2.38.4')
api platform('software.amazon.awssdk:bom:2.38.9')
api platform("dev.langchain4j:langchain4j-bom:$langchain4jVersion")
api platform("dev.langchain4j:langchain4j-community-bom:$langchain4jCommunityVersion")
@@ -90,7 +90,7 @@ dependencies {
api group: 'net.thisptr', name: 'jackson-jq', version: '1.6.0'
api group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'
api group: 'commons-io', name: 'commons-io', version: '2.21.0'
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.19.0'
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0'
api 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
api 'ch.qos.logback.contrib:logback-jackson:0.1.5'
api group: 'org.apache.maven.resolver', name: 'maven-resolver-impl', version: mavenResolverVersion
@@ -140,7 +140,7 @@ dependencies {
api 'org.hamcrest:hamcrest:3.0'
api 'org.hamcrest:hamcrest-library:3.0'
api group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
api "org.wiremock:wiremock-jetty12:3.13.1"
api "org.wiremock:wiremock-jetty12:3.13.2"
api "org.apache.kafka:kafka-streams-test-utils:$kafkaVersion"
api "com.microsoft.playwright:playwright:1.56.0"
api "org.awaitility:awaitility:4.3.0"

View File

@@ -9,4 +9,5 @@ kestra:
poll-switch-interval: 5s
server:
liveness:
enabled: false
enabled: false
termination-grace-period: 5s

View File

@@ -13,4 +13,5 @@ kestra:
poll-switch-interval: 5s
server:
liveness:
enabled: false
enabled: false
termination-grace-period: 5s

View File

@@ -54,6 +54,7 @@ kestra:
- "/api/v1/executions/webhook/"
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

4391
ui/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -38,8 +38,7 @@
"cronstrue": "^3.9.0",
"cytoscape": "^3.33.0",
"dagre": "^0.8.5",
"el-table-infinite-scroll": "^3.0.7",
"element-plus": "2.11.7",
"element-plus": "2.11.8",
"humanize-duration": "^3.33.1",
"js-yaml": "^4.1.1",
"lodash": "^4.17.21",
@@ -98,8 +97,8 @@
"@types/testing-library__jest-dom": "^6.0.0",
"@types/testing-library__user-event": "^4.2.0",
"@typescript-eslint/parser": "^8.46.4",
"@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.1",
"@vitejs/plugin-vue": "^6.0.2",
"@vitejs/plugin-vue-jsx": "^5.1.2",
"@vitest/browser": "^3.2.4",
"@vitest/coverage-v8": "^3.2.4",
"@vue/eslint-config-prettier": "^10.2.0",
@@ -131,26 +130,23 @@
"uuid": "^13.0.0",
"vite": "npm:rolldown-vite@latest",
"vitest": "^3.2.4",
"vue-tsc": "^3.1.3"
"vue-tsc": "^3.1.4"
},
"optionalDependencies": {
"@esbuild/darwin-arm64": "^0.27.0",
"@esbuild/darwin-x64": "^0.27.0",
"@esbuild/linux-x64": "^0.27.0",
"@rollup/rollup-darwin-arm64": "^4.53.2",
"@rollup/rollup-darwin-x64": "^4.53.2",
"@rollup/rollup-linux-x64-gnu": "^4.53.2",
"@swc/core-darwin-arm64": "^1.15.1",
"@swc/core-darwin-x64": "^1.15.1",
"@swc/core-linux-x64-gnu": "^1.15.1"
"@rollup/rollup-darwin-arm64": "^4.53.3",
"@rollup/rollup-darwin-x64": "^4.53.3",
"@rollup/rollup-linux-x64-gnu": "^4.53.3",
"@swc/core-darwin-arm64": "^1.15.2",
"@swc/core-darwin-x64": "^1.15.2",
"@swc/core-linux-x64-gnu": "^1.15.2"
},
"overrides": {
"bootstrap": {
"@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7"
},
"el-table-infinite-scroll": {
"vue": "^3.5.21"
},
"storybook": "$storybook",
"vite": "npm:rolldown-vite@latest"
},

View File

@@ -19,7 +19,7 @@
</template>
<script setup lang="ts">
import {ref, onMounted, onUnmounted, onUpdated, watch, withDefaults} from "vue";
import {ref, onMounted, onUnmounted, onUpdated, watch} from "vue";
const props = withDefaults(defineProps<{
showSelection?: boolean;

View File

@@ -172,6 +172,7 @@ kestra:
- "/api/v1/main/executions/webhook/"
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h

View File

@@ -54,6 +54,7 @@ kestra:
- "/api/v1/executions/webhook/"
liveness:
enabled: false
termination-grace-period: 5s
service:
purge:
initial-delay: 1h