feat(flow): EmbeddedFlow task

Adds an EmbeddedFlow that allow to embed subflow tasks into a parent tasks.

Fixes #6518

.devcontainer/Dockerfile

@@ -37,16 +37,16 @@ ARG OS_ARCHITECTURE
 RUN mkdir -p /usr/java
 RUN echo "Building on platform: $BUILDPLATFORM"
 RUN case "$BUILDPLATFORM" in \
-  "linux/amd64") OS_ARCHITECTURE="x64_linux" ;; \
-  "linux/arm64") OS_ARCHITECTURE="aarch64_linux" ;; \
-  "darwin/amd64") OS_ARCHITECTURE="x64_mac" ;; \
-  "darwin/arm64") OS_ARCHITECTURE="aarch64_mac" ;; \
+  "linux/amd64") OS_ARCHITECTURE="linux-x64" ;; \
+  "linux/arm64") OS_ARCHITECTURE="linux-aarch64" ;; \
+  "darwin/amd64") OS_ARCHITECTURE="macos-x64" ;; \
+  "darwin/arm64") OS_ARCHITECTURE="macos-aarch64" ;; \
   *) echo "Unsupported BUILDPLATFORM: $BUILDPLATFORM" && exit 1 ;; \
   esac && \
-  wget "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.7%2B6/OpenJDK21U-jdk_${OS_ARCHITECTURE}_hotspot_21.0.7_6.tar.gz" && \
-  mv OpenJDK21U-jdk_${OS_ARCHITECTURE}_hotspot_21.0.7_6.tar.gz openjdk-21.0.7.tar.gz
-RUN tar -xzvf openjdk-21.0.7.tar.gz && \
-  mv jdk-21.0.7+6 jdk-21 && \
+  wget "https://aka.ms/download-jdk/microsoft-jdk-21.0.6-$OS_ARCHITECTURE.tar.gz" && \
+  mv "microsoft-jdk-21.0.6-$OS_ARCHITECTURE.tar.gz" microsoft-jdk-21.0.6.tar.gz
+RUN tar -xzvf microsoft-jdk-21.0.6.tar.gz && \
+  mv jdk-21.0.6+7 jdk-21 && \
   mv jdk-21 /usr/java/
 ENV JAVA_HOME=/usr/java/jdk-21
 ENV PATH="$PATH:$JAVA_HOME/bin"

.devcontainer/README.md

@@ -27,6 +27,11 @@ In the meantime, you can move onto the next step...
 
 - Create a `.env.development.local` file in the `ui` folder and paste the following:
 
+```bash
+# This lets the frontend know what the backend URL is but you are free to change this to your actual server URL e.g. hosted version of Kestra.
+VITE_APP_API_URL=http://localhost:8080
+```
+
 - Navigate into the `ui` folder and run `npm install` to install the dependencies for the frontend project.
 
 - Now go to the `cli/src/main/resources` folder and create a `application-override.yml` file.
@@ -69,6 +74,9 @@ kestra:
       path: /tmp/kestra-wd/tmp
   anonymous-usage-report:
     enabled: false
+  server:
+    basic-auth:
+      enabled: false
 
 datasources:
   postgres:

.devcontainer/devcontainer.json

@@ -39,7 +39,7 @@
         "yoavbls.pretty-ts-errors",
         "github.vscode-github-actions",
         "vscjava.vscode-java-pack",
-        "docker.docker"
+        "ms-azuretools.vscode-docker"
       ]
     }
   }

.github/CONTRIBUTING.md

@@ -80,6 +80,7 @@ python3 -m pip install virtualenv
 The frontend is made with [Vue.js](https://vuejs.org/) and located on the `/ui` folder.
 
 - `npm install`
+- create a file `ui/.env.development.local` with content `VITE_APP_API_URL=http://localhost:8080` (or your actual server url)
 - `npm run dev` will start the development server with hot reload.
 - The server start by default on port 5173 and is reachable on `http://localhost:5173`
 - You can run `npm run build` in order to build the front-end that will be delivered from the backend (without running the `npm run dev`) above.

.github/dependabot.yml

@@ -1,31 +1,26 @@
 # See GitHub's docs for more information on this file:
 # https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
+      # Check for updates to GitHub Actions every week
       interval: "weekly"
-      day: "wednesday"
-      time: "08:00"
-      timezone: "Europe/Paris"
-    open-pull-requests-limit: 50
     labels:
       - "dependency-upgrade"
+    open-pull-requests-limit: 50
 
   # Maintain dependencies for Gradle modules
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
+      # Check for updates to Gradle modules every week
       interval: "weekly"
-      day: "wednesday"
-      time: "08:00"
-      timezone: "Europe/Paris"
-    open-pull-requests-limit: 50
     labels:
       - "dependency-upgrade"
+    open-pull-requests-limit: 50
 
   # Maintain dependencies for NPM modules
   - package-ecosystem: "npm"
@@ -36,15 +31,8 @@ updates:
       time: "08:00"
       timezone: "Europe/Paris"
     open-pull-requests-limit: 50
-    labels:
-      - "dependency-upgrade"
+    labels: ["dependency-upgrade"]
     ignore:
-      # Ignore updates of version 1.x, as we're using the beta of 2.x (still in beta)
+      # Ignore updates of version 1.x, as we're using beta of 2.x
       - dependency-name: "vue-virtual-scroller"
-        versions:
-          - "1.x"
-
-      # Ignore updates to monaco-yaml, version is pinned to 5.3.1 due to patch-package script additions
-      - dependency-name: "monaco-yaml"
-        versions:
-          - ">=5.3.2"
+        versions: ["1.x"]

.github/workflows/codeql-analysis.yml

@@ -62,7 +62,7 @@ jobs:
 
     - name: Build with Gradle
       if: ${{ matrix.language == 'java' }}
-      run: ./gradlew testClasses -x :ui:assembleFrontend
+      run: ./gradlew testClasses -x :ui:installFrontend -x :ui:assembleFrontend
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

.github/workflows/docker.yml

@@ -7,7 +7,7 @@ on:
         description: 'Retag latest Docker images'
         required: true
         type: string
-        default: "false"
+        default: "true"
         options:
           - "true"
           - "false"
@@ -20,15 +20,6 @@ on:
         required: false
         type: string
         default: "LATEST"
-      force-download-artifact:
-        description: 'Force download artifact'
-        required: false
-        type: string
-        default: "true"
-        options:
-          - "true"
-          - "false"
-
 env:
   PLUGIN_VERSION: ${{ github.event.inputs.plugin-version != null && github.event.inputs.plugin-version || 'LATEST' }}
 jobs:
@@ -47,18 +38,9 @@ jobs:
         id: plugins
         with:
           plugin-version: ${{ env.PLUGIN_VERSION }}
-
-  # ********************************************************************************************************************
-  # Build
-  # ********************************************************************************************************************
-  build-artifacts:
-    name: Build Artifacts
-    if: ${{ github.event.inputs.force-download-artifact == 'true' }}
-    uses: ./.github/workflows/workflow-build-artifacts.yml
-
   docker:
     name: Publish Docker
-    needs: [ plugins, build-artifacts ]
+    needs: [ plugins ]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -69,7 +51,7 @@ jobs:
             python-libs: ""
           - name: ""
             plugins: ${{needs.plugins.outputs.plugins}}
-            packages: python3 python-is-python3 python3-pip curl jattach
+            packages: python3 python3-venv python-is-python3 python3-pip nodejs npm curl zip unzip jattach
             python-libs: kestra
     steps:
       - uses: actions/checkout@v4
@@ -87,31 +69,18 @@ jobs:
           fi
 
           if [[ "${{ env.PLUGIN_VERSION }}" == *"-SNAPSHOT" ]]; then
-            echo "plugins=--repositories=https://central.sonatype.com/repository/maven-snapshots/ ${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT;
+            echo "plugins=--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots ${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT;
           else
             echo "plugins=${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT
           fi
-
-      # [workflow_dispatch]
-      # Download executable from GitHub Release
-      - name: Artifacts - Download release (workflow_dispatch)
-        id: download-github-release
-        if: github.event_name == 'workflow_dispatch' && github.event.inputs.force-download-artifact == 'false'
+      # Download release
+      - name: Download release
         uses: robinraju/release-downloader@v1.12
         with:
           tag: ${{steps.vars.outputs.tag}}
           fileName: 'kestra-*'
           out-file-path: build/executable
 
-      # [workflow_call]
-      # Download executable from artifact
-      - name: Artifacts - Download executable
-        if: github.event_name != 'workflow_dispatch' || steps.download-github-release.outcome == 'skipped'
-        uses: actions/download-artifact@v4
-        with:
-          name: exe
-          path: build/executable
-
       - name: Copy exe to image
         run: |
           cp build/executable/* docker/app/kestra && chmod +x docker/app/kestra

.github/workflows/e2e.yml

@@ -1,36 +1,42 @@
-name: 'E2E tests revival'
-description: 'New E2E tests implementation started by Roman. Based on playwright in npm UI project, tests Kestra OSS develop docker image. These tests are written from zero, lets make them unflaky from the start!.'
+name: 'Reusable Workflow for Running End-to-End Tests'
 on:
-  schedule:
-    - cron: "0 * * * *"  # Every hour
   workflow_call:
     inputs:
-      noInputYet:
-        description: 'not input yet.'
-        required: false
+      tags:
+        description: "Tags used for filtering tests to include for QA."
         type: string
-        default: "no input"
-  workflow_dispatch:
-    inputs:
-      noInputYet:
-        description: 'not input yet.'
-        required: false
+        required: true
+      docker-artifact-name:
+        description: "The GitHub artifact containing the Kestra docker image."
         type: string
-        default: "no input"
+        required: false
+      docker-image-tag:
+        description: "The Docker image Tag for Kestra"
+        default: 'kestra/kestra:develop'
+        type: string
+        required: true
+      backend:
+        description: "The Kestra backend type to be used for E2E tests."
+        type: string
+        required: true
+        default: "postgres"
+    secrets:
+      GITHUB_AUTH_TOKEN:
+        description: "The GitHub Token."
+        required: true
+      GOOGLE_SERVICE_ACCOUNT:
+        description: "The Google Service Account."
+        required: false
 jobs:
   check:
-    timeout-minutes: 10
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     env:
       GOOGLE_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
+      E2E_TEST_DOCKER_DIR: ./kestra/e2e-tests/docker
+      KESTRA_BASE_URL: http://127.27.27.27:8080/ui/
     steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
+      # Checkout kestra
       - name: Checkout kestra
         uses: actions/checkout@v4
         with:
@@ -38,49 +44,115 @@ jobs:
 
       # Setup build
       - uses: kestra-io/actions/.github/actions/setup-build@main
-        name: Setup - Build
         id: build
         with:
           java-enabled: true
           node-enabled: true
           python-enabled: true
 
-      - name: Install Npm dependencies
-        run: |
-          cd kestra/ui
-          npm i
-          npx playwright install --with-deps chromium
+      # Get Docker Image
+      - name: Download Kestra Image
+        if: inputs.docker-artifact-name != ''
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.docker-artifact-name }}
+          path: /tmp
 
-      - name: Run E2E Tests
+      - name: Load Kestra Image
+        if: inputs.docker-artifact-name != ''
+        run: |
+          docker load --input /tmp/${{ inputs.docker-artifact-name }}.tar
+
+      # Docker Compose
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        if: inputs.docker-artifact-name == ''
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      # Build configuration
+      - name: Create additional application configuration
+        run: |
+          touch ${{ env.E2E_TEST_DOCKER_DIR }}/data/application-secrets.yml
+
+      - name: Setup additional application configuration
+        if: env.APPLICATION_SECRETS != null
+        env:
+          APPLICATION_SECRETS: ${{ secrets.APPLICATION_SECRETS }}
+        run: |
+          echo $APPLICATION_SECRETS | base64 -d > ${{ env.E2E_TEST_DOCKER_DIR }}/data/application-secrets.yml
+
+      # Deploy Docker Compose Stack
+      - name: Run Kestra (${{ inputs.backend }})
+        env:
+          KESTRA_DOCKER_IMAGE: ${{ inputs.docker-image-tag }}
+        run: |
+          cd ${{ env.E2E_TEST_DOCKER_DIR }}
+          echo "KESTRA_DOCKER_IMAGE=$KESTRA_DOCKER_IMAGE" >> .env
+          docker compose -f docker-compose-${{ inputs.backend }}.yml up -d
+
+      - name: Install Playwright Deps
         run: |
           cd kestra
-          sh build-and-start-e2e-tests.sh
+          ./gradlew playwright --args="install-deps"
 
-      - name: Upload Playwright Report as Github artifact
-        # 'With this report, you can analyze locally the results of the tests. see https://playwright.dev/docs/ci-intro#html-report'
-        uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
+      # Run E2E Tests
+      - name: Wait For Kestra UI
+        run: |
+          # Start time
+          START_TIME=$(date +%s)
+          # Timeout duration in seconds (5 minutes)
+          TIMEOUT_DURATION=$((5 * 60))
+          while [ $(curl -s -L -o /dev/null -w %{http_code} $KESTRA_BASE_URL) != 200 ]; do
+            echo -e $(date) "\tKestra server HTTP state: " $(curl -k -L -s -o /dev/null -w %{http_code} $KESTRA_BASE_URL) " (waiting for 200)";
+            # Check the elapsed time
+            CURRENT_TIME=$(date +%s)
+            ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
+            # Break the loop if the elapsed time exceeds the timeout duration
+            if [ $ELAPSED_TIME -ge $TIMEOUT_DURATION ]; then
+              echo "Timeout reached: Exiting after 5 minutes."
+              exit 1;
+            fi
+            sleep 2;
+          done;
+          echo "Kestra is running: $KESTRA_BASE_URL 🚀";
+        continue-on-error: true
+
+      - name: Run E2E Tests (${{ inputs.tags }})
+        if: inputs.tags != ''
+        run: |
+          cd kestra
+          ./gradlew e2eTestsCheck -P tags=${{ inputs.tags }}
+
+      - name: Run E2E Tests
+        if: inputs.tags == ''
+        run: |
+          cd kestra
+          ./gradlew e2eTestsCheck
+
+      # Allure check
+      - name: Auth to Google Cloud
+        id: auth
+        if: ${{ !cancelled() && env.GOOGLE_SERVICE_ACCOUNT != 0 }}
+        uses: 'google-github-actions/auth@v2'
         with:
-          name: playwright-report
-          path: kestra/ui/playwright-report/
-          retention-days: 7
-        # Allure check
-        # TODO I don't know what it should do
-#      - uses: rlespinasse/github-slug-action@v5
-#        name: Allure - Generate slug variables
-#
-#      - name: Allure - Publish report
-#        uses: andrcuns/allure-publish-action@v2.9.0
-#        if: always() && env.GOOGLE_SERVICE_ACCOUNT != ''
-#        continue-on-error: true
-#        env:
-#          GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
-#          JAVA_HOME: /usr/lib/jvm/default-jvm/
-#        with:
-#          storageType: gcs
-#          resultsGlob: "**/build/allure-results"
-#          bucket: internal-kestra-host
-#          baseUrl: "https://internal.dev.kestra.io"
-#          prefix: ${{ format('{0}/{1}', github.repository, 'allure/java') }}
-#          copyLatest: true
-#          ignoreMissingResults: true
+          credentials_json: '${{ secrets.GOOGLE_SERVICE_ACCOUNT }}'
+
+      - uses: rlespinasse/github-slug-action@v5
+
+      - name: Publish allure report
+        uses: andrcuns/allure-publish-action@v2.9.0
+        if: ${{ !cancelled() && env.GOOGLE_SERVICE_ACCOUNT != 0 }}
+        env:
+          GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
+          JAVA_HOME: /usr/lib/jvm/default-jvm/
+        with:
+          storageType: gcs
+          resultsGlob: build/allure-results
+          bucket: internal-kestra-host
+          baseUrl: "https://internal.dev.kestra.io"
+          prefix: ${{ format('{0}/{1}/{2}', github.repository, env.GITHUB_HEAD_REF_SLUG != '' && env.GITHUB_HEAD_REF_SLUG || github.ref_name, 'allure/playwright') }}
+          copyLatest: true
+          ignoreMissingResults: true

.github/workflows/generate-translations.yml

@@ -43,6 +43,9 @@ jobs:
           with:
             node-version: "20.x"
 
+        - name: Check keys matching
+          run: node ui/src/translations/check.js
+
         - name: Set up Git
           run: |
             git config --global user.name "GitHub Action"
@@ -61,7 +64,4 @@ jobs:
             fi
             git commit -m "chore(core): localize to languages other than english" -m "Extended localization support by adding translations for multiple languages using English as the base. This enhances accessibility and usability for non-English-speaking users while keeping English as the source reference."
             git push -u origin $BRANCH_NAME || (git push origin --delete $BRANCH_NAME && git push -u origin $BRANCH_NAME)
-            gh pr create --title "Translations from en.json" --body $'This PR was created automatically by a GitHub Action.\n\nSomeone from the @kestra-io/frontend team needs to review and merge.' --base ${{ github.ref_name }} --head $BRANCH_NAME
-
-        - name: Check keys matching
-          run: node ui/src/translations/check.js
+            gh pr create --title "Translations from en.json" --body "This PR was created automatically by a GitHub Action." --base develop --head $BRANCH_NAME --assignee anna-geller --reviewer anna-geller

.github/workflows/gradle-release.yml

@@ -27,7 +27,7 @@ jobs:
             echo "Invalid release version. Must match regex: ^[0-9]+(\.[0-9]+)\.0-rc[01](-SNAPSHOT)?$"
             exit 1
           fi
-
+            
           if ! [[ "$NEXT_VERSION" =~ ^[0-9]+(\.[0-9]+)\.0-SNAPSHOT$ ]]; then
             echo "Invalid next version. Must match regex: ^[0-9]+(\.[0-9]+)\.0-SNAPSHOT$"
             exit 1;
@@ -36,7 +36,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          path: kestra
 
       # Checkout GitHub Actions
       - uses: actions/checkout@v4
@@ -63,20 +62,18 @@ jobs:
       - name: Run Gradle Release
         env:
           GITHUB_PAT: ${{ secrets.GH_PERSONAL_TOKEN }}
-        run: |
+        run: |          
           # Extract the major and minor versions
           BASE_VERSION=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+)\..*/\1/')
           PUSH_RELEASE_BRANCH="releases/v${BASE_VERSION}.x"
-
-          cd kestra
-
+  
           # Create and push release branch
           git checkout -b "$PUSH_RELEASE_BRANCH";
           git push -u origin "$PUSH_RELEASE_BRANCH";
-
+      
           # Run gradle release
           git checkout develop;
-
+      
           if [[ "$RELEASE_VERSION" == *"-SNAPSHOT" ]]; then
             # -SNAPSHOT qualifier maybe used to test release-candidates
             ./gradlew release -Prelease.useAutomaticVersion=true \

.github/workflows/main.yml

@@ -43,8 +43,7 @@ jobs:
       SONATYPE_GPG_KEYID: ${{ secrets.SONATYPE_GPG_KEYID }}
       SONATYPE_GPG_PASSWORD: ${{ secrets.SONATYPE_GPG_PASSWORD }}
       SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE }}
-      GH_PERSONAL_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
-      SLACK_RELEASES_WEBHOOK_URL: ${{ secrets.SLACK_RELEASES_WEBHOOK_URL }}
+
   end:
     runs-on: ubuntu-latest
     needs:
@@ -53,14 +52,15 @@ jobs:
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
-      - name: Trigger EE Workflow
-        uses: peter-evans/repository-dispatch@v3
-        if: github.ref == 'refs/heads/develop' && needs.release.result == 'success'
+      # Update
+      - name: Github - Update internal
+        uses: benc-uk/workflow-dispatch@v1
+        if: github.ref == 'refs/heads/develop' && needs.docker.result == 'success'
         with:
+          workflow: oss-build.yml
+          repo: kestra-io/infra
+          ref: master
           token: ${{ secrets.GH_PERSONAL_TOKEN }}
-          repository: kestra-io/kestra-ee
-          event-type: "oss-updated"
-
 
       # Slack
       - name: Slack - Notification

.github/workflows/pull-request.yml

@@ -56,10 +56,6 @@ jobs:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       GOOGLE_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
 
-  e2e-tests:
-    name: E2E - Tests
-    uses: ./.github/workflows/e2e.yml
-
   end:
     name: End
     runs-on: ubuntu-latest

.github/workflows/setversion-tag.yml

@@ -22,11 +22,11 @@ jobs:
             echo "Invalid release version. Must match regex: ^[0-9]+(\.[0-9]+)(\.[0-9]+)-(rc[0-9])?(-SNAPSHOT)?$"
             exit 1
           fi
-
+          
           # Extract the major and minor versions
           BASE_VERSION=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+)\..*/\1/')
           RELEASE_BRANCH="refs/heads/releases/v${BASE_VERSION}.x"
-
+          
           CURRENT_BRANCH="$GITHUB_REF"
           if ! [[ "$CURRENT_BRANCH" == "$RELEASE_BRANCH" ]]; then
             echo "Invalid release branch. Expected $RELEASE_BRANCH, was $CURRENT_BRANCH"
@@ -54,4 +54,4 @@ jobs:
           git commit -m"chore(version): update to version '$RELEASE_VERSION'"
           git push
           git tag -a "v$RELEASE_VERSION" -m"v$RELEASE_VERSION"
-          git push --tags
+          git push origin "v$RELEASE_VERSION"

.github/workflows/vulnerabilities-check.yml

@@ -8,9 +8,6 @@ on:
 env:
   JAVA_VERSION: '21'
 
-permissions:
-  contents: read
-
 jobs:
   dependency-check:
     name: Dependency Check
@@ -60,10 +57,6 @@ jobs:
   develop-image-check:
     name: Image Check (develop)
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      security-events: write
-      actions: read
     steps:
       # Checkout
       - uses: actions/checkout@v4
@@ -87,28 +80,16 @@ jobs:
 
       # Run Trivy image scan for Docker vulnerabilities, see https://github.com/aquasecurity/trivy-action
       - name: Docker Vulnerabilities Check
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.30.0
         with:
           image-ref: kestra/kestra:develop
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          severity: 'CRITICAL,HIGH'
-          output: 'trivy-results.sarif'
+          format: table
           skip-dirs: /app/plugins
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
-          category: docker-
+          scanners: vuln
 
   latest-image-check:
     name: Image Check (latest)
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      security-events: write
-      actions: read
     steps:
       # Checkout
       - uses: actions/checkout@v4
@@ -132,16 +113,9 @@ jobs:
 
       # Run Trivy image scan for Docker vulnerabilities, see https://github.com/aquasecurity/trivy-action
       - name: Docker Vulnerabilities Check
-        uses: aquasecurity/trivy-action@0.32.0
+        uses: aquasecurity/trivy-action@0.30.0
         with:
           image-ref: kestra/kestra:latest
           format: table
           skip-dirs: /app/plugins
-          scanners: vuln
-          severity: 'CRITICAL,HIGH'
-          output: 'trivy-results.sarif'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
+          scanners: vuln

.github/workflows/workflow-backend-test.yml

@@ -31,8 +31,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         name: Checkout - Current ref
-        with:
-          fetch-depth: 0
 
       # Setup build
       - uses: kestra-io/actions/.github/actions/setup-build@main

.github/workflows/workflow-build-artifacts.yml

@@ -1,7 +1,23 @@
 name: Build Artifacts
 
 on:
-  workflow_call: {}
+  workflow_call:
+    inputs:
+      plugin-version:
+        description: "Kestra version"
+        default: 'LATEST'
+        required: true
+        type: string
+    outputs:
+      docker-tag:
+        value: ${{ jobs.build.outputs.docker-tag }}
+        description: "The Docker image Tag for Kestra"
+      docker-artifact-name:
+        value: ${{ jobs.build.outputs.docker-artifact-name }}
+        description: "The GitHub artifact containing the Kestra docker image name."
+      plugins:
+        value: ${{ jobs.build.outputs.plugins }}
+        description: "The Kestra plugins list used for the build."
 
 jobs:
   build:
@@ -52,7 +68,7 @@ jobs:
           if [[ $TAG = "master" || $TAG == v* ]]; then
             echo "plugins=$PLUGINS" >> $GITHUB_OUTPUT
           else
-            echo "plugins=--repositories=https://central.sonatype.com/repository/maven-snapshots/ $PLUGINS" >> $GITHUB_OUTPUT
+            echo "plugins=--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots $PLUGINS" >> $GITHUB_OUTPUT
           fi
 
       # Build
@@ -66,6 +82,55 @@ jobs:
         run: |
           cp build/executable/* docker/app/kestra && chmod +x docker/app/kestra
 
+      # Docker Tag
+      - name: Setup - Docker vars
+        id: vars
+        shell: bash
+        run: |
+          TAG=${GITHUB_REF#refs/*/}
+          if [[ $TAG = "master" ]]
+          then
+            TAG="latest";
+          elif [[ $TAG = "develop" ]]
+          then
+            TAG="develop";
+          elif [[ $TAG = v* ]]
+          then
+            TAG="${TAG}";
+          else
+            TAG="build-${{ github.run_id }}";
+          fi
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          echo "artifact=docker-kestra-${TAG}" >> $GITHUB_OUTPUT
+
+      # Docker setup
+      - name: Docker - Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Docker - Fix Qemu
+        shell: bash
+        run: |
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
+
+      - name: Docker - Setup Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Docker Build
+      - name: Docker - Build & export image
+        uses: docker/build-push-action@v6
+        if: "!startsWith(github.ref, 'refs/tags/v')"
+        with:
+          context: .
+          push: false
+          file: Dockerfile
+          tags: |
+            kestra/kestra:${{ steps.vars.outputs.tag }}
+          build-args: |
+            KESTRA_PLUGINS=${{ steps.plugins.outputs.plugins }}
+            APT_PACKAGES=${{ env.DOCKER_APT_PACKAGES }}
+            PYTHON_LIBRARIES=${{ env.DOCKER_PYTHON_LIBRARIES }}
+          outputs: type=docker,dest=/tmp/${{ steps.vars.outputs.artifact }}.tar
+
       # Upload artifacts
       - name: Artifacts - Upload JAR
         uses: actions/upload-artifact@v4
@@ -78,3 +143,10 @@ jobs:
         with:
           name: exe
           path: build/executable/
+
+      - name: Artifacts - Upload Docker
+        uses: actions/upload-artifact@v4
+        if: "!startsWith(github.ref, 'refs/tags/v')"
+        with:
+          name: ${{ steps.vars.outputs.artifact }}
+          path: /tmp/${{ steps.vars.outputs.artifact }}.tar

.github/workflows/workflow-frontend-test.yml

@@ -22,24 +22,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Cache Node Modules
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ui/node_modules
-          key: modules-${{ hashFiles('ui/package-lock.json') }}
-
-      - name: Cache Playwright Binaries
-        id: cache-playwright
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/ms-playwright
-          key: playwright-${{ hashFiles('ui/package-lock.json') }}
-
       - name: Npm - install
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        shell: bash
         working-directory: ui
         run: npm ci
 
@@ -51,20 +35,34 @@ jobs:
           workdir: ui
 
       - name: Npm - Run build
+        shell: bash
         working-directory: ui
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: npm run build
 
-      - name: Run front-end unit tests
-        working-directory: ui
-        run: npm run test:unit -- --coverage
-
       - name: Storybook - Install Playwright
+        shell: bash
         working-directory: ui
-        if: steps.cache-playwright.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps
 
-      - name: Run storybook component tests
+      - name: Run front-end unit tests
+        shell: bash
         working-directory: ui
-        run: npm run test:storybook -- --coverage
+        run: npm run test:cicd
+
+      - name: Codecov - Upload coverage reports
+        uses: codecov/codecov-action@v5
+        if: ${{ !cancelled() && github.event.pull_request.head.repo.full_name == github.repository }}
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: frontend
+
+      - name: Codecov - Upload test results
+        uses: codecov/test-results-action@v1
+        if: ${{ !cancelled() }}
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN && github.event.pull_request.head.repo.full_name == github.repository }}
+          flags: frontend

.github/workflows/workflow-github-release.yml

@@ -1,29 +1,24 @@
 name: Github - Release
 
 on:
-  workflow_dispatch:
   workflow_call:
     secrets:
       GH_PERSONAL_TOKEN:
         description: "The Github personal token."
         required: true
-      SLACK_RELEASES_WEBHOOK_URL:
-        description: "The Slack webhook URL."
-        required: true
-
-
 
 jobs:
   publish:
     name: Github - Release
     runs-on: ubuntu-latest
     steps:
-      # Check out
-      - name: Checkout - Repository
-        uses: actions/checkout@v4
+      # Download Exec
+      - name: Artifacts - Download executable
+        uses: actions/download-artifact@v4
+        if: startsWith(github.ref, 'refs/tags/v')
         with:
-          fetch-depth: 0
-          submodules: true
+          name: exe
+          path: build/executable
 
       # Checkout GitHub Actions
       - name: Checkout - Actions
@@ -35,40 +30,18 @@ jobs:
           sparse-checkout: |
             .github/actions
 
-      # Download Exec
-      # Must be done after checkout actions
-      - name: Artifacts - Download executable
-        uses: actions/download-artifact@v4
-        if: startsWith(github.ref, 'refs/tags/v')
-        with:
-          name: exe
-          path: build/executable
-
-      - name: Check if current tag is latest
-        id: is_latest
-        run: |
-          latest_tag=$(git tag | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' | sort -V | tail -n1)
-          current_tag="${GITHUB_REF_NAME#v}"
-          if [ "$current_tag" = "$latest_tag" ]; then
-          echo "latest=true" >> $GITHUB_OUTPUT
-          else
-          echo "latest=false" >> $GITHUB_OUTPUT
-          fi
-        env:
-          GITHUB_REF_NAME: ${{ github.ref_name }}
-
       # GitHub Release
       - name: Create GitHub release
         uses: ./actions/.github/actions/github-release
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         env:
-          MAKE_LATEST: ${{ steps.is_latest.outputs.latest }}
-          GITHUB_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_RELEASES_WEBHOOK_URL: ${{ secrets.SLACK_RELEASES_WEBHOOK_URL }}
 
       # Trigger gha workflow to bump helm chart version
       - name: GitHub - Trigger the Helm chart version bump
         uses: peter-evans/repository-dispatch@v3
+        if: steps.create_github_release.conclusion == 'success'
         with:
           token: ${{ secrets.GH_PERSONAL_TOKEN }}
           repository: kestra-io/helm-charts

.github/workflows/workflow-publish-docker.yml

@@ -41,6 +41,8 @@ jobs:
     name: Build Artifacts
     if: ${{ github.event.inputs.force-download-artifact == 'true' }}
     uses: ./.github/workflows/workflow-build-artifacts.yml
+    with:
+      plugin-version: ${{ github.event.inputs.plugin-version != null && github.event.inputs.plugin-version || 'LATEST' }}
   # ********************************************************************************************************************
   # Docker
   # ********************************************************************************************************************
@@ -110,12 +112,12 @@ jobs:
             echo "plugins=${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT
           elif [[ $TAG = "develop" ]]; then
             TAG="develop";
-            echo "plugins=--repositories=https://central.sonatype.com/repository/maven-snapshots/ $PLUGINS" >> $GITHUB_OUTPUT
+            echo "plugins=--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots $PLUGINS" >> $GITHUB_OUTPUT
           else
             TAG="build-${{ github.run_id }}";
-            echo "plugins=--repositories=https://central.sonatype.com/repository/maven-snapshots/ $PLUGINS" >> $GITHUB_OUTPUT
+            echo "plugins=--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots $PLUGINS" >> $GITHUB_OUTPUT
           fi
-
+          
           echo "tag=${TAG}${{ matrix.image.tag }}" >> $GITHUB_OUTPUT
 
       # Build Docker Image

.github/workflows/workflow-publish-maven.yml

@@ -39,8 +39,8 @@ jobs:
       - name: Publish - Release package to Maven Central
         shell: bash
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_GPG_KEYID: ${{ secrets.SONATYPE_GPG_KEYID }}
           SONATYPE_GPG_PASSWORD: ${{ secrets.SONATYPE_GPG_PASSWORD }}
           SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE}}
@@ -50,7 +50,7 @@ jobs:
           echo "signing.password=${SONATYPE_GPG_PASSWORD}" >> ~/.gradle/gradle.properties
           echo "signing.secretKeyRingFile=${HOME}/.gradle/secring.gpg" >> ~/.gradle/gradle.properties
           echo ${SONATYPE_GPG_FILE} | base64 -d > ~/.gradle/secring.gpg
-          ./gradlew publishToMavenCentral
+          ./gradlew publishToSonatype ${{ startsWith(github.ref, 'refs/tags/v')  && 'closeAndReleaseSonatypeStagingRepository' || '' }}
 
       # Gradle dependency
       - name: Java - Gradle dependency graph

.github/workflows/workflow-release.yml

@@ -42,16 +42,12 @@ on:
       SONATYPE_GPG_FILE:
         description: "The Sonatype GPG file."
         required: true
-      GH_PERSONAL_TOKEN:
-        description: "GH personnal Token."
-        required: true
-      SLACK_RELEASES_WEBHOOK_URL:
-        description: "Slack webhook for releases channel."
-        required: true
 jobs:
   build-artifacts:
     name: Build - Artifacts
     uses: ./.github/workflows/workflow-build-artifacts.yml
+    with:
+      plugin-version: ${{ github.event.inputs.plugin-version != null && github.event.inputs.plugin-version || 'LATEST' }}
 
   Docker:
     name: Publish Docker
@@ -81,5 +77,4 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     uses: ./.github/workflows/workflow-github-release.yml
     secrets:
-      GH_PERSONAL_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
-      SLACK_RELEASES_WEBHOOK_URL: ${{ secrets.SLACK_RELEASES_WEBHOOK_URL }}
+      GH_PERSONAL_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}

.gitignore

@@ -59,4 +59,3 @@ core/src/main/resources/gradle.properties
 
 *storybook.log
 storybook-static
-/jmh-benchmarks/src/main/resources/gradle.properties

.plugins

@@ -3,12 +3,10 @@
 # Format: <RepositoryName>:<GroupId>:<ArtifactId>:<Version>
 #
 # Uncomment the lines corresponding to the plugins to be installed:
-#plugin-ai:io.kestra.plugin:plugin-ai:LATEST
 #plugin-airbyte:io.kestra.plugin:plugin-airbyte:LATEST
 #plugin-airflow:io.kestra.plugin:plugin-airflow:LATEST
 #plugin-amqp:io.kestra.plugin:plugin-amqp:LATEST
 #plugin-ansible:io.kestra.plugin:plugin-ansible:LATEST
-#plugin-anthropic:io.kestra.plugin:plugin-anthropic:LATEST
 #plugin-aws:io.kestra.plugin:plugin-aws:LATEST
 #plugin-azure:io.kestra.plugin:plugin-azure:LATEST
 #plugin-cassandra:io.kestra.plugin:plugin-cassandra:LATEST
@@ -26,22 +24,18 @@
 #plugin-debezium:io.kestra.plugin:plugin-debezium-oracle:LATEST
 #plugin-debezium:io.kestra.plugin:plugin-debezium-postgres:LATEST
 #plugin-debezium:io.kestra.plugin:plugin-debezium-sqlserver:LATEST
-#plugin-deepseek:io.kestra.plugin:plugin-deepseek:LATEST
 #plugin-docker:io.kestra.plugin:plugin-docker:LATEST
 #plugin-elasticsearch:io.kestra.plugin:plugin-elasticsearch:LATEST
 #plugin-fivetran:io.kestra.plugin:plugin-fivetran:LATEST
 #plugin-fs:io.kestra.plugin:plugin-fs:LATEST
 #plugin-gcp:io.kestra.plugin:plugin-gcp:LATEST
-#plugin-gemini:io.kestra.plugin:plugin-gemini:LATEST
 #plugin-git:io.kestra.plugin:plugin-git:LATEST
 #plugin-github:io.kestra.plugin:plugin-github:LATEST
 #plugin-googleworkspace:io.kestra.plugin:plugin-googleworkspace:LATEST
 #plugin-graalvm:io.kestra.plugin:plugin-graalvm:LATEST
-#plugin-graphql:io.kestra.plugin:plugin-graphql:LATEST
 #plugin-hightouch:io.kestra.plugin:plugin-hightouch:LATEST
 #plugin-hubspot:io.kestra.plugin:plugin-hubspot:LATEST
 #plugin-huggingface:io.kestra.plugin:plugin-huggingface:LATEST
-#plugin-influxdb:io.kestra.plugin:plugin-influxdb:LATEST
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-as400:LATEST
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-clickhouse:LATEST
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-db2:LATEST
@@ -62,43 +56,31 @@
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-arrow-flight:LATEST
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-sqlite:LATEST
 #plugin-jdbc:io.kestra.plugin:plugin-jdbc-sybase:LATEST
-#plugin-jenkins:io.kestra.plugin:plugin-jenkins:LATEST
 #plugin-jira:io.kestra.plugin:plugin-jira:LATEST
 #plugin-kafka:io.kestra.plugin:plugin-kafka:LATEST
-#plugin-kestra:io.kestra.plugin:plugin-kestra:LATEST
 #plugin-kubernetes:io.kestra.plugin:plugin-kubernetes:LATEST
 #plugin-ldap:io.kestra.plugin:plugin-ldap:LATEST
 #plugin-linear:io.kestra.plugin:plugin-linear:LATEST
 #plugin-malloy:io.kestra.plugin:plugin-malloy:LATEST
 #plugin-meilisearch:io.kestra.plugin:plugin-meilisearch:LATEST
 #plugin-minio:io.kestra.plugin:plugin-minio:LATEST
-#plugin-mistral:io.kestra.plugin:plugin-mistral:LATEST
 #plugin-modal:io.kestra.plugin:plugin-modal:LATEST
 #plugin-mongodb:io.kestra.plugin:plugin-mongodb:LATEST
 #plugin-mqtt:io.kestra.plugin:plugin-mqtt:LATEST
 #plugin-nats:io.kestra.plugin:plugin-nats:LATEST
 #plugin-neo4j:io.kestra.plugin:plugin-neo4j:LATEST
 #plugin-notifications:io.kestra.plugin:plugin-notifications:LATEST
-#plugin-notion:io.kestra.plugin:plugin-notion:LATEST
-#plugin-ollama:io.kestra.plugin:plugin-ollama:LATEST
 #plugin-openai:io.kestra.plugin:plugin-openai:LATEST
 #plugin-opensearch:io.kestra.plugin:plugin-opensearch:LATEST
-#plugin-perplexity:io.kestra.plugin:plugin-perplexity:LATEST
 #plugin-powerbi:io.kestra.plugin:plugin-powerbi:LATEST
 #plugin-pulsar:io.kestra.plugin:plugin-pulsar:LATEST
 #plugin-redis:io.kestra.plugin:plugin-redis:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-bun:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-deno:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-go:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-groovy:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-jbang:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-julia:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-jython:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-lua:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-nashorn:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-node:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-perl:LATEST
-#plugin-scripts:io.kestra.plugin:plugin-script-php:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-powershell:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-python:LATEST
 #plugin-scripts:io.kestra.plugin:plugin-script-r:LATEST
@@ -106,7 +88,6 @@
 #plugin-scripts:io.kestra.plugin:plugin-script-shell:LATEST
 #plugin-serdes:io.kestra.plugin:plugin-serdes:LATEST
 #plugin-servicenow:io.kestra.plugin:plugin-servicenow:LATEST
-#plugin-sifflet:io.kestra.plugin:plugin-sifflet:LATEST
 #plugin-singer:io.kestra.plugin:plugin-singer:LATEST
 #plugin-soda:io.kestra.plugin:plugin-soda:LATEST
 #plugin-solace:io.kestra.plugin:plugin-solace:LATEST

Dockerfile

@@ -16,9 +16,8 @@ RUN apt-get update -y && \
     if [ -n "${APT_PACKAGES}" ]; then apt-get install -y --no-install-recommends ${APT_PACKAGES}; fi && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* && \
-    curl -LsSf https://astral.sh/uv/0.6.17/install.sh | sh && mv /root/.local/bin/uv /bin && mv /root/.local/bin/uvx /bin && \
     if [ -n "${KESTRA_PLUGINS}" ]; then /app/kestra plugins install ${KESTRA_PLUGINS} && rm -rf /tmp/*; fi && \
-    if [ -n "${PYTHON_LIBRARIES}" ]; then uv pip install --system ${PYTHON_LIBRARIES}; fi && \
+    if [ -n "${PYTHON_LIBRARIES}" ]; then pip install ${PYTHON_LIBRARIES}; fi && \
     chown -R kestra:kestra /app
 
 USER kestra

Makefile

@@ -77,7 +77,7 @@ install-plugins:
         else \
 		${KESTRA_BASEDIR}/bin/kestra plugins install $$CURRENT_PLUGIN \
 		--plugins ${KESTRA_BASEDIR}/plugins \
-		--repositories=https://central.sonatype.com/repository/maven-snapshots || exit 1; \
+		--repositories=https://s01.oss.sonatype.org/content/repositories/snapshots || exit 1; \
 		fi \
     done < $$PLUGIN_LIST
 
@@ -130,6 +130,9 @@ datasources:
     username: kestra
     password: k3str4
 kestra:
+  server:
+    basic-auth:
+    enabled: false
   encryption:
     secret-key: 3ywuDa/Ec61VHkOX3RlI9gYq7CaD0mv0Pf3DHtAXA6U=
   repository:

build-and-start-e2e-tests.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-set -e
-
-# E2E main script that can be run on a dev computer or in the CI
-# it will build the backend of the current git repo and the frontend
-# create a docker image out of it
-# run tests on this image
-
-
-LOCAL_IMAGE_VERSION="local-e2e"
-
-echo "Running E2E"
-echo "Start time: $(date '+%Y-%m-%d %H:%M:%S')"
-start_time=$(date +%s)
-
-echo ""
-echo "Building the image for this current repository"
-make build-docker VERSION=$LOCAL_IMAGE_VERSION
-
-end_time=$(date +%s)
-elapsed=$(( end_time - start_time ))
-
-echo ""
-echo "building elapsed time: ${elapsed} seconds"
-echo ""
-echo "Start time: $(date '+%Y-%m-%d %H:%M:%S')"
-start_time2=$(date +%s)
-
-echo "cd ./ui"
-cd ./ui
-echo "npm i"
-npm i
-
-echo 'sh ./run-e2e-tests.sh --kestra-docker-image-to-test "kestra/kestra:$LOCAL_IMAGE_VERSION"'
-sh ./run-e2e-tests.sh --kestra-docker-image-to-test "kestra/kestra:$LOCAL_IMAGE_VERSION"
-
-end_time2=$(date +%s)
-elapsed2=$(( end_time2 - start_time2 ))
-echo ""
-echo "Tests elapsed time: ${elapsed2} seconds"
-echo ""
-total_elapsed=$(( elapsed + elapsed2 ))
-echo "Total elapsed time: ${total_elapsed} seconds"
-echo ""
-
-exit 0

build.gradle

@@ -16,12 +16,12 @@ plugins {
     id "java"
     id 'java-library'
     id "idea"
-    id "com.gradleup.shadow" version "8.3.8"
+    id "com.gradleup.shadow" version "8.3.6"
     id "application"
 
     // test
     id "com.adarshr.test-logger" version "4.0.0"
-    id "org.sonarqube" version "6.2.0.5505"
+    id "org.sonarqube" version "6.1.0.5360"
     id 'jacoco-report-aggregation'
 
     // helper
@@ -31,13 +31,15 @@ plugins {
     id 'com.github.node-gradle.node' version '7.1.0'
 
     // release
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
     id 'net.researchgate.release' version '3.1.0'
-    id "com.gorylenko.gradle-git-properties" version "2.5.2"
+    id "com.gorylenko.gradle-git-properties" version "2.5.0"
     id 'signing'
-    id "com.vanniktech.maven.publish" version "0.34.0"
+    id 'ru.vyarus.pom' version '3.0.0' apply false
+    id 'ru.vyarus.github-info' version '2.0.0' apply false
 
     // OWASP dependency check
-    id "org.owasp.dependencycheck" version "12.1.3" apply false
+    id "org.owasp.dependencycheck" version "12.1.1" apply false
 }
 
 idea {
@@ -71,11 +73,6 @@ dependencies {
  * Dependencies
  **********************************************************************************************************************/
 allprojects {
-
-    tasks.withType(GenerateModuleMetadata).configureEach {
-        suppressedValidationErrors.add('enforced-platform')
-    }
-
     if (it.name != 'platform') {
         group = "io.kestra"
 
@@ -148,7 +145,6 @@ allprojects {
             implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names'
             implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava'
             implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310'
-            implementation group: 'com.fasterxml.uuid', name: 'java-uuid-generator'
 
             // kestra
             implementation group: 'com.devskiller.friendly-id', name: 'friendly-id'
@@ -169,7 +165,7 @@ allprojects {
  * Test
  **********************************************************************************************************************/
 subprojects {
-    if (it.name != 'platform' && it.name != 'jmh-benchmarks') {
+    if (it.name != 'platform') {
         apply plugin: "com.adarshr.test-logger"
 
         java {
@@ -225,14 +221,14 @@ subprojects {
         }
 
         testlogger {
-            theme = 'mocha-parallel'
-            showExceptions = true
-            showFullStackTraces = true
-            showCauses = true
-            slowThreshold = 2000
-            showStandardStreams = true
-            showPassedStandardStreams = false
-            showSkippedStandardStreams = true
+            theme 'mocha-parallel'
+            showExceptions true
+            showFullStackTraces true
+            showCauses true
+            slowThreshold 2000
+            showStandardStreams true
+            showPassedStandardStreams false
+            showSkippedStandardStreams true
         }
     }
 }
@@ -272,7 +268,7 @@ subprojects {
  * Allure Reports
  **********************************************************************************************************************/
 subprojects {
-    if (it.name != 'platform' && it.name != 'jmh-benchmarks') {
+    if (it.name != 'platform') {
         dependencies {
             testImplementation platform("io.qameta.allure:allure-bom")
             testImplementation "io.qameta.allure:allure-junit5"
@@ -299,7 +295,7 @@ subprojects {
  * Jacoco
  **********************************************************************************************************************/
 subprojects {
-    if (it.name != 'platform' && it.name != 'jmh-benchmarks') {
+    if (it.name != 'platform') {
         apply plugin: 'jacoco'
 
         test {
@@ -410,7 +406,7 @@ jar {
 shadowJar {
     archiveClassifier.set(null)
     mergeServiceFiles()
-    zip64 = true
+    zip64 true
 }
 
 distZip.dependsOn shadowJar
@@ -418,7 +414,6 @@ distTar.dependsOn shadowJar
 startScripts.dependsOn shadowJar
 startShadowScripts.dependsOn jar
 shadowJar.dependsOn 'ui:assembleFrontend'
-shadowJar.dependsOn jar
 
 /**********************************************************************************************************************\
  * Executable Jar
@@ -427,8 +422,8 @@ def executableDir = layout.buildDirectory.dir("executable")
 def executable = layout.buildDirectory.file("executable/${project.name}-${project.version}").get().asFile
 
 tasks.register('writeExecutableJar') {
-    group = "build"
-    description = "Write an executable jar from shadow jar"
+    group "build"
+    description "Write an executable jar from shadow jar"
     dependsOn = [shadowJar]
 
     final shadowJarFile =  tasks.shadowJar.outputs.files.singleFile
@@ -454,8 +449,8 @@ tasks.register('writeExecutableJar') {
 }
 
 tasks.register('executableJar', Zip) {
-    group = "build"
-    description = "Zip the executable jar"
+    group "build"
+    description "Zip the executable jar"
     dependsOn = [writeExecutableJar]
 
     archiveFileName = "${project.name}-${project.version}.zip"
@@ -477,152 +472,115 @@ tasks.register('runLocal', JavaExec) {
     args 'server', 'local', '--plugins', 'local/plugins'
 }
 
-tasks.register('runStandalone', JavaExec) {
-    group = "application"
-    description = "Run Kestra as server local"
-    classpath = project(":cli").sourceSets.main.runtimeClasspath
-    mainClass = mainClassName
-    environment 'MICRONAUT_ENVIRONMENTS', 'override'
-    args 'server', 'standalone', '--plugins', 'local/plugins'
-}
-
 /**********************************************************************************************************************\
  * Publish
  **********************************************************************************************************************/
-subprojects {subProject ->
-
-    if (subProject.name != 'jmh-benchmarks' && subProject.name != rootProject.name) {
-        apply plugin: 'signing'
-        apply plugin: "com.vanniktech.maven.publish"
-
-        javadoc {
-            options {
-                locale = 'en_US'
-                encoding = 'UTF-8'
-                addStringOption("Xdoclint:none", "-quiet")
-            }
-        }
-
-        tasks.register('sourcesJar', Jar) {
-            dependsOn = [':core:copyGradleProperties']
-            dependsOn = [':ui:assembleFrontend']
-            archiveClassifier.set('sources')
-            from sourceSets.main.allSource
-        }
-        sourcesJar.dependsOn ':core:copyGradleProperties'
-        sourcesJar.dependsOn ':ui:assembleFrontend'
-
-        tasks.register('javadocJar', Jar) {
-            archiveClassifier.set('javadoc')
-            from javadoc
-        }
-
-        tasks.register('testsJar', Jar) {
-            group = 'build'
-            description = 'Build the tests jar'
-
-            archiveClassifier.set('tests')
-            if (sourceSets.matching { it.name == 'test'}) {
-                from sourceSets.named('test').get().output
-            }
-        }
-
-        //These modules should not be published
-        def unpublishedModules = ["jdbc-mysql", "jdbc-postgres", "webserver"]
-        if (subProject.name in unpublishedModules){
-            return
-        }
-
-        mavenPublishing {
-            publishToMavenCentral(true)
-            signAllPublications()
-
-            coordinates(
-                "${rootProject.group}",
-                subProject.name == "cli" ? rootProject.name : subProject.name,
-                "${rootProject.version}"
-            )
-
-            pom {
-                name        = project.name
-                description = "${project.group}:${project.name}:${rootProject.version}"
-                url         = "https://github.com/kestra-io/${rootProject.name}"
-
-                licenses {
-                    license {
-                        name = "The Apache License, Version 2.0"
-                        url  = "http://www.apache.org/licenses/LICENSE-2.0.txt"
-                    }
-                }
-                developers {
-                    developer {
-                        id    = "tchiotludo"
-                        name  = "Ludovic Dehon"
-                        email = "ldehon@kestra.io"
-                    }
-                }
-                scm {
-                    connection = 'scm:git:'
-                    url = "https://github.com/kestra-io/${rootProject.name}"
-                }
-            }
-        }
-
-        afterEvaluate {
-            publishing {
-                publications {
-                    withType(MavenPublication).configureEach { publication ->
-
-                        if (subProject.name == "platform") {
-                            // Clear all artifacts except the BOM
-                            publication.artifacts.clear()
-                        }
-                    }
-                }
-            }
-        }
-
-        if (subProject.name == 'cli') {
-
-            /* Make sure the special publication is wired *after* every plugin */
-            subProject.afterEvaluate {
-                /* 1. Remove the default java component so Gradle stops expecting
-                       the standard cli-*.jar, sources, javadoc, etc.           */
-                components.removeAll { it.name == "java" }
-
-                /* 2. Replace the publication’s artifacts with shadow + exec */
-                publishing.publications.withType(MavenPublication).configureEach { pub ->
-                    pub.artifacts.clear()
-
-                    // main shadow JAR built at root
-                    pub.artifact(rootProject.tasks.named("shadowJar").get()) {
-                        extension = "jar"
-                    }
-
-                    // executable ZIP built at root
-                    pub.artifact(rootProject.tasks.named("executableJar").get().archiveFile) {
-                        classifier = "exec"
-                        extension  = "zip"
-                    }
-                    pub.artifact(tasks.named("sourcesJar").get())
-                    pub.artifact(tasks.named("javadocJar").get())
-
-                }
-
-                /* 3. Disable Gradle-module metadata for this publication to
-                       avoid the “artifact removed from java component” error. */
-                tasks.withType(GenerateModuleMetadata).configureEach { it.enabled = false }
-
-                /* 4. Make every publish task in :cli wait for the two artifacts */
-                tasks.matching { it.name.startsWith("publish") }.configureEach {
-                    dependsOn rootProject.tasks.named("shadowJar")
-                    dependsOn rootProject.tasks.named("executableJar")
-                }
-            }
+nexusPublishing {
+    repositoryDescription = "${project.group}:${rootProject.name}:${project.version}"
+    useStaging = !project.version.endsWith("-SNAPSHOT")
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
         }
     }
 }
 
+subprojects {
+    apply plugin: "maven-publish"
+    apply plugin: 'signing'
+    apply plugin: 'ru.vyarus.pom'
+    apply plugin: 'ru.vyarus.github-info'
+
+    javadoc {
+        options {
+            locale = 'en_US'
+            encoding = 'UTF-8'
+            addStringOption("Xdoclint:none", "-quiet")
+        }
+    }
+
+    tasks.register('sourcesJar', Jar) {
+        dependsOn = [':core:copyGradleProperties']
+        dependsOn = [':ui:assembleFrontend']
+        archiveClassifier.set('sources')
+        from sourceSets.main.allSource
+    }
+    sourcesJar.dependsOn ':core:copyGradleProperties'
+    sourcesJar.dependsOn ':ui:assembleFrontend'
+
+    tasks.register('javadocJar', Jar) {
+        archiveClassifier.set('javadoc')
+        from javadoc
+    }
+
+    tasks.register('testsJar', Jar) {
+        group = 'build'
+        description = 'Build the tests jar'
+
+        archiveClassifier.set('tests')
+        if (sourceSets.matching { it.name == 'test'}) {
+            from sourceSets.named('test').get().output
+        }
+    }
+
+    github {
+        user 'kestra-io'
+        license 'Apache'
+        repository 'kestra'
+        site 'https://kestra.io'
+    }
+
+    maven.pom {
+        description = 'The modern, scalable orchestrator & scheduler open source platform'
+
+        developers {
+            developer {
+                id = "tchiotludo"
+                name = "Ludovic Dehon"
+            }
+        }
+    }
+
+    publishing {
+        publications {
+            sonatypePublication(MavenPublication) {
+                version project.version
+
+                if (project.name.contains('cli')) {
+                    groupId "io.kestra"
+                    artifactId "kestra"
+
+                    artifact shadowJar
+                    artifact executableJar
+                } else if (project.name.contains('platform')){
+                    groupId project.group
+                    artifactId project.name
+                } else {
+                    from components.java
+
+                    groupId project.group
+                    artifactId project.name
+
+                    artifact sourcesJar
+                    artifact javadocJar
+                    artifact testsJar
+                }
+            }
+        }
+    }
+
+    signing {
+        // only sign JARs that we publish to Sonatype
+        required { gradle.taskGraph.hasTask("publishSonatypePublicationPublicationToSonatypeRepository") }
+        sign publishing.publications.sonatypePublication
+    }
+
+    tasks.withType(GenerateModuleMetadata).configureEach {
+        // Suppression this validation error as we want to enforce the Kestra platform
+        suppressedValidationErrors.add('enforced-platform')
+    }
+}
 
 
 /**********************************************************************************************************************\

cli/build.gradle

@@ -37,4 +37,4 @@ dependencies {
 
     //test
     testImplementation "org.wiremock:wiremock-jetty12"
-}
+}

cli/src/main/java/io/kestra/cli/AbstractApiCommand.java

@@ -14,15 +14,16 @@ import io.micronaut.http.netty.body.NettyJsonHandler;
 import io.micronaut.json.JsonMapper;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import lombok.Builder;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+import picocli.CommandLine;
+
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import lombok.Builder;
-import lombok.Value;
-import lombok.extern.jackson.Jacksonized;
-import picocli.CommandLine;
 
 public abstract class AbstractApiCommand extends AbstractCommand {
     @CommandLine.Option(names = {"--server"}, description = "Kestra server url", defaultValue = "http://localhost:8080")
@@ -34,7 +35,7 @@ public abstract class AbstractApiCommand extends AbstractCommand {
     @CommandLine.Option(names = {"--user"}, paramLabel = "<user:password>", description = "Server user and password")
     protected String user;
 
-    @CommandLine.Option(names = {"--tenant"}, description = "Tenant identifier (EE only)")
+    @CommandLine.Option(names = {"--tenant"}, description = "Tenant identifier (EE only, when multi-tenancy is enabled)")
     protected String tenantId;
 
     @CommandLine.Option(names = {"--api-token"}, description = "API Token (EE only).")
@@ -84,12 +85,12 @@ public abstract class AbstractApiCommand extends AbstractCommand {
         return request;
     }
 
-    protected String apiUri(String path, String tenantId) {
+    protected String apiUri(String path) {
         if (path == null || !path.startsWith("/")) {
             throw new IllegalArgumentException("'path' must be non-null and start with '/'");
         }
 
-        return "/api/v1/" + tenantId + path;
+        return tenantId == null ? "/api/v1" + path : "/api/v1/" + tenantId + path;
     }
 
     @Builder

cli/src/main/java/io/kestra/cli/AbstractCommand.java

@@ -40,7 +40,7 @@ import picocli.CommandLine.Option;
 )
 @Slf4j
 @Introspected
-public abstract class AbstractCommand implements Callable<Integer> {
+abstract public class AbstractCommand implements Callable<Integer> {
     @Inject
     private ApplicationContext applicationContext;
 
@@ -93,7 +93,7 @@ public abstract class AbstractCommand implements Callable<Integer> {
             this.startupHook.start(this);
         }
 
-        if (pluginRegistryProvider != null && this.pluginsPath != null && loadExternalPlugins()) {
+        if (this.pluginsPath != null && loadExternalPlugins()) {
             pluginRegistry = pluginRegistryProvider.get();
             pluginRegistry.registerIfAbsent(pluginsPath);
 

cli/src/main/java/io/kestra/cli/AbstractValidateCommand.java

@@ -1,6 +1,5 @@
 package io.kestra.cli;
 
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.models.validations.ModelValidator;
 import io.kestra.core.models.validations.ValidateConstraintViolation;
 import io.kestra.core.serializers.YamlParser;
@@ -10,7 +9,6 @@ import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import picocli.CommandLine;
 
 import java.io.IOException;
@@ -33,9 +31,6 @@ public abstract class AbstractValidateCommand extends AbstractApiCommand {
     @CommandLine.Parameters(index = "0", description = "the directory containing files to check")
     protected Path directory;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     /** {@inheritDoc} **/
     @Override
     protected boolean loadExternalPlugins() {
@@ -117,7 +112,7 @@ public abstract class AbstractValidateCommand extends AbstractApiCommand {
 
             try(DefaultHttpClient client = client()) {
                 MutableHttpRequest<String> request = HttpRequest
-                    .POST(apiUri("/flows/validate", tenantService.getTenantId(tenantId)), body).contentType(MediaType.APPLICATION_YAML);
+                    .POST(apiUri("/flows/validate"), body).contentType(MediaType.APPLICATION_YAML);
 
                 List<ValidateConstraintViolation> validations = client.toBlocking().retrieve(
                     this.requestOptions(request),

cli/src/main/java/io/kestra/cli/App.java

@@ -2,7 +2,6 @@ package io.kestra.cli;
 
 import io.kestra.cli.commands.configs.sys.ConfigCommand;
 import io.kestra.cli.commands.flows.FlowCommand;
-import io.kestra.cli.commands.migrations.MigrationCommand;
 import io.kestra.cli.commands.namespaces.NamespaceCommand;
 import io.kestra.cli.commands.plugins.PluginCommand;
 import io.kestra.cli.commands.servers.ServerCommand;
@@ -43,7 +42,6 @@ import java.util.concurrent.Callable;
         SysCommand.class,
         ConfigCommand.class,
         NamespaceCommand.class,
-        MigrationCommand.class,
     }
 )
 @Introspected
@@ -66,14 +64,8 @@ public class App implements Callable<Integer> {
         ApplicationContext applicationContext = App.applicationContext(cls, args);
 
         // Call Picocli command
-        int exitCode = 0;
-        try {
-             exitCode = new CommandLine(cls, new MicronautFactory(applicationContext)).execute(args);
-        } catch (CommandLine.InitializationException e){
-            System.err.println("Could not initialize picoli ComandLine, err: " + e.getMessage());
-            e.printStackTrace();
-            exitCode = 1;
-        }
+        int exitCode = new CommandLine(cls, new MicronautFactory(applicationContext)).execute(args);
+
         applicationContext.close();
 
         // exit code

cli/src/main/java/io/kestra/cli/ServerCommandValidator.java

@@ -1,4 +1,4 @@
-package io.kestra.core.validations;
+package io.kestra.cli;
 
 import io.micronaut.context.annotation.Context;
 import io.micronaut.context.annotation.Requires;

cli/src/main/java/io/kestra/cli/commands/flows/FlowCreateCommand.java

@@ -2,13 +2,11 @@ package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 
@@ -25,9 +23,6 @@ public class FlowCreateCommand extends AbstractApiCommand {
     @CommandLine.Parameters(index = "0", description = "The file containing the flow")
     public Path flowFile;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @SuppressWarnings("deprecation")
     @Override
     public Integer call() throws Exception {
@@ -39,7 +34,7 @@ public class FlowCreateCommand extends AbstractApiCommand {
 
         try(DefaultHttpClient client = client()) {
             MutableHttpRequest<String> request = HttpRequest
-                .POST(apiUri("/flows", tenantService.getTenantId(tenantId)), body).contentType(MediaType.APPLICATION_YAML);
+                .POST(apiUri("/flows"), body).contentType(MediaType.APPLICATION_YAML);
 
             client.toBlocking().retrieve(
                 this.requestOptions(request),

cli/src/main/java/io/kestra/cli/commands/flows/FlowDeleteCommand.java

@@ -2,12 +2,10 @@ package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 
@@ -25,9 +23,6 @@ public class FlowDeleteCommand extends AbstractApiCommand {
     @CommandLine.Parameters(index = "1", description = "The ID of the flow")
     public String id;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @SuppressWarnings("deprecation")
     @Override
     public Integer call() throws Exception {
@@ -35,7 +30,7 @@ public class FlowDeleteCommand extends AbstractApiCommand {
 
         try(DefaultHttpClient client = client()) {
             MutableHttpRequest<String> request = HttpRequest
-                .DELETE(apiUri("/flows/" + namespace + "/" + id, tenantService.getTenantId(tenantId)));
+                .DELETE(apiUri("/flows/" + namespace + "/" + id ));
 
             client.toBlocking().exchange(
                 this.requestOptions(request)

cli/src/main/java/io/kestra/cli/commands/flows/FlowExportCommand.java

@@ -2,7 +2,7 @@ package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
+import io.micronaut.context.ApplicationContext;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -25,8 +25,9 @@ import java.nio.file.Path;
 public class FlowExportCommand extends AbstractApiCommand {
     private static final String DEFAULT_FILE_NAME = "flows.zip";
 
+    // @FIXME: Keep it for bug in micronaut that need to have inject on top level command to inject on abstract classe
     @Inject
-    private TenantIdSelectorService tenantService;
+    private ApplicationContext applicationContext;
 
     @CommandLine.Option(names = {"--namespace"}, description = "The namespace of flows to export")
     public String namespace;
@@ -40,7 +41,7 @@ public class FlowExportCommand extends AbstractApiCommand {
 
         try(DefaultHttpClient client = client()) {
             MutableHttpRequest<Object> request = HttpRequest
-                .GET(apiUri("/flows/export/by-query", tenantService.getTenantId(tenantId)) + (namespace != null ? "?namespace=" + namespace : ""))
+                .GET(apiUri("/flows/export/by-query") + (namespace != null ? "?namespace=" + namespace : ""))
                 .accept(MediaType.APPLICATION_OCTET_STREAM);
 
             HttpResponse<byte[]> response = client.toBlocking().exchange(this.requestOptions(request), byte[].class);

cli/src/main/java/io/kestra/cli/commands/flows/FlowTestCommand.java

@@ -1,8 +1,7 @@
 package io.kestra.cli.commands.flows;
 
 import com.google.common.collect.ImmutableMap;
-import io.kestra.cli.AbstractApiCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
+import io.kestra.cli.AbstractCommand;
 import io.kestra.core.models.flows.Flow;
 import io.kestra.core.repositories.FlowRepositoryInterface;
 import io.kestra.core.repositories.LocalFlowRepositoryLoader;
@@ -31,7 +30,7 @@ import java.util.concurrent.TimeoutException;
     description = "Test a flow"
 )
 @Slf4j
-public class FlowTestCommand extends AbstractApiCommand {
+public class FlowTestCommand extends AbstractCommand {
     @Inject
     private ApplicationContext applicationContext;
 
@@ -77,7 +76,6 @@ public class FlowTestCommand extends AbstractApiCommand {
         FlowRepositoryInterface flowRepository = applicationContext.getBean(FlowRepositoryInterface.class);
         FlowInputOutput flowInputOutput = applicationContext.getBean(FlowInputOutput.class);
         RunnerUtils runnerUtils = applicationContext.getBean(RunnerUtils.class);
-        TenantIdSelectorService tenantService =  applicationContext.getBean(TenantIdSelectorService.class);
 
         Map<String, Object> inputs = new HashMap<>();
 
@@ -91,7 +89,7 @@ public class FlowTestCommand extends AbstractApiCommand {
 
         try {
             runner.run();
-            repositoryLoader.load(tenantService.getTenantId(tenantId), file.toFile());
+            repositoryLoader.load(file.toFile());
 
             List<Flow> all = flowRepository.findAllForAllTenants();
             if (all.size() != 1) {

cli/src/main/java/io/kestra/cli/commands/flows/FlowUpdateCommand.java

@@ -2,13 +2,11 @@ package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 
@@ -31,9 +29,6 @@ public class FlowUpdateCommand extends AbstractApiCommand {
     @CommandLine.Parameters(index = "2", description = "The ID of the flow")
     public String id;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @SuppressWarnings("deprecation")
     @Override
     public Integer call() throws Exception {
@@ -45,7 +40,7 @@ public class FlowUpdateCommand extends AbstractApiCommand {
 
         try(DefaultHttpClient client = client()) {
             MutableHttpRequest<String> request = HttpRequest
-                .PUT(apiUri("/flows/" + namespace + "/" + id, tenantService.getTenantId(tenantId)), body).contentType(MediaType.APPLICATION_YAML);
+                .PUT(apiUri("/flows/" + namespace + "/" + id ), body).contentType(MediaType.APPLICATION_YAML);
 
             client.toBlocking().retrieve(
                 this.requestOptions(request),

cli/src/main/java/io/kestra/cli/commands/flows/FlowUpdatesCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.serializers.YamlParser;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.HttpRequest;
@@ -10,7 +9,6 @@ import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -38,9 +36,6 @@ public class FlowUpdatesCommand extends AbstractApiCommand {
     @CommandLine.Option(names = {"--namespace"}, description = "The parent namespace of the flows, if not set, every namespace are allowed.")
     public String namespace;
 
-    @Inject
-    private TenantIdSelectorService tenantIdSelectorService;
-
     @SuppressWarnings("deprecation")
     @Override
     public Integer call() throws Exception {
@@ -71,7 +66,7 @@ public class FlowUpdatesCommand extends AbstractApiCommand {
                     namespaceQuery = "&namespace=" + namespace;
                 }
                 MutableHttpRequest<String> request = HttpRequest
-                    .POST(apiUri("/flows/bulk", tenantIdSelectorService.getTenantId(tenantId)) + "?allowNamespaceChild=true&delete=" + delete + namespaceQuery, body).contentType(MediaType.APPLICATION_YAML);
+                    .POST(apiUri("/flows/bulk") + "?allowNamespaceChild=true&delete=" + delete + namespaceQuery, body).contentType(MediaType.APPLICATION_YAML);
 
                 List<UpdateResult> updated = client.toBlocking().retrieve(
                     this.requestOptions(request),

cli/src/main/java/io/kestra/cli/commands/flows/FlowValidateCommand.java

@@ -1,7 +1,6 @@
 package io.kestra.cli.commands.flows;
 
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.models.flows.FlowWithSource;
 import io.kestra.core.models.validations.ModelValidator;
 import io.kestra.core.services.FlowService;
@@ -23,9 +22,6 @@ public class FlowValidateCommand extends AbstractValidateCommand {
     @Inject
     private FlowService flowService;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @Override
     public Integer call() throws Exception {
         return this.call(
@@ -39,7 +35,7 @@ public class FlowValidateCommand extends AbstractValidateCommand {
                 FlowWithSource flow = (FlowWithSource) object;
                 List<String> warnings = new ArrayList<>();
                 warnings.addAll(flowService.deprecationPaths(flow).stream().map(deprecation -> deprecation + " is deprecated").toList());
-                warnings.addAll(flowService.warnings(flow, tenantService.getTenantId(tenantId)));
+                warnings.addAll(flowService.warnings(flow, this.tenantId));
                 return warnings;
             },
             (Object object) -> {

cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommand.java

@@ -3,7 +3,6 @@ package io.kestra.cli.commands.flows.namespaces;
 import io.kestra.cli.AbstractValidateCommand;
 import io.kestra.cli.commands.AbstractServiceNamespaceUpdateCommand;
 import io.kestra.cli.commands.flows.IncludeHelperExpander;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.serializers.YamlParser;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.HttpRequest;
@@ -11,7 +10,6 @@ import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
@@ -32,9 +30,6 @@ public class FlowNamespaceUpdateCommand extends AbstractServiceNamespaceUpdateCo
     @CommandLine.Option(names = {"--override-namespaces"}, negatable = true, description = "Replace namespace of all flows by the one provided")
     public boolean override = false;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @SuppressWarnings("deprecation")
     @Override
     public Integer call() throws Exception {
@@ -64,7 +59,7 @@ public class FlowNamespaceUpdateCommand extends AbstractServiceNamespaceUpdateCo
             }
             try(DefaultHttpClient client = client()) {
                 MutableHttpRequest<String> request = HttpRequest
-                    .POST(apiUri("/flows/", tenantService.getTenantId(tenantId)) + namespace + "?delete=" + delete, body).contentType(MediaType.APPLICATION_YAML);
+                    .POST(apiUri("/flows/") + namespace + "?delete=" + delete, body).contentType(MediaType.APPLICATION_YAML);
 
                 List<UpdateResult> updated = client.toBlocking().retrieve(
                     this.requestOptions(request),

cli/src/main/java/io/kestra/cli/commands/migrations/MigrationCommand.java

@@ -1,29 +0,0 @@
-package io.kestra.cli.commands.migrations;
-
-import io.kestra.cli.AbstractCommand;
-import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import picocli.CommandLine;
-
-@CommandLine.Command(
-    name = "migrate",
-    description = "handle migrations",
-    mixinStandardHelpOptions = true,
-    subcommands = {
-        TenantMigrationCommand.class,
-    }
-)
-@Slf4j
-public class MigrationCommand extends AbstractCommand {
-    @SneakyThrows
-    @Override
-    public Integer call() throws Exception {
-        super.call();
-
-        PicocliRunner.call(App.class, "migrate",  "--help");
-
-        return 0;
-    }
-}

cli/src/main/java/io/kestra/cli/commands/migrations/TenantMigrationCommand.java

@@ -1,49 +0,0 @@
-package io.kestra.cli.commands.migrations;
-
-import io.kestra.cli.AbstractCommand;
-import io.kestra.core.repositories.TenantMigrationInterface;
-import io.micronaut.context.ApplicationContext;
-import jakarta.inject.Inject;
-import lombok.extern.slf4j.Slf4j;
-import picocli.CommandLine;
-import picocli.CommandLine.Option;
-
-@CommandLine.Command(
-    name = "default-tenant",
-    description = "migrate every elements from no tenant to the main tenant"
-)
-@Slf4j
-public class TenantMigrationCommand extends AbstractCommand {
-    @Inject
-    private ApplicationContext applicationContext;
-
-    @Option(names = "--tenant-id", description = "tenant identifier")
-    String tenantId;
-
-    @Option(names = "--tenant-name", description = "tenant name")
-    String tenantName;
-
-    @Option(names = "--dry-run", description = "Preview only, do not update")
-    boolean dryRun;
-
-    @Override
-    public Integer call() throws Exception {
-        super.call();
-
-        if (dryRun) {
-            System.out.println("🧪 Dry-run mode enabled. No changes will be applied.");
-        }
-
-        TenantMigrationService migrationService = this.applicationContext.getBean(TenantMigrationService.class);
-        try {
-            migrationService.migrateTenant(tenantId, tenantName, dryRun);
-            System.out.println("✅ Tenant migration complete.");
-        } catch (Exception e) {
-            System.err.println("❌ Tenant migration failed: " + e.getMessage());
-            e.printStackTrace();
-            return 1;
-        }
-        return 0;
-    }
-
-}

cli/src/main/java/io/kestra/cli/commands/migrations/TenantMigrationService.java

@@ -1,56 +0,0 @@
-package io.kestra.cli.commands.migrations;
-
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
-
-import com.github.javaparser.utils.Log;
-import io.kestra.core.exceptions.KestraRuntimeException;
-import io.kestra.core.models.flows.FlowInterface;
-import io.kestra.core.queues.QueueException;
-import io.kestra.core.queues.QueueFactoryInterface;
-import io.kestra.core.queues.QueueInterface;
-import io.kestra.core.repositories.FlowRepositoryInterface;
-import io.kestra.core.repositories.TenantMigrationInterface;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.inject.Singleton;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-@Singleton
-@Slf4j
-public class TenantMigrationService {
-
-    @Inject
-    private TenantMigrationInterface tenantMigrationInterface;
-
-    @Inject
-    private FlowRepositoryInterface flowRepository;
-
-    @Inject
-    @Named(QueueFactoryInterface.FLOW_NAMED)
-    private QueueInterface<FlowInterface> flowQueue;
-
-    public void migrateTenant(String tenantId, String tenantName, boolean dryRun) {
-        if (StringUtils.isNotBlank(tenantId) && !MAIN_TENANT.equals(tenantId)){
-            throw new KestraRuntimeException("Tenant configuration is an enterprise feature. It can only be main in OSS");
-        }
-
-        Log.info("🔁 Starting tenant migration...");
-        tenantMigrationInterface.migrateTenant(MAIN_TENANT, dryRun);
-        migrateQueue(dryRun);
-    }
-
-    protected void migrateQueue(boolean dryRun) {
-        if (!dryRun){
-            log.info("🔁 Starting restoring queue...");
-            flowRepository.findAllWithSourceForAllTenants().forEach(flow -> {
-                try {
-                    flowQueue.emit(flow);
-                } catch (QueueException e) {
-                    log.warn("Unable to send the flow {} to the queue", flow.uid(), e);
-                }
-            });
-        }
-    }
-
-}

cli/src/main/java/io/kestra/cli/commands/namespaces/files/NamespaceFilesUpdateCommand.java

@@ -2,14 +2,12 @@ package io.kestra.cli.commands.namespaces.files;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.utils.KestraIgnore;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.multipart.MultipartBody;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 
@@ -36,9 +34,6 @@ public class NamespaceFilesUpdateCommand extends AbstractApiCommand {
     @CommandLine.Option(names = {"--delete"}, negatable = true, description = "Whether missing should be deleted")
     public boolean delete = false;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     private static final String KESTRA_IGNORE_FILE = ".kestraignore";
 
     @Override
@@ -49,7 +44,7 @@ public class NamespaceFilesUpdateCommand extends AbstractApiCommand {
 
         try (var files = Files.walk(from); DefaultHttpClient client = client()) {
             if (delete) {
-                client.toBlocking().exchange(this.requestOptions(HttpRequest.DELETE(apiUri("/namespaces/", tenantService.getTenantId(tenantId)) + namespace + "/files?path=" + to, null)));
+                client.toBlocking().exchange(this.requestOptions(HttpRequest.DELETE(apiUri("/namespaces/") + namespace + "/files?path=" + to, null)));
             }
 
             KestraIgnore kestraIgnore = new KestraIgnore(from);
@@ -67,7 +62,7 @@ public class NamespaceFilesUpdateCommand extends AbstractApiCommand {
                 client.toBlocking().exchange(
                     this.requestOptions(
                         HttpRequest.POST(
-                            apiUri("/namespaces/", tenantService.getTenantId(tenantId)) + namespace + "/files?path=" + destination,
+                            apiUri("/namespaces/") + namespace + "/files?path=" + destination,
                             body
                         ).contentType(MediaType.MULTIPART_FORM_DATA)
                     )

cli/src/main/java/io/kestra/cli/commands/namespaces/kv/KvUpdateCommand.java

@@ -3,13 +3,11 @@ package io.kestra.cli.commands.namespaces.kv;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.kestra.cli.AbstractApiCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.serializers.JacksonMapper;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
@@ -44,9 +42,6 @@ public class KvUpdateCommand extends AbstractApiCommand {
     @Option(names = {"-f", "--file-value"}, description = "The file from which to read the value to set. If this is provided, it will take precedence over any specified value.")
     public Path fileValue;
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @Override
     public Integer call() throws Exception {
         super.call();
@@ -61,7 +56,7 @@ public class KvUpdateCommand extends AbstractApiCommand {
 
         Duration ttl = expiration == null ? null : Duration.parse(expiration);
         MutableHttpRequest<String> request = HttpRequest
-            .PUT(apiUri("/namespaces/", tenantService.getTenantId(tenantId)) + namespace + "/kv/" + key, value)
+            .PUT(apiUri("/namespaces/") + namespace + "/kv/" + key, value)
             .contentType(MediaType.APPLICATION_JSON_TYPE);
 
         if (ttl != null) {

cli/src/main/java/io/kestra/cli/commands/plugins/PluginDocCommand.java

@@ -18,8 +18,6 @@ import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.List;
 
-import static io.kestra.core.models.Plugin.isDeprecated;
-
 @CommandLine.Command(
     name = "doc",
     description = "Generate documentation for all plugins currently installed"
@@ -40,9 +38,6 @@ public class PluginDocCommand extends AbstractCommand {
     @CommandLine.Option(names = {"--schema"}, description = "Also write JSON Schema for each task")
     private boolean schema = false;
 
-    @CommandLine.Option(names = {"--skip-deprecated"},description = "Skip deprecated plugins when generating documentations")
-    private boolean skipDeprecated = false;
-
     @Override
     public Integer call() throws Exception {
         super.call();
@@ -50,11 +45,6 @@ public class PluginDocCommand extends AbstractCommand {
 
         PluginRegistry registry = pluginRegistryProvider.get();
         List<RegisteredPlugin> plugins = core ? registry.plugins() : registry.externalPlugins();
-        if (skipDeprecated) {
-            plugins = plugins.stream()
-                .filter(plugin -> !isDeprecated(plugin.getClass()))
-                .toList();
-        }
         boolean hasFailures = false;
 
         for (RegisteredPlugin registeredPlugin : plugins) {

cli/src/main/java/io/kestra/cli/commands/plugins/PluginInstallCommand.java

@@ -1,7 +1,6 @@
 package io.kestra.cli.commands.plugins;
 
 import io.kestra.core.contexts.MavenPluginRepositoryConfig;
-import io.kestra.core.exceptions.KestraRuntimeException;
 import io.kestra.core.plugins.LocalPluginManager;
 import io.kestra.core.plugins.MavenPluginDownloader;
 import io.kestra.core.plugins.PluginArtifact;
@@ -52,7 +51,7 @@ public class PluginInstallCommand extends AbstractCommand {
     Provider<MavenPluginDownloader> mavenPluginRepositoryProvider;
 
     @Inject
-    Provider<PluginCatalogService> pluginCatalogService;
+    @Client("api") HttpClient httpClient;
 
     @Override
     public Integer call() throws Exception {
@@ -86,7 +85,7 @@ public class PluginInstallCommand extends AbstractCommand {
         }
 
         if (all) {
-            PluginCatalogService service = pluginCatalogService.get();
+            PluginCatalogService service = new PluginCatalogService(httpClient, false, true);
             dependencies = service.get().stream().map(Objects::toString).toList();
         }
 
@@ -104,21 +103,12 @@ public class PluginInstallCommand extends AbstractCommand {
         }
 
         try (final PluginManager pluginManager = getPluginManager()) {
-
-            List<PluginArtifact> installed;
-            if (all) {
-                installed = new ArrayList<>(pluginArtifacts.size());
-                for (PluginArtifact pluginArtifact : pluginArtifacts) {
-                    try {
-                        installed.add(pluginManager.install(pluginArtifact, repositoryConfigs, false, pluginsPath));
-                    } catch (KestraRuntimeException e) {
-                        String cause = e.getCause() != null ? e.getCause().getMessage() : e.getMessage();
-                        stdErr("Failed to install plugin {0}. Cause: {1}", pluginArtifact, cause);
-                    }
-                }
-            } else {
-                installed = pluginManager.install(pluginArtifacts, repositoryConfigs, false, pluginsPath);
-            }
+            List<PluginArtifact> installed = pluginManager.install(
+                pluginArtifacts,
+                repositoryConfigs,
+                false,
+                pluginsPath
+            );
 
             List<URI> uris = installed.stream().map(PluginArtifact::uri).toList();
             stdOut("Successfully installed plugins {0} into {1}", dependencies, uris);

cli/src/main/java/io/kestra/cli/commands/servers/StandAloneCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.servers;
 
 import com.google.common.collect.ImmutableMap;
 import io.kestra.cli.services.FileChangedEventListener;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.contexts.KestraContext;
 import io.kestra.core.models.ServerType;
 import io.kestra.core.repositories.LocalFlowRepositoryLoader;
@@ -45,9 +44,6 @@ public class StandAloneCommand extends AbstractServerCommand {
     @CommandLine.Option(names = {"-f", "--flow-path"}, description = "the flow path containing flow to inject at startup (when running with a memory flow repository)")
     private File flowPath;
 
-    @CommandLine.Option(names = "--tenant", description = "Tenant identifier, Required to load flows from path with the enterprise edition")
-    private String tenantId;
-
     @CommandLine.Option(names = {"--worker-thread"}, description = "the number of worker threads, defaults to four times the number of available processors. Set it to 0 to avoid starting a worker.")
     private int workerThread = defaultWorkerThread();
 
@@ -102,8 +98,7 @@ public class StandAloneCommand extends AbstractServerCommand {
         if (flowPath != null) {
             try {
                 LocalFlowRepositoryLoader localFlowRepositoryLoader = applicationContext.getBean(LocalFlowRepositoryLoader.class);
-                TenantIdSelectorService tenantIdSelectorService = applicationContext.getBean(TenantIdSelectorService.class);
-                localFlowRepositoryLoader.load(tenantIdSelectorService.getTenantId(this.tenantId), this.flowPath);
+                localFlowRepositoryLoader.load(this.flowPath);
             } catch (IOException e) {
                 throw new CommandLine.ParameterException(this.spec.commandLine(), "Invalid flow path", e);
             }

cli/src/main/java/io/kestra/cli/commands/templates/TemplateExportCommand.java

@@ -2,8 +2,8 @@ package io.kestra.cli.commands.templates;
 
 import io.kestra.cli.AbstractApiCommand;
 import io.kestra.cli.AbstractValidateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.models.templates.TemplateEnabled;
+import io.micronaut.context.ApplicationContext;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -27,8 +27,9 @@ import java.nio.file.Path;
 public class TemplateExportCommand extends AbstractApiCommand {
     private static final String DEFAULT_FILE_NAME = "templates.zip";
 
+    // @FIXME: Keep it for bug in micronaut that need to have inject on top level command to inject on abstract classe
     @Inject
-    private TenantIdSelectorService tenantService;
+    private ApplicationContext applicationContext;
 
     @CommandLine.Option(names = {"--namespace"}, description = "The namespace of templates to export")
     public String namespace;
@@ -42,7 +43,7 @@ public class TemplateExportCommand extends AbstractApiCommand {
 
         try(DefaultHttpClient client = client()) {
             MutableHttpRequest<Object> request = HttpRequest
-                .GET(apiUri("/templates/export/by-query", tenantService.getTenantId(tenantId)) + (namespace != null ? "?namespace=" + namespace : ""))
+                .GET(apiUri("/templates/export/by-query") + (namespace != null ? "?namespace=" + namespace : ""))
                 .accept(MediaType.APPLICATION_OCTET_STREAM);
 
             HttpResponse<byte[]> response = client.toBlocking().exchange(this.requestOptions(request), byte[].class);

cli/src/main/java/io/kestra/cli/commands/templates/namespaces/TemplateNamespaceUpdateCommand.java

@@ -2,7 +2,6 @@ package io.kestra.cli.commands.templates.namespaces;
 
 import io.kestra.cli.AbstractValidateCommand;
 import io.kestra.cli.commands.AbstractServiceNamespaceUpdateCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
 import io.kestra.core.models.templates.Template;
 import io.kestra.core.models.templates.TemplateEnabled;
 import io.kestra.core.serializers.YamlParser;
@@ -11,7 +10,6 @@ import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.client.netty.DefaultHttpClient;
-import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;
 
@@ -29,9 +27,6 @@ import jakarta.validation.ConstraintViolationException;
 @TemplateEnabled
 public class TemplateNamespaceUpdateCommand extends AbstractServiceNamespaceUpdateCommand {
 
-    @Inject
-    private TenantIdSelectorService tenantService;
-
     @Override
     public Integer call() throws Exception {
         super.call();
@@ -49,7 +44,7 @@ public class TemplateNamespaceUpdateCommand extends AbstractServiceNamespaceUpda
 
             try (DefaultHttpClient client = client()) {
                 MutableHttpRequest<List<Template>> request = HttpRequest
-                    .POST(apiUri("/templates/", tenantService.getTenantId(tenantId)) + namespace + "?delete=" + delete, templates);
+                    .POST(apiUri("/templates/") + namespace + "?delete=" + delete, templates);
 
                 List<UpdateResult> updated = client.toBlocking().retrieve(
                     this.requestOptions(request),

cli/src/main/java/io/kestra/cli/services/FileChangedEventListener.java

@@ -12,8 +12,8 @@ import io.kestra.core.services.PluginDefaultService;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.scheduling.io.watch.FileWatchConfiguration;
-import jakarta.annotation.Nullable;
 import jakarta.inject.Inject;
+import jakarta.annotation.Nullable;
 import jakarta.inject.Singleton;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
@@ -26,8 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
-
 @Singleton
 @Slf4j
 @Requires(property = "micronaut.io.watch.enabled", value = "true")
@@ -113,8 +111,6 @@ public class FileChangedEventListener {
     }
 
     public void startListening(List<Path> paths) throws IOException, InterruptedException {
-        String tenantId = this.tenantId != null ? this.tenantId : MAIN_TENANT;
-
         for (Path path : paths) {
             path.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY);
         }
@@ -162,15 +158,7 @@ public class FileChangedEventListener {
                                     }
 
                                 } catch (NoSuchFileException e) {
-                                    log.warn("File not found: {}, deleting it", entry, e);
-                                    // the file might have been deleted while reading so if not found we try to delete the flow
-                                    flows.stream()
-                                        .filter(flow -> flow.getPath().equals(filePath.toString()))
-                                        .findFirst()
-                                        .ifPresent(flowWithPath -> {
-                                            flowFilesManager.deleteFlow(flowWithPath.getTenantId(), flowWithPath.getNamespace(), flowWithPath.getId());
-                                            this.flows.removeIf(fwp -> fwp.uidWithoutRevision().equals(flowWithPath.uidWithoutRevision()));
-                                        });
+                                    log.error("File not found: {}", entry, e);
                                 } catch (IOException e) {
                                     log.error("Error reading file: {}", entry, e);
                                 }
@@ -201,8 +189,6 @@ public class FileChangedEventListener {
     }
 
     private void loadFlowsFromFolder(Path folder) {
-        String tenantId = this.tenantId != null ? this.tenantId : MAIN_TENANT;
-
         try {
             Files.walkFileTree(folder, new SimpleFileVisitor<Path>() {
                 @Override
@@ -246,8 +232,6 @@ public class FileChangedEventListener {
     }
 
     private Optional<FlowWithSource> parseFlow(String content, Path entry) {
-        String tenantId = this.tenantId != null ? this.tenantId : MAIN_TENANT;
-
         try {
             FlowWithSource flow = pluginDefaultService.parseFlowWithAllDefaults(tenantId, content, false);
             modelValidator.validate(flow);

cli/src/main/java/io/kestra/cli/services/LocalFlowFileWatcher.java

@@ -15,7 +15,7 @@ public class LocalFlowFileWatcher implements FlowFilesManager {
 
     @Override
     public FlowWithSource createOrUpdateFlow(final GenericFlow flow) {
-        return flowRepository.findById(flow.getTenantId(), flow.getNamespace(), flow.getId())
+        return flowRepository.findById(null, flow.getNamespace(), flow.getId())
             .map(previous -> flowRepository.update(flow, previous))
             .orElseGet(() -> flowRepository.create(flow));
     }

cli/src/main/java/io/kestra/cli/services/TenantIdSelectorService.java

@@ -1,19 +0,0 @@
-package io.kestra.cli.services;
-
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
-
-import io.kestra.core.exceptions.KestraRuntimeException;
-import jakarta.inject.Singleton;
-import org.apache.commons.lang3.StringUtils;
-
-@Singleton
-public class TenantIdSelectorService {
-
-    //For override purpose in Kestra EE
-    public String getTenantId(String tenantId) {
-        if (StringUtils.isNotBlank(tenantId) && !MAIN_TENANT.equals(tenantId)){
-            throw new KestraRuntimeException("Tenant id can only be 'main'");
-        }
-        return MAIN_TENANT;
-    }
-}

cli/src/main/resources/application.yml

@@ -15,9 +15,6 @@ micronaut:
       static:
         paths: classpath:static
         mapping: /static/**
-      root:
-        paths: classpath:root
-        mapping: /**
   server:
     max-request-size: 10GB
     multipart:
@@ -27,14 +24,13 @@ micronaut:
     write-idle-timeout: 60m
     idle-timeout: 60m
     netty:
-      max-zstd-encode-size: 67108864 # increased to 64MB from the default of 32MB
       max-chunk-size: 10MB
       max-header-size: 32768 # increased from the default of 8k
-    responses:
-      file:
-        cache-seconds: 86400
-        cache-control:
-          public: true
+      responses:
+        file:
+          cache-seconds: 86400
+          cache-control:
+            public: true
 
       # Access log configuration, see https://docs.micronaut.io/latest/guide/index.html#accessLogger
       access-logger:
@@ -142,8 +138,8 @@ kestra:
   jdbc:
     queues:
       min-poll-interval: 25ms
-      max-poll-interval: 500ms
-      poll-switch-interval: 60s
+      max-poll-interval: 1000ms
+      poll-switch-interval: 5s
 
     cleaner:
       initial-delay: 1h
@@ -184,6 +180,7 @@ kestra:
 
   server:
     basic-auth:
+      enabled: false
       # These URLs will not be authenticated, by default we open some of the Micronaut default endpoints but not all for security reasons
       open-urls:
         - "/ping"
@@ -198,18 +195,13 @@ kestra:
     liveness:
       enabled: true
       # The expected time between liveness probe.
-      interval: 10s
+      interval: 5s
       # The timeout used to detect service failures.
-      timeout: 1m
+      timeout: 45s
       # The time to wait before executing a liveness probe.
-      initialDelay: 1m
+      initialDelay: 45s
       # The expected time between service heartbeats.
       heartbeatInterval: 3s
-    service:
-      purge:
-        initial-delay: 1h
-        fixed-delay: 1d
-        retention: 30d
   anonymous-usage-report:
     enabled: true
     uri: https://api.kestra.io/v1/reports/usages
@@ -228,4 +220,4 @@ otel:
     - /health
     - /env
     - /prometheus
-  propagators: tracecontext, baggage
+  propagators: tracecontext, baggage

cli/src/test/java/io/kestra/cli/ServerCommandValidatorTest.java

@@ -1,4 +1,4 @@
-package io.kestra.core.validations;
+package io.kestra.cli;
 
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.exceptions.BeanInstantiationException;

cli/src/test/java/io/kestra/cli/commands/configs/sys/ConfigPropertiesCommandTest.java

@@ -4,14 +4,11 @@ import io.micronaut.configuration.picocli.PicocliRunner;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.env.Environment;
 import org.junit.jupiter.api.Test;
-import org.yaml.snakeyaml.Yaml;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.catchThrowable;
 
 class ConfigPropertiesCommandTest {
     @Test
@@ -26,48 +23,4 @@ class ConfigPropertiesCommandTest {
             assertThat(out.toString()).contains("- test");
         }
     }
-
-    @Test
-    void shouldOutputCustomEnvironment() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(out));
-
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, "custom-env")) {
-            PicocliRunner.call(ConfigPropertiesCommand.class, ctx);
-
-            assertThat(out.toString()).contains("activeEnvironments:");
-            assertThat(out.toString()).contains("- custom-env");
-        }
-    }
-
-    @Test
-    void shouldReturnZeroOnSuccess() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(out));
-
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-            ConfigPropertiesCommand cmd = ctx.createBean(ConfigPropertiesCommand.class);
-            int result = cmd.call();
-
-            assertThat(result).isZero();
-        }
-    }
-
-    @Test
-    void shouldOutputValidYaml() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(out));
-
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-            PicocliRunner.call(ConfigPropertiesCommand.class, ctx);
-
-            String output = out.toString();
-            Yaml yaml = new Yaml();
-            Throwable thrown = catchThrowable(() -> {
-                Map<?, ?> parsed = yaml.load(output);
-                assertThat(parsed).isInstanceOf(Map.class);
-            });
-            assertThat(thrown).isNull();
-        }
-    }
 }

cli/src/test/java/io/kestra/cli/commands/flows/FlowCreateOrUpdateCommandTest.java

@@ -108,34 +108,6 @@ class FlowCreateOrUpdateCommandTest {
         }
     }
 
-    @Test
-    void should_fail_with_incorrect_tenant()  {
-        URL directory = FlowCreateOrUpdateCommandTest.class.getClassLoader().getResource("flows");
-
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-        System.setErr(new PrintStream(err));
-
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-
-            EmbeddedServer embeddedServer = ctx.getBean(EmbeddedServer.class);
-            embeddedServer.start();
-
-            String[] args = {
-                "--server",
-                embeddedServer.getURL().toString(),
-                "--user",
-                "myuser:pass:word",
-                "--tenant", "incorrect",
-                directory.getPath(),
-
-            };
-            PicocliRunner.call(FlowUpdatesCommand.class, ctx, args);
-
-            assertThat(err.toString()).contains("Tenant id can only be 'main'");
-            err.reset();
-        }
-    }
-
     @Test
     void helper()  {
         URL directory = FlowCreateOrUpdateCommandTest.class.getClassLoader().getResource("helper");
@@ -157,7 +129,7 @@ class FlowCreateOrUpdateCommandTest {
             };
             Integer call = PicocliRunner.call(FlowUpdatesCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("1 flow(s)");
         }
     }

cli/src/test/java/io/kestra/cli/commands/flows/FlowDotCommandTest.java

@@ -24,7 +24,7 @@ class FlowDotCommandTest {
             };
             Integer call = PicocliRunner.call(FlowDotCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("\"root.date\"[shape=box];");
         }
     }

cli/src/test/java/io/kestra/cli/commands/flows/FlowExpandCommandTest.java

@@ -22,7 +22,7 @@ class FlowExpandCommandTest {
             };
             Integer call = PicocliRunner.call(FlowExpandCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).isEqualTo("id: include\n" +
                 "namespace: io.kestra.cli\n" +
                 "\n" +

cli/src/test/java/io/kestra/cli/commands/flows/FlowExportCommandTest.java

@@ -55,7 +55,7 @@ class FlowExportCommandTest {
             };
             PicocliRunner.call(FlowExportCommand.class, ctx, exportArgs);
             File file = new File("/tmp/flows.zip");
-            assertThat(file.exists()).isTrue();
+            assertThat(file.exists()).isEqualTo(true);
             ZipFile zipFile = new ZipFile(file);
 
             // When launching the test in a suite, there is 4 flows but when lauching individualy there is only 3

cli/src/test/java/io/kestra/cli/commands/flows/FlowUpdatesCommandTest.java

@@ -142,7 +142,7 @@ class FlowUpdatesCommandTest {
             };
             PicocliRunner.call(FlowUpdatesCommand.class, ctx, args);
 
-            assertThat(out.toString()).contains("Invalid entity: flow.namespace: main_io.kestra.outsider_quattro_-1 - flow namespace is invalid");
+            assertThat(out.toString()).contains("Invalid entity: flow.namespace: io.kestra.outsider_quattro_-1 - flow namespace is invalid");
         }
     }
 
@@ -169,7 +169,7 @@ class FlowUpdatesCommandTest {
             };
             Integer call = PicocliRunner.call(FlowUpdatesCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("1 flow(s)");
         }
     }

cli/src/test/java/io/kestra/cli/commands/flows/FlowValidateCommandTest.java

@@ -22,7 +22,7 @@ class FlowValidateCommandTest {
             };
             Integer call = PicocliRunner.call(FlowValidateCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("✓ - io.kestra.cli / include");
         }
     }
@@ -39,7 +39,7 @@ class FlowValidateCommandTest {
             };
             Integer call = PicocliRunner.call(FlowValidateCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("✓ - system / warning");
             assertThat(out.toString()).contains("⚠ - tasks[0] is deprecated");
             assertThat(out.toString()).contains("ℹ - io.kestra.core.tasks.log.Log is replaced by io.kestra.plugin.core.log.Log");

cli/src/test/java/io/kestra/cli/commands/flows/SingleFlowCommandsTest.java

@@ -12,11 +12,12 @@ import java.net.URL;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SingleFlowCommandsTest {
+public class SingleFlowCommandsTest {
+
 
     @Test
     void all() {
-        URL flow = SingleFlowCommandsTest.class.getClassLoader().getResource("crudFlow/date.yml");
+        URL flow = SingleFlowCommandsTest.class.getClassLoader().getResource("flows/quattro.yml");
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
@@ -25,6 +26,19 @@ class SingleFlowCommandsTest {
             EmbeddedServer embeddedServer = ctx.getBean(EmbeddedServer.class);
             embeddedServer.start();
 
+            String[] deleteArgs = {
+                "--server",
+                embeddedServer.getURL().toString(),
+                "--user",
+                "myuser:pass:word",
+                "io.kestra.outsider",
+                "quattro"
+            };
+            PicocliRunner.call(FlowDeleteCommand.class, ctx, deleteArgs);
+
+            assertThat(out.toString()).contains("Flow successfully deleted !");
+            out.reset();
+
             String[] createArgs = {
                 "--server",
                 embeddedServer.getURL().toString(),
@@ -36,34 +50,21 @@ class SingleFlowCommandsTest {
 
             assertThat(out.toString()).contains("Flow successfully created !");
 
-            out.reset();
 
-            String[] updateArgs = {
+            out.reset();String[] updateArgs = {
                 "--server",
                 embeddedServer.getURL().toString(),
                 "--user",
                 "myuser:pass:word",
                 flow.getPath(),
-                "io.kestra.cli",
-                "date"
+                "io.kestra.outsider",
+                "quattro"
             };
             PicocliRunner.call(FlowUpdateCommand.class, ctx, updateArgs);
 
             assertThat(out.toString()).contains("Flow successfully updated !");
-
             out.reset();
-
-            String[] deleteArgs = {
-                "--server",
-                embeddedServer.getURL().toString(),
-                "--user",
-                "myuser:pass:word",
-                "io.kestra.cli",
-                "date"
-            };
-            PicocliRunner.call(FlowDeleteCommand.class, ctx, deleteArgs);
-
-            assertThat(out.toString()).contains("Flow successfully deleted !");
         }
     }
+
 }

cli/src/test/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceCommandTest.java

@@ -19,7 +19,7 @@ class FlowNamespaceCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(FlowNamespaceCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra flow namespace");
         }
     }

cli/src/test/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommandTest.java

@@ -162,7 +162,7 @@ class FlowNamespaceUpdateCommandTest {
             };
             Integer call = PicocliRunner.call(FlowNamespaceUpdateCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("1 flow(s)");
         }
     }

cli/src/test/java/io/kestra/cli/commands/namespaces/NamespaceCommandTest.java

@@ -19,7 +19,7 @@ class NamespaceCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(NamespaceCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra namespace");
         }
     }

cli/src/test/java/io/kestra/cli/commands/namespaces/files/NamespaceFilesCommandTest.java

@@ -19,7 +19,7 @@ class NamespaceFilesCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(NamespaceFilesCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra namespace files");
         }
     }

cli/src/test/java/io/kestra/cli/commands/namespaces/kv/KvCommandTest.java

@@ -19,7 +19,7 @@ class KvCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(KvCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra namespace kv");
         }
     }

cli/src/test/java/io/kestra/cli/commands/namespaces/kv/KvUpdateCommandTest.java

@@ -16,7 +16,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Map;
 
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class KvUpdateCommandTest {
@@ -41,7 +40,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("string").get()).isEqualTo(new KVValue("stringValue"));
             assertThat(((InternalKVStore) kvStore).getRawValue("string").get()).isEqualTo("\"stringValue\"");
@@ -69,7 +68,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("int").get()).isEqualTo(new KVValue(1));
             assertThat(((InternalKVStore) kvStore).getRawValue("int").get()).isEqualTo("1");
@@ -99,7 +98,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("intStr").get()).isEqualTo(new KVValue("1"));
             assertThat(((InternalKVStore) kvStore).getRawValue("intStr").get()).isEqualTo("\"1\"");
@@ -127,7 +126,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("object").get()).isEqualTo(new KVValue(Map.of("some", "json")));
             assertThat(((InternalKVStore) kvStore).getRawValue("object").get()).isEqualTo("{some:\"json\"}");
@@ -157,7 +156,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("objectStr").get()).isEqualTo(new KVValue("{\"some\":\"json\"}"));
             assertThat(((InternalKVStore) kvStore).getRawValue("objectStr").get()).isEqualTo("\"{\\\"some\\\":\\\"json\\\"}\"");
@@ -191,7 +190,7 @@ class KvUpdateCommandTest {
             PicocliRunner.call(KvUpdateCommand.class, ctx, args);
 
             KVStoreService kvStoreService = ctx.getBean(KVStoreService.class);
-            KVStore kvStore = kvStoreService.get(MAIN_TENANT, "io.kestra.cli", null);
+            KVStore kvStore = kvStoreService.get(null, "io.kestra.cli", null);
 
             assertThat(kvStore.getValue("objectFromFile").get()).isEqualTo(new KVValue(Map.of("some", "json", "from", "file")));
             assertThat(((InternalKVStore) kvStore).getRawValue("objectFromFile").get()).isEqualTo("{some:\"json\",from:\"file\"}");

cli/src/test/java/io/kestra/cli/commands/plugins/PluginCommandTest.java

@@ -23,32 +23,4 @@ class PluginCommandTest {
             assertThat(out.toString()).contains("Usage: kestra plugins");
         }
     }
-    
-    
-    // Additional Coverage:
-    @Test
-    void shouldListSubcommandsInHelp() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        PrintStream originalOut = System.out;
-        System.setOut(new PrintStream(out));
-        try {
-            PluginCommand cmd = new PluginCommand();
-            cmd.call();
-            String output = out.toString();
-            assertThat(output).contains("install");
-            assertThat(output).contains("uninstall");
-            assertThat(output).contains("list");
-            assertThat(output).contains("doc");
-            assertThat(output).contains("search");
-        } finally {
-            System.setOut(originalOut);
-        }
-    }
-
-    // Passes
-    @Test
-    void shouldNotLoadExternalPlugins() {
-        PluginCommand cmd = new PluginCommand();
-        assertThat(cmd.loadExternalPlugins()).isFalse();
-    }
-}
+}

cli/src/test/java/io/kestra/cli/commands/plugins/PluginDocCommandTest.java

@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class PluginDocCommandTest {
 
-    public static final String PLUGIN_TEMPLATE_TEST = "plugin-template-test-0.24.0-SNAPSHOT.jar";
+    public static final String PLUGIN_TEMPLATE_TEST = "plugin-template-test-0.18.0-SNAPSHOT.jar";
 
     @Test
     void run() throws IOException, URISyntaxException {
@@ -46,7 +46,7 @@ class PluginDocCommandTest {
             assertThat(files.size()).isEqualTo(1);
             assertThat(files.getFirst().getFileName().toString()).isEqualTo("plugin-template-test");
             var directory = files.getFirst().toFile();
-            assertThat(directory.isDirectory()).isTrue();
+            assertThat(directory.isDirectory()).isEqualTo(true);
             assertThat(directory.listFiles().length).isEqualTo(3);
 
             var readme = directory.toPath().resolve("index.md");

cli/src/test/java/io/kestra/cli/commands/plugins/PluginListCommandTest.java

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class PluginListCommandTest {
 
-    private static final String PLUGIN_TEMPLATE_TEST = "plugin-template-test-0.24.0-SNAPSHOT.jar";
+    private static final String PLUGIN_TEMPLATE_TEST = "plugin-template-test-0.18.0-SNAPSHOT.jar";
 
     @Test
     void shouldListPluginsInstalledLocally() throws IOException, URISyntaxException {

cli/src/test/java/io/kestra/cli/commands/servers/TenantIdSelectorServiceTest.java

@@ -1,33 +0,0 @@
-package io.kestra.cli.commands.servers;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.kestra.cli.App;
-import io.micronaut.configuration.picocli.PicocliRunner;
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.context.env.Environment;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import org.junit.jupiter.api.Test;
-
-public class TenantIdSelectorServiceTest {
-
-    @Test
-    void should_fail_without_tenant_id() {
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-        System.setErr(new PrintStream(err));
-
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-            String[] start = {
-                "server", "standalone",
-                "-f", "unused",
-                "--tenant", "wrong_tenant"
-            };
-            PicocliRunner.call(App.class, ctx, start);
-
-            assertThat(err.toString()).contains("Tenant id can only be 'main'");
-            err.reset();
-        }
-    }
-
-}

cli/src/test/java/io/kestra/cli/commands/sys/ReindexCommandTest.java

@@ -42,7 +42,7 @@ class ReindexCommandTest {
                "flow",
             };
             Integer call = PicocliRunner.call(ReindexCommand.class, ctx, reindexArgs);
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             // in local it reindex 3 flows and in CI 4 for an unknown reason
             assertThat(out.toString()).contains("Successfully reindex");
         }

cli/src/test/java/io/kestra/cli/commands/sys/database/DatabaseCommandTest.java

@@ -19,7 +19,7 @@ class DatabaseCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(DatabaseCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra sys database");
         }
     }

cli/src/test/java/io/kestra/cli/commands/sys/statestore/StateStoreCommandTest.java

@@ -20,7 +20,7 @@ class StateStoreCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(StateStoreCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra sys state-store");
         }
     }

cli/src/test/java/io/kestra/cli/commands/sys/statestore/StateStoreMigrateCommandTest.java

@@ -53,7 +53,7 @@ class StateStoreMigrateCommandTest {
                 oldStateStoreUri,
                 new ByteArrayInputStream("my-value".getBytes())
             );
-            assertThat(storage.exists(tenantId, flow.getNamespace(), oldStateStoreUri)).isTrue();
+            assertThat(storage.exists(tenantId, flow.getNamespace(), oldStateStoreUri)).isEqualTo(true);
 
             RunContext runContext = ctx.getBean(RunContextFactory.class).of(flow, Map.of("flow", Map.of(
                 "tenantId", tenantId,
@@ -67,9 +67,9 @@ class StateStoreMigrateCommandTest {
             Integer call = PicocliRunner.call(StateStoreMigrateCommand.class, ctx, args);
 
             assertThat(new String(stateStore.getState(true, "my-state", "sub-name", "my-taskrun-value").readAllBytes())).isEqualTo("my-value");
-            assertThat(storage.exists(tenantId, flow.getNamespace(), oldStateStoreUri)).isFalse();
+            assertThat(storage.exists(tenantId, flow.getNamespace(), oldStateStoreUri)).isEqualTo(false);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
         }
     }
 }

cli/src/test/java/io/kestra/cli/commands/templates/TemplateExportCommandTest.java

@@ -54,7 +54,7 @@ class TemplateExportCommandTest {
             };
             PicocliRunner.call(TemplateExportCommand.class, ctx, exportArgs);
             File file = new File("/tmp/templates.zip");
-            assertThat(file.exists()).isTrue();
+            assertThat(file.exists()).isEqualTo(true);
             ZipFile zipFile = new ZipFile(file);
             assertThat(zipFile.stream().count()).isEqualTo(3L);
 

cli/src/test/java/io/kestra/cli/commands/templates/TemplateValidateCommandTest.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class TemplateValidateCommandTest {
+public class TemplateValidateCommandTest {
     @Test
     void runLocal()  {
         URL directory = TemplateValidateCommandTest.class.getClassLoader().getResource("invalidsTemplates/template.yml");

cli/src/test/java/io/kestra/cli/commands/templates/namespaces/TemplateNamespaceCommandTest.java

@@ -19,7 +19,7 @@ class TemplateNamespaceCommandTest {
             String[] args = {};
             Integer call = PicocliRunner.call(TemplateNamespaceCommand.class, ctx, args);
 
-            assertThat(call).isZero();
+            assertThat(call).isEqualTo(0);
             assertThat(out.toString()).contains("Usage: kestra template namespace");
         }
     }

cli/src/test/java/io/kestra/cli/listeners/DeleteConfigurationApplicationListenersTest.java

@@ -27,7 +27,7 @@ class DeleteConfigurationApplicationListenersTest {
         );
 
         try (ApplicationContext ctx = ApplicationContext.run(mapPropertySource, Environment.CLI, Environment.TEST)) {
-            assertThat(tempFile.exists()).isFalse();
+            assertThat(tempFile.exists()).isEqualTo(false);
         }
     }
 }

cli/src/test/java/io/kestra/cli/services/FileChangedEventListenerTest.java

@@ -18,7 +18,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
 import static io.kestra.core.utils.Rethrow.throwRunnable;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -44,7 +43,6 @@ class FileChangedEventListenerTest {
     @AfterAll
     static void tearDown() throws IOException {
         if (Files.exists(Path.of(FILE_WATCH))) {
-            FileUtils.cleanDirectory(Path.of(FILE_WATCH).toFile());
             FileUtils.deleteDirectory(Path.of(FILE_WATCH).toFile());
         }
     }
@@ -59,7 +57,7 @@ class FileChangedEventListenerTest {
     @RetryingTest(5) // Flaky on CI but always pass locally
     void test() throws IOException, TimeoutException {
         // remove the flow if it already exists
-        flowRepository.findByIdWithSource(MAIN_TENANT, "io.kestra.tests.watch", "myflow").ifPresent(flow -> flowRepository.delete(flow));
+        flowRepository.findByIdWithSource(null, "io.kestra.tests.watch", "myflow").ifPresent(flow -> flowRepository.delete(flow));
 
         // create a basic flow
         String flow = """
@@ -73,11 +71,11 @@ class FileChangedEventListenerTest {
             """;
         Files.write(Path.of(FILE_WATCH + "/myflow.yaml"), flow.getBytes());
         Await.until(
-            () -> flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "myflow").isPresent(),
+            () -> flowRepository.findById(null, "io.kestra.tests.watch", "myflow").isPresent(),
             Duration.ofMillis(100),
             Duration.ofSeconds(10)
         );
-        Flow myflow = flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "myflow").orElseThrow();
+        Flow myflow = flowRepository.findById(null, "io.kestra.tests.watch", "myflow").orElseThrow();
         assertThat(myflow.getTasks()).hasSize(1);
         assertThat(myflow.getTasks().getFirst().getId()).isEqualTo("hello");
         assertThat(myflow.getTasks().getFirst().getType()).isEqualTo("io.kestra.plugin.core.log.Log");
@@ -85,7 +83,7 @@ class FileChangedEventListenerTest {
         // delete the flow
         Files.delete(Path.of(FILE_WATCH + "/myflow.yaml"));
         Await.until(
-            () -> flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "myflow").isEmpty(),
+            () -> flowRepository.findById(null, "io.kestra.tests.watch", "myflow").isEmpty(),
             Duration.ofMillis(100),
             Duration.ofSeconds(10)
         );
@@ -94,7 +92,7 @@ class FileChangedEventListenerTest {
     @RetryingTest(5) // Flaky on CI but always pass locally
     void testWithPluginDefault() throws IOException, TimeoutException {
         // remove the flow if it already exists
-        flowRepository.findByIdWithSource(MAIN_TENANT, "io.kestra.tests.watch", "pluginDefault").ifPresent(flow -> flowRepository.delete(flow));
+        flowRepository.findByIdWithSource(null, "io.kestra.tests.watch", "pluginDefault").ifPresent(flow -> flowRepository.delete(flow));
 
         // create a flow with plugin default
         String pluginDefault = """
@@ -112,11 +110,11 @@ class FileChangedEventListenerTest {
             """;
         Files.write(Path.of(FILE_WATCH + "/plugin-default.yaml"), pluginDefault.getBytes());
         Await.until(
-            () -> flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "pluginDefault").isPresent(),
+            () -> flowRepository.findById(null, "io.kestra.tests.watch", "pluginDefault").isPresent(),
             Duration.ofMillis(100),
             Duration.ofSeconds(10)
         );
-        Flow pluginDefaultFlow = flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "pluginDefault").orElseThrow();
+        Flow pluginDefaultFlow = flowRepository.findById(null, "io.kestra.tests.watch", "pluginDefault").orElseThrow();
         assertThat(pluginDefaultFlow.getTasks()).hasSize(1);
         assertThat(pluginDefaultFlow.getTasks().getFirst().getId()).isEqualTo("helloWithDefault");
         assertThat(pluginDefaultFlow.getTasks().getFirst().getType()).isEqualTo("io.kestra.plugin.core.log.Log");
@@ -124,7 +122,7 @@ class FileChangedEventListenerTest {
         // delete both files
         Files.delete(Path.of(FILE_WATCH + "/plugin-default.yaml"));
         Await.until(
-            () -> flowRepository.findById(MAIN_TENANT, "io.kestra.tests.watch", "pluginDefault").isEmpty(),
+            () -> flowRepository.findById(null, "io.kestra.tests.watch", "pluginDefault").isEmpty(),
             Duration.ofMillis(100),
             Duration.ofSeconds(10)
         );

cli/src/test/resources/application-file-watch.yml

@@ -2,7 +2,6 @@ micronaut:
   io:
     watch:
       enabled: true
-      tenantId: main
       paths:
         - build/file-watch
 

cli/src/test/resources/application-test.yml

@@ -17,7 +17,7 @@ kestra:
       central:
         url: https://repo.maven.apache.org/maven2/
       sonatype:
-        url: https://central.sonatype.com/repository/maven-snapshots/
+        url: https://s01.oss.sonatype.org/content/repositories/snapshots/
   server:
     liveness:
       enabled: false

cli/src/test/resources/crudFlow/date.yml

@@ -1,7 +0,0 @@
-id: date
-namespace: io.kestra.cli
-
-tasks:
-  - id: date
-    type: io.kestra.plugin.core.debug.Return
-    format: "{{taskrun.startDate}}"

codecov.yml

@@ -56,23 +56,21 @@ component_management:
       name: Tests
       paths:
         - tests/**
-
+    - component_id: ui
+      name: Ui
+      paths:
+        - ui/**
     - component_id: webserver
       name: Webserver
       paths:
         - webserver/**
 
-ignore:
-  - ui/**
-# we are not mature yet to have a ui code coverage
-
 flag_management:
   default_rules:
     carryforward: true
     statuses:
       - type: project
-        target: 70%
-        threshold: 10%
+        target: 80%
+        threshold: 1%
       - type: patch
-        target: 75%
-        threshold: 10%
+        target: 90%

core/build.gradle

@@ -36,8 +36,6 @@ dependencies {
     implementation group: 'de.focus-shift', name: 'jollyday-jaxb'
     implementation 'nl.basjes.gitignore:gitignore-reader'
     implementation group: 'dev.failsafe', name: 'failsafe'
-    implementation 'com.github.ben-manes.caffeine:caffeine'
-    implementation 'com.github.ksuid:ksuid:1.1.3'
     api 'org.apache.httpcomponents.client5:httpclient5'
 
     // plugins
@@ -75,9 +73,7 @@ dependencies {
     testImplementation "io.micronaut:micronaut-http-server-netty"
     testImplementation "io.micronaut:micronaut-management"
 
-    testImplementation "org.testcontainers:testcontainers:1.21.3"
-    testImplementation "org.testcontainers:junit-jupiter:1.21.3"
-    testImplementation "org.bouncycastle:bcpkix-jdk18on:1.81"
-
-    testImplementation "org.wiremock:wiremock-jetty12"
+    testImplementation "org.testcontainers:testcontainers:1.20.6"
+    testImplementation "org.testcontainers:junit-jupiter:1.20.6"
+    testImplementation "org.bouncycastle:bcpkix-jdk18on:1.80"
 }

core/src/main/java/io/kestra/core/cache/NoopCache.java

@@ -1,92 +0,0 @@
-package io.kestra.core.cache;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Policy;
-import com.github.benmanes.caffeine.cache.stats.CacheStats;
-import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-
-/**
- * A No-Op implementation of a Caffeine Cache.
- * Useful to disable caching but still use a cache to avoid if/else chains
- */
-public class NoopCache<K, V> implements Cache<K, V> {
-    private static final ConcurrentMap<?, ?> EMPTY_MAP = new ConcurrentHashMap<>(0);
-
-    @Override
-    public @Nullable V getIfPresent(K key) {
-        return null;
-    }
-
-    @Override
-    public V get(K key, Function<? super K, ? extends V> mappingFunction) {
-        return mappingFunction.apply(key);
-    }
-
-    @Override
-    public Map<K, @NonNull V> getAllPresent(Iterable<? extends K> keys) {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public Map<K, @NonNull V> getAll(Iterable<? extends K> keys, Function<? super Set<? extends K>, ? extends Map<? extends K, ? extends @NonNull V>> mappingFunction) {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void put(K key, @NonNull V value) {
-        // just do nothing
-    }
-
-    @Override
-    public void putAll(Map<? extends K, ? extends @NonNull V> map) {
-        // just do nothing
-    }
-
-    @Override
-    public void invalidate(K key) {
-        // just do nothing
-    }
-
-    @Override
-    public void invalidateAll(Iterable<? extends K> keys) {
-        // just do nothing
-    }
-
-    @Override
-    public void invalidateAll() {
-        // just do nothing
-    }
-
-    @Override
-    public long estimatedSize() {
-        return 0;
-    }
-
-    @Override
-    public CacheStats stats() {
-        return CacheStats.empty();
-    }
-
-    @Override
-    public ConcurrentMap<K, @NonNull V> asMap() {
-        return (ConcurrentMap<K, V>) EMPTY_MAP;
-    }
-
-    @Override
-    public void cleanUp() {
-        // just do nothing
-    }
-
-    @Override
-    public Policy<K, @NonNull V> policy() {
-        throw new UnsupportedOperationException();
-    }
-}

core/src/main/java/io/kestra/core/contexts/KestraBeansFactory.java

@@ -2,7 +2,6 @@ package io.kestra.core.contexts;
 
 import io.kestra.core.exceptions.KestraRuntimeException;
 import io.kestra.core.plugins.DefaultPluginRegistry;
-import io.kestra.core.plugins.PluginCatalogService;
 import io.kestra.core.plugins.PluginRegistry;
 import io.kestra.core.storages.StorageInterface;
 import io.kestra.core.storages.StorageInterfaceFactory;
@@ -14,8 +13,6 @@ import io.micronaut.context.annotation.Value;
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.convert.format.MapFormat;
 import io.micronaut.core.naming.conventions.StringConvention;
-import io.micronaut.http.client.HttpClient;
-import io.micronaut.http.client.annotation.Client;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.validation.Validator;
@@ -38,11 +35,6 @@ public class KestraBeansFactory {
     @Value("${kestra.storage.type}")
     protected Optional<String> storageType;
 
-    @Singleton
-    public PluginCatalogService pluginCatalogService(@Client("api") HttpClient httpClient) {
-        return new PluginCatalogService(httpClient, false, true);
-    }
-
     @Requires(missingBeans = PluginRegistry.class)
     @Singleton
     public PluginRegistry pluginRegistry() {

core/src/main/java/io/kestra/core/contexts/KestraContext.java

@@ -2,13 +2,11 @@ package io.kestra.core.contexts;
 
 import io.kestra.core.models.ServerType;
 import io.kestra.core.plugins.PluginRegistry;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.core.utils.VersionProvider;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.annotation.Context;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.env.Environment;
-import io.micronaut.context.env.PropertySource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,8 +80,6 @@ public abstract class KestraContext {
      */
     public abstract PluginRegistry getPluginRegistry();
 
-    public abstract StorageInterface getStorageInterface();
-
     /**
      * Shutdowns the Kestra application.
      */
@@ -150,7 +146,7 @@ public abstract class KestraContext {
                 .ifPresent(val -> configs.put(KESTRA_WORKER_GROUP_KEY, val));
 
             if (!configs.isEmpty()) {
-                environment.addPropertySource(PropertySource.of("kestra-runtime", configs));
+                environment.addPropertySource("kestra-runtime", configs);
             }
         }
 
@@ -176,11 +172,5 @@ public abstract class KestraContext {
             // Lazy init of the PluginRegistry.
             return this.applicationContext.getBean(PluginRegistry.class);
         }
-
-        @Override
-        public StorageInterface getStorageInterface() {
-            // Lazy init of the PluginRegistry.
-            return this.applicationContext.getBean(StorageInterface.class);
-        }
     }
 }

core/src/main/java/io/kestra/core/debug/Breakpoint.java

@@ -1,26 +0,0 @@
-package io.kestra.core.debug;
-
-import jakarta.annotation.Nullable;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-public class Breakpoint {
-    @NotNull
-    private String id;
-
-    @Nullable
-    private String value;
-
-    public static Breakpoint of(String breakpoint) {
-        if (breakpoint.indexOf('.') > 0) {
-            return new Breakpoint(breakpoint.substring(0, breakpoint.indexOf('.')), breakpoint.substring(breakpoint.indexOf('.') + 1));
-        } else {
-            return new Breakpoint(breakpoint, null);
-        }
-    }
-}

core/src/main/java/io/kestra/core/docs/AbstractClassDocumentation.java

@@ -1,6 +1,9 @@
 package io.kestra.core.docs;
 
 import com.google.common.base.CaseFormat;
+import io.kestra.core.models.Plugin;
+import io.kestra.core.models.tasks.retrys.AbstractRetry;
+import io.kestra.core.models.tasks.runners.TaskRunner;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -56,7 +59,7 @@ public abstract class AbstractClassDocumentation<T> {
             .filter(entry -> (baseCls == null) || !entry.getKey().startsWith("io.kestra.core.models.flows.input."))
             .map(entry -> {
                 Map<String, Object> value = (Map<String, Object>) entry.getValue();
-                value.put("properties", flatten(properties(value), required(value), null));
+                value.put("properties", flatten(properties(value), required(value), isTypeToKeep(entry.getKey())));
 
                 return new AbstractMap.SimpleEntry<>(
                     entry.getKey(),
@@ -89,13 +92,20 @@ public abstract class AbstractClassDocumentation<T> {
         }
 
         if (this.propertiesSchema.containsKey("properties")) {
-            this.inputs = flattenWithoutType(properties(this.propertiesSchema), required(this.propertiesSchema));
+            this.inputs = flatten(properties(this.propertiesSchema), required(this.propertiesSchema));
         }
     }
 
-    protected static Map<String, Object> flattenWithoutType(Map<String, Object> map, List<String> required) {
+    protected static Map<String, Object> flatten(Map<String, Object> map, List<String> required) {
         map.remove("type");
-        return flatten(map, required, null);
+        return flatten(map, required, (String) null);
+    }
+
+    protected static Map<String, Object> flatten(Map<String, Object> map, List<String> required, Boolean keepType) {
+        if (!keepType) {
+            map.remove("type");
+        }
+        return flatten(map, required, (String) null);
     }
 
     @SuppressWarnings("unchecked")
@@ -131,6 +141,23 @@ public abstract class AbstractClassDocumentation<T> {
         return result;
     }
 
+    // Some task can have the `type` property but not to represent the task
+    // so we cant to keep it in the doc
+    private Boolean isTypeToKeep(String key){
+        try {
+            if (AbstractRetry.class.isAssignableFrom(Class.forName(key))) {
+                return true;
+            }
+
+            if (TaskRunner.class.isAssignableFrom(Class.forName(key))) {
+                return true;
+            }
+        } catch (ClassNotFoundException ignored) {
+            log.debug(ignored.getMessage(), ignored);
+        }
+        return false;
+    }
+
     protected static String flattenKey(String current, String parent) {
         return (parent != null ? parent + "." : "") + current;
     }

core/src/main/java/io/kestra/core/docs/ClassPluginDocumentation.java

@@ -1,22 +1,14 @@
 package io.kestra.core.docs;
 
 import io.kestra.core.plugins.PluginClassAndMetadata;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
+import lombok.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.*;
 
 @Getter
 @EqualsAndHashCode
 @ToString
 public class ClassPluginDocumentation<T> extends AbstractClassDocumentation<T> {
-    private static final Map<PluginDocIdentifier, ClassPluginDocumentation<?>> CACHE = new ConcurrentHashMap<>();
     private String icon;
     private String group;
     protected String docLicense;
@@ -58,7 +50,7 @@ public class ClassPluginDocumentation<T> extends AbstractClassDocumentation<T> {
         }
 
         if (this.outputsSchema.containsKey("properties")) {
-            this.outputs = flattenWithoutType(properties(this.outputsSchema), required(this.outputsSchema));
+            this.outputs = flatten(properties(this.outputsSchema), required(this.outputsSchema));
         }
 
         // metrics
@@ -81,12 +73,8 @@ public class ClassPluginDocumentation<T> extends AbstractClassDocumentation<T> {
         }
     }
 
-    public static <T> ClassPluginDocumentation<T> of(JsonSchemaGenerator jsonSchemaGenerator, PluginClassAndMetadata<T> plugin, String version, boolean allProperties) {
-        //noinspection unchecked
-        return (ClassPluginDocumentation<T>) CACHE.computeIfAbsent(
-            new PluginDocIdentifier(plugin.type(), version, allProperties),
-            (key) -> new ClassPluginDocumentation<>(jsonSchemaGenerator, plugin, allProperties)
-        );
+    public static <T> ClassPluginDocumentation<T> of(JsonSchemaGenerator jsonSchemaGenerator, PluginClassAndMetadata<T> plugin, boolean allProperties) {
+        return new ClassPluginDocumentation<>(jsonSchemaGenerator, plugin, allProperties);
     }
 
     @AllArgsConstructor
@@ -97,11 +85,5 @@ public class ClassPluginDocumentation<T> extends AbstractClassDocumentation<T> {
         String unit;
         String description;
     }
-
-    private record PluginDocIdentifier(String pluginClassAndVersion, boolean allProperties) {
-        public PluginDocIdentifier(Class<?> pluginClass, String version, boolean allProperties) {
-            this(pluginClass.getName() + ":" + version, allProperties);
-        }
-    }
 }
 

core/src/main/java/io/kestra/core/docs/DocumentationGenerator.java

@@ -7,7 +7,6 @@ import io.kestra.core.models.tasks.logs.LogExporter;
 import io.kestra.core.models.tasks.runners.TaskRunner;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;
-import io.kestra.core.plugins.AdditionalPlugin;
 import io.kestra.core.plugins.PluginClassAndMetadata;
 import io.kestra.core.plugins.RegisteredPlugin;
 import io.kestra.core.runners.pebble.Extension;
@@ -76,7 +75,6 @@ public class DocumentationGenerator {
         //noinspection unchecked
         result.addAll(this.generate(registeredPlugin, registeredPlugin.getTaskRunners(), (Class) TaskRunner.class, "task-runners"));
         result.addAll(this.generate(registeredPlugin, registeredPlugin.getLogExporters(), (Class) LogExporter.class, "log-exporters"));
-        result.addAll(this.generate(registeredPlugin, registeredPlugin.getAdditionalPlugins(), AdditionalPlugin.class, "additional-plugins"));
 
         result.addAll(guides(registeredPlugin));
 
@@ -227,7 +225,7 @@ public class DocumentationGenerator {
                     baseCls,
                     null
                 );
-                return ClassPluginDocumentation.of(jsonSchemaGenerator, metadata, registeredPlugin.version(), true);
+                return ClassPluginDocumentation.of(jsonSchemaGenerator, metadata, true);
             })
             .map(pluginDocumentation -> {
                 try {

core/src/main/java/io/kestra/core/docs/JsonSchemaCache.java

@@ -24,7 +24,6 @@ public class JsonSchemaCache {
     private final JsonSchemaGenerator jsonSchemaGenerator;
 
     private final ConcurrentMap<CacheKey, Map<String, Object>> schemaCache = new ConcurrentHashMap<>();
-    private final ConcurrentMap<SchemaType, Map<String, Object>> propertiesCache = new ConcurrentHashMap<>();
 
     private final Map<SchemaType, Class<?>> classesBySchemaType = new HashMap<>();
 
@@ -45,7 +44,7 @@ public class JsonSchemaCache {
 
     public Map<String, Object> getSchemaForType(final SchemaType type,
                                                 final boolean arrayOf) {
-        return schemaCache.computeIfAbsent(new CacheKey(type, arrayOf), key -> {
+        return schemaCache.computeIfAbsent(new CacheKey(type, arrayOf), (key) -> {
 
             Class<?> cls = Optional.ofNullable(classesBySchemaType.get(type))
                 .orElseThrow(() -> new IllegalArgumentException("Cannot found schema for type '" + type + "'"));
@@ -53,16 +52,6 @@ public class JsonSchemaCache {
         });
     }
 
-    public Map<String, Object> getPropertiesForType(final SchemaType type) {
-        return propertiesCache.computeIfAbsent(type, key -> {
-
-            Class<?> cls = Optional.ofNullable(classesBySchemaType.get(type))
-                .orElseThrow(() -> new IllegalArgumentException("Cannot found properties for type '" + type + "'"));
-            return jsonSchemaGenerator.properties(null, cls);
-        });
-    }
-
-    // must be public as it's used in EE
     public void registerClassForType(final SchemaType type, final Class<?> clazz) {
         classesBySchemaType.put(type, clazz);
     }

core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java

@@ -2,7 +2,6 @@ package io.kestra.core.docs;
 
 import com.fasterxml.classmate.ResolvedType;
 import com.fasterxml.classmate.members.HierarchicType;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -24,10 +23,8 @@ import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.conditions.ScheduleCondition;
 import io.kestra.core.models.dashboards.DataFilter;
-import io.kestra.core.models.dashboards.DataFilterKPI;
 import io.kestra.core.models.dashboards.charts.Chart;
 import io.kestra.core.models.dashboards.charts.DataChart;
-import io.kestra.core.models.dashboards.charts.DataChartKPI;
 import io.kestra.core.models.property.Data;
 import io.kestra.core.models.property.Property;
 import io.kestra.core.models.tasks.Output;
@@ -36,7 +33,6 @@ import io.kestra.core.models.tasks.common.EncryptedString;
 import io.kestra.core.models.tasks.logs.LogExporter;
 import io.kestra.core.models.tasks.runners.TaskRunner;
 import io.kestra.core.models.triggers.AbstractTrigger;
-import io.kestra.core.plugins.AdditionalPlugin;
 import io.kestra.core.plugins.PluginRegistry;
 import io.kestra.core.plugins.RegisteredPlugin;
 import io.kestra.core.serializers.JacksonMapper;
@@ -58,7 +54,6 @@ import static io.kestra.core.serializers.JacksonMapper.MAP_TYPE_REFERENCE;
 @Singleton
 public class JsonSchemaGenerator {
     private static final List<Class<?>> TYPES_RESOLVED_AS_STRING = List.of(Duration.class, LocalTime.class, LocalDate.class, LocalDateTime.class, ZonedDateTime.class, OffsetDateTime.class, OffsetTime.class);
-    private static final List<Class<?>> SUBTYPE_RESOLUTION_EXCLUSION_FOR_PLUGIN_SCHEMA = List.of(Task.class, AbstractTrigger.class);
 
     private static final ObjectMapper MAPPER = JacksonMapper.ofJson().copy()
         .configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
@@ -88,16 +83,12 @@ public class JsonSchemaGenerator {
     }
 
     public <T> Map<String, Object> schemas(Class<? extends T> cls, boolean arrayOf) {
-        return this.schemas(cls, arrayOf, Collections.emptyList());
-    }
-
-    public <T> Map<String, Object> schemas(Class<? extends T> cls, boolean arrayOf, List<String> allowedPluginTypes) {
         SchemaGeneratorConfigBuilder builder = new SchemaGeneratorConfigBuilder(
             SchemaVersion.DRAFT_7,
             OptionPreset.PLAIN_JSON
         );
 
-        this.build(builder, true, allowedPluginTypes);
+        this.build(builder, true);
 
         SchemaGeneratorConfig schemaGeneratorConfig = builder.build();
 
@@ -136,15 +127,6 @@ public class JsonSchemaGenerator {
                 }
             }
         });
-
-        // do the same for all definitions
-        if (objectNode.get("definitions") instanceof ObjectNode definitions) {
-            definitions.forEach(jsonNode -> {
-                if (jsonNode instanceof ObjectNode definition) {
-                    removeRequiredOnPropsWithDefaults(definition);
-                }
-            });
-        }
     }
 
     // This hack exists because for Property we generate a anyOf for properties that are not strings.
@@ -244,10 +226,6 @@ public class JsonSchemaGenerator {
     }
 
     protected void build(SchemaGeneratorConfigBuilder builder, boolean draft7) {
-        this.build(builder, draft7, Collections.emptyList());
-    }
-
-    protected void build(SchemaGeneratorConfigBuilder builder, boolean draft7, List<String> allowedPluginTypes) {
 //        builder.withObjectMapper(builder.getObjectMapper().configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false));
         builder
             .with(new JakartaValidationModule(
@@ -259,12 +237,15 @@ public class JsonSchemaGenerator {
             .with(Option.DEFINITIONS_FOR_ALL_OBJECTS)
             .with(Option.DEFINITION_FOR_MAIN_SCHEMA)
             .with(Option.PLAIN_DEFINITION_KEYS)
-            .with(Option.ALLOF_CLEANUP_AT_THE_END);;
+            .with(Option.ALLOF_CLEANUP_AT_THE_END);
 
         if (!draft7) {
-            builder.with(new JacksonModule(JacksonOption.IGNORE_TYPE_INFO_TRANSFORM));
+            builder
+                .with(new JacksonModule(JacksonOption.IGNORE_TYPE_INFO_TRANSFORM))
+                .with(Option.MAP_VALUES_AS_ADDITIONAL_PROPERTIES);
         } else {
-            builder.with(new JacksonModule());
+            builder
+                .with(new JacksonModule());
         }
 
         // default value
@@ -364,9 +345,6 @@ public class JsonSchemaGenerator {
                 if (pluginPropertyAnnotation.internalStorageURI()) {
                     memberAttributes.put("$internalStorageURI", true);
                 }
-                if (!pluginPropertyAnnotation.group().isEmpty()) {
-                    memberAttributes.put("$group", pluginPropertyAnnotation.group());
-                }
             }
 
             Schema schema = member.getAnnotationConsideringFieldAndGetter(Schema.class);
@@ -458,13 +436,13 @@ public class JsonSchemaGenerator {
             return Object.class;
         });
 
+        // Subtype resolver for all plugins
         if (builder.build().getSchemaVersion() != SchemaVersion.DRAFT_2019_09) {
-            // Subtype resolver for all plugins
             builder.forTypesInGeneral()
                 .withSubtypeResolver((declaredType, context) -> {
                     TypeContext typeContext = context.getTypeContext();
 
-                    return this.subtypeResolver(declaredType, typeContext, allowedPluginTypes);
+                    return this.subtypeResolver(declaredType, typeContext);
                 });
 
             // description as Markdown
@@ -532,87 +510,21 @@ public class JsonSchemaGenerator {
                     collectedTypeAttributes.remove("$examples");
                 }
             });
-        } else {
-            builder.forTypesInGeneral()
-                .withSubtypeResolver((declaredType, context) -> {
-                    TypeContext typeContext = context.getTypeContext();
 
-                    if (SUBTYPE_RESOLUTION_EXCLUSION_FOR_PLUGIN_SCHEMA.contains(declaredType.getErasedType())) {
-                        return null;
+            // Ensure that `type` is defined as a constant in JSON Schema.
+            // The `const` property is used by editors for auto-completion based on that schema.
+            builder.forTypesInGeneral().withTypeAttributeOverride((collectedTypeAttributes, scope, context) -> {
+                final Class<?> pluginType = scope.getType().getErasedType();
+                if (pluginType.getAnnotation(Plugin.class) != null) {
+                    ObjectNode properties = (ObjectNode) collectedTypeAttributes.get("properties");
+                    if (properties != null) {
+                        properties.set("type", context.getGeneratorConfig().createObjectNode()
+                            .put("const", pluginType.getName())
+                        );
                     }
-
-                    return this.subtypeResolver(declaredType, typeContext, allowedPluginTypes);
-                });
-        }
-
-        // Ensure that `type` is defined as a constant in JSON Schema.
-        // The `const` property is used by editors for auto-completion based on that schema.
-        builder.forTypesInGeneral().withTypeAttributeOverride((collectedTypeAttributes, scope, context) -> {
-            final Class<?> pluginType = scope.getType().getErasedType();
-            if (pluginType.getAnnotation(Plugin.class) != null) {
-                ObjectNode properties = (ObjectNode) collectedTypeAttributes.get("properties");
-                if (properties != null) {
-                    properties.set("type", context.getGeneratorConfig().createObjectNode()
-                        .put("const", pluginType.getName())
-                    );
                 }
-            }
-        });
-
-        typeDefiningPropertiesToConst(builder);
-    }
-
-    /**
-     * Properties which are defining an implementation to choose among multiple ones (JsonTypeInfo.property) are simple String with default. We move them to be a "const": "defaultValue" instead
-     */
-    private void typeDefiningPropertiesToConst(SchemaGeneratorConfigBuilder builder) {
-        builder.forTypesInGeneral().withTypeAttributeOverride((collectedTypeAttributes, scope, context) -> {
-            final Class<?> targetType = scope.getType().getErasedType();
-            JsonTypeInfo jsonTypeInfo = Optional.ofNullable(targetType.getSuperclass()).map(c -> c.getAnnotation(JsonTypeInfo.class)).orElse(null);
-            if (jsonTypeInfo == null) {
-                return;
-            }
-
-            String property = jsonTypeInfo.property();
-            if (property == null) {
-                return;
-            }
-
-            ObjectNode properties = (ObjectNode) collectedTypeAttributes.get("properties");
-            if (properties == null) {
-                return;
-            }
-
-            String defaultValue = Optional.ofNullable(properties.get(property))
-                .flatMap(p -> {
-                    Optional<String> defaultOpt = p.optional("default").map(JsonNode::asText);
-                    if (defaultOpt.isPresent()) {
-                        return defaultOpt;
-                    }
-
-                    return p.optional("allOf").flatMap(node -> {
-                        if (node.isArray()) {
-                            Iterable<JsonNode> iterable = node::values;
-                            return StreamSupport.stream(
-                                    iterable.spliterator(),
-                                    false
-                                ).filter(subNode -> subNode.has("default"))
-                                .findFirst()
-                                .map(subNode -> subNode.get("default").asText());
-                        }
-
-                        return Optional.empty();
-                    });
-                })
-                .orElse(null);
-            if (defaultValue == null) {
-                return;
-            }
-
-            properties.set(property, context.getGeneratorConfig().createObjectNode()
-                .put("const", defaultValue)
-            );
-        });
+            });
+        }
     }
 
     private boolean isAssignableFromResolvedAsString(Class<?> declaredType) {
@@ -624,12 +536,11 @@ public class JsonSchemaGenerator {
         return false;
     }
 
-    protected List<ResolvedType> subtypeResolver(ResolvedType declaredType, TypeContext typeContext, List<String> allowedPluginTypes) {
+    protected List<ResolvedType> subtypeResolver(ResolvedType declaredType, TypeContext typeContext) {
         if (declaredType.getErasedType() == Task.class) {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getTasks().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .flatMap(clz -> safelyResolveSubtype(declaredType, clz, typeContext).stream())
                 .toList();
@@ -637,7 +548,6 @@ public class JsonSchemaGenerator {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getTriggers().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .flatMap(clz -> safelyResolveSubtype(declaredType, clz, typeContext).stream())
                 .toList();
@@ -645,7 +555,6 @@ public class JsonSchemaGenerator {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getConditions().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .flatMap(clz -> safelyResolveSubtype(declaredType, clz, typeContext).stream())
                 .toList();
@@ -654,7 +563,6 @@ public class JsonSchemaGenerator {
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getConditions().stream())
                 .filter(ScheduleCondition.class::isAssignableFrom)
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .flatMap(clz -> safelyResolveSubtype(declaredType, clz, typeContext).stream())
                 .toList();
@@ -662,7 +570,6 @@ public class JsonSchemaGenerator {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getTaskRunners().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .map(typeContext::resolve)
                 .toList();
@@ -670,18 +577,6 @@ public class JsonSchemaGenerator {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getLogExporters().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
-                .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
-                .map(typeContext::resolve)
-                .toList();
-        } else if (AdditionalPlugin.class.isAssignableFrom(declaredType.getErasedType())) { // base type for addition plugin is not AdditionalPlugin but a subtype of AdditionalPlugin.
-            return getRegisteredPlugins()
-                .stream()
-                .flatMap(registeredPlugin -> registeredPlugin.getAdditionalPlugins().stream())
-                // for additional plugins, we have one subtype by type of additional plugins (for ex: embedding store for Langchain4J), so we need to filter on the correct subtype
-                .filter(cls -> declaredType.getErasedType().isAssignableFrom(cls))
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
-                .filter(cls -> cls != declaredType.getErasedType())
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .map(typeContext::resolve)
                 .toList();
@@ -689,7 +584,6 @@ public class JsonSchemaGenerator {
             return getRegisteredPlugins()
                 .stream()
                 .flatMap(registeredPlugin -> registeredPlugin.getCharts().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
                 .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
                 .<ResolvedType>mapMulti((clz, consumer) -> {
                     if (DataChart.class.isAssignableFrom(clz)) {
@@ -701,25 +595,10 @@ public class JsonSchemaGenerator {
 
                         TypeVariable<? extends Class<? extends Chart<?>>> dataFilterType = clz.getTypeParameters()[1];
                         ParameterizedType chartAwareColumnDescriptor = ((ParameterizedType) ((WildcardType) ((ParameterizedType) dataFilterType.getBounds()[0]).getActualTypeArguments()[1]).getUpperBounds()[0]);
-
                         dataFilters.forEach(dataFilter -> {
                             Type fieldsEnum = ((ParameterizedType) dataFilter.getGenericSuperclass()).getActualTypeArguments()[0];
                             consumer.accept(typeContext.resolve(clz, fieldsEnum, typeContext.resolve(dataFilter, typeContext.resolve(chartAwareColumnDescriptor, fieldsEnum))));
                         });
-                    } else if (DataChartKPI.class.isAssignableFrom(clz)) {
-                        List<Class<? extends DataFilterKPI<?, ?>>> dataFilterKPIs = getRegisteredPlugins()
-                            .stream()
-                            .flatMap(registeredPlugin -> registeredPlugin.getDataFiltersKPI().stream())
-                            .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
-                            .toList();
-
-                        TypeVariable<? extends Class<? extends Chart<?>>> dataFilterType = clz.getTypeParameters()[1];
-                        ParameterizedType chartAwareColumnDescriptor = ((ParameterizedType) ((WildcardType) ((ParameterizedType) dataFilterType.getBounds()[0]).getActualTypeArguments()[1]).getUpperBounds()[0]);
-
-                        dataFilterKPIs.forEach(dataFilterKPI -> {
-                            Type fieldsEnum = ((ParameterizedType) dataFilterKPI.getGenericSuperclass()).getActualTypeArguments()[0];
-                            consumer.accept(typeContext.resolve(clz, fieldsEnum, typeContext.resolve(dataFilterKPI, typeContext.resolve(chartAwareColumnDescriptor, fieldsEnum))));
-                        });
                     } else {
                         consumer.accept(typeContext.resolve(clz));
                     }
@@ -756,24 +635,17 @@ public class JsonSchemaGenerator {
     }
 
     protected <T> Map<String, Object> generate(Class<? extends T> cls, @Nullable Class<T> base) {
-        return this.generate(cls, base, Collections.emptyList());
-    }
-
-    protected <T> Map<String, Object> generate(Class<? extends T> cls, @Nullable Class<T> base, List<String> allowedPluginTypes) {
         SchemaGeneratorConfigBuilder builder = new SchemaGeneratorConfigBuilder(
             SchemaVersion.DRAFT_2019_09,
             OptionPreset.PLAIN_JSON
         );
 
-        this.build(builder, false, allowedPluginTypes);
+        this.build(builder, false);
 
-        // we don't return base properties unless specified with @PluginProperty and hidden is false
+        // we don't return base properties unless specified with @PluginProperty
         builder
             .forFields()
-            .withIgnoreCheck(fieldScope -> base != null &&
-                (fieldScope.getAnnotation(PluginProperty.class) == null || fieldScope.getAnnotation(PluginProperty.class).hidden()) &&
-                fieldScope.getDeclaringType().getTypeName().equals(base.getName())
-            );
+            .withIgnoreCheck(fieldScope -> base != null && fieldScope.getAnnotation(PluginProperty.class) == null && fieldScope.getDeclaringType().getTypeName().equals(base.getName()));
 
         SchemaGeneratorConfig schemaGeneratorConfig = builder.build();
 

core/src/main/java/io/kestra/core/docs/Plugin.java

@@ -23,25 +23,28 @@ public class Plugin {
     private String group;
     private String version;
     private Map<String, String> manifest;
+    private List<String> tasks;
+    private List<String> triggers;
+    private List<String> conditions;
+    private List<String> controllers;
+    private List<String> storages;
+    private List<String> secrets;
+    private List<String> taskRunners;
     private List<String> guides;
     private List<String> aliases;
-    private List<PluginElementMetadata> tasks;
-    private List<PluginElementMetadata> triggers;
-    private List<PluginElementMetadata> conditions;
-    private List<PluginElementMetadata> controllers;
-    private List<PluginElementMetadata> storages;
-    private List<PluginElementMetadata> secrets;
-    private List<PluginElementMetadata> taskRunners;
-    private List<PluginElementMetadata> apps;
-    private List<PluginElementMetadata> appBlocks;
-    private List<PluginElementMetadata> charts;
-    private List<PluginElementMetadata> dataFilters;
-    private List<PluginElementMetadata> logExporters;
-    private List<PluginElementMetadata> additionalPlugins;
+    private List<String> apps;
+    private List<String> appBlocks;
+    private List<String> charts;
+    private List<String> dataFilters;
+    private List<String> logExporters;
     private List<PluginSubGroup.PluginCategory> categories;
     private String subGroup;
 
     public static Plugin of(RegisteredPlugin registeredPlugin, @Nullable String subgroup) {
+        return Plugin.of(registeredPlugin, subgroup, true);
+    }
+
+    public static Plugin of(RegisteredPlugin registeredPlugin, @Nullable String subgroup, boolean includeDeprecated) {
         Plugin plugin = new Plugin();
         plugin.name = registeredPlugin.name();
         PluginSubGroup subGroupInfos = null;
@@ -86,18 +89,17 @@ public class Plugin {
         plugin.subGroup = subgroup;
 
         Predicate<Class<?>> packagePredicate = c -> subgroup == null || c.getPackageName().equals(subgroup);
-        plugin.tasks = filterAndGetTypeWithMetadata(registeredPlugin.getTasks(), packagePredicate);
-        plugin.triggers = filterAndGetTypeWithMetadata(registeredPlugin.getTriggers(), packagePredicate);
-        plugin.conditions = filterAndGetTypeWithMetadata(registeredPlugin.getConditions(), packagePredicate);
-        plugin.storages = filterAndGetTypeWithMetadata(registeredPlugin.getStorages(), packagePredicate);
-        plugin.secrets = filterAndGetTypeWithMetadata(registeredPlugin.getSecrets(), packagePredicate);
-        plugin.taskRunners = filterAndGetTypeWithMetadata(registeredPlugin.getTaskRunners(), packagePredicate);
-        plugin.apps = filterAndGetTypeWithMetadata(registeredPlugin.getApps(), packagePredicate);
-        plugin.appBlocks = filterAndGetTypeWithMetadata(registeredPlugin.getAppBlocks(), packagePredicate);
-        plugin.charts = filterAndGetTypeWithMetadata(registeredPlugin.getCharts(), packagePredicate);
-        plugin.dataFilters = filterAndGetTypeWithMetadata(registeredPlugin.getDataFilters(), packagePredicate);
-        plugin.logExporters = filterAndGetTypeWithMetadata(registeredPlugin.getLogExporters(), packagePredicate);
-        plugin.additionalPlugins = filterAndGetTypeWithMetadata(registeredPlugin.getAdditionalPlugins(), packagePredicate);
+        plugin.tasks = filterAndGetClassName(registeredPlugin.getTasks(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.triggers = filterAndGetClassName(registeredPlugin.getTriggers(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.conditions = filterAndGetClassName(registeredPlugin.getConditions(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.storages = filterAndGetClassName(registeredPlugin.getStorages(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.secrets = filterAndGetClassName(registeredPlugin.getSecrets(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.taskRunners = filterAndGetClassName(registeredPlugin.getTaskRunners(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.apps = filterAndGetClassName(registeredPlugin.getApps(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.appBlocks = filterAndGetClassName(registeredPlugin.getAppBlocks(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.charts = filterAndGetClassName(registeredPlugin.getCharts(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.dataFilters = filterAndGetClassName(registeredPlugin.getDataFilters(), includeDeprecated, packagePredicate).stream().toList();
+        plugin.logExporters = filterAndGetClassName(registeredPlugin.getLogExporters(), includeDeprecated, packagePredicate).stream().toList();
 
         return plugin;
     }
@@ -107,18 +109,17 @@ public class Plugin {
      * Those classes are only filtered from the documentation to ensure backward compatibility.
      *
      * @param list              The list of classes?
+     * @param includeDeprecated whether to include deprecated plugins or not
      * @return a filtered streams.
      */
-    private static List<PluginElementMetadata> filterAndGetTypeWithMetadata(final List<? extends Class<?>> list, Predicate<Class<?>> clazzFilter) {
+    private static List<String> filterAndGetClassName(final List<? extends Class<?>> list, boolean includeDeprecated, Predicate<Class<?>> clazzFilter) {
         return list
             .stream()
             .filter(not(io.kestra.core.models.Plugin::isInternal))
+            .filter(p -> includeDeprecated || !io.kestra.core.models.Plugin.isDeprecated(p))
             .filter(clazzFilter)
-            .filter(c -> !c.getName().startsWith("org.kestra."))
-            .map(c -> new PluginElementMetadata(c.getName(), io.kestra.core.models.Plugin.isDeprecated(c) ? true : null))
+            .map(Class::getName)
+            .filter(c -> !c.startsWith("org.kestra."))
             .toList();
     }
-
-    public record PluginElementMetadata(String cls, Boolean deprecated) {
-    }
 }