Merge branch 'main' of github.com:wundergraph/cosmo into ludwig/eng-6993-implement-field-resolver-for-graphql-operation

Author: Noroth

.github/scripts/setup-keycloak.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export KC_VERSION=25.0.1
+export KC_VERSION=26.2.5
 curl -LO  https://github.com/keycloak/keycloak/releases/download/"${KC_VERSION}"/keycloak-"${KC_VERSION}".zip
 
 unzip -q keycloak-${KC_VERSION}.zip

.github/workflows/query-planner-ci.yaml

@@ -22,24 +22,25 @@ concurrency:
   group: ${{github.workflow}}-${{github.head_ref}}
   cancel-in-progress: true
 jobs:
-  check-label-and-engine-changes:
+  check-labels-and-engine-changes:
     runs-on: ubuntu-latest
     outputs:
       has_label: ${{ steps.check_label.outputs.has_label }}
+      has_skip_label: ${{ steps.check_label_skip.outputs.has_label }}
       engine_changed: ${{ steps.check_engine_changes.outputs.engine_changed }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Go  
+      - name: Setup Go
         uses: actions/setup-go@v5
         with:
           go-version-file: router/go.mod
           cache: true
       - name: Check for query-planner label
         id: check_label
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const labels = await github.rest.issues.listLabelsOnIssue({
@@ -49,6 +50,18 @@ jobs:
             });
             const hasLabel = labels.data.some(label => label.name === 'query-planner');
             core.setOutput('has_label', hasLabel ? 'true' : 'false');
+      - name: Check for query-planner-skip label
+        id: check_label_skip
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const labels = await github.rest.issues.listLabelsOnIssue({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            const hasLabel = labels.data.some(label => label.name === 'query-planner-skip');
+            core.setOutput('has_label', hasLabel ? 'true' : 'false');
       - name: Check for changes of engine
         id: check_engine_changes
         working-directory: router
@@ -89,10 +102,10 @@ jobs:
               - 'connect/**/*'
               - '.github/workflows/cli-ci.yaml'
   build-router:
-    needs: filter-changes
+    needs: [filter-changes, check-labels-and-engine-changes]
     # This is a limitation of GitHub. Only organization members can push to GitHub Container Registry
     # For now, we will disable the push to the GitHub Container Registry for external contributor
-    if: ${{ needs.filter-changes.outputs.router_changed == 'true' && github.event.pull_request.head.repo.full_name == github.repository}}
+    if: ${{ needs.filter-changes.outputs.router_changed == 'true' && github.event.pull_request.head.repo.full_name == github.repository && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true'}}
     runs-on: ubuntu-latest
     outputs:
       image_ref: ${{ steps.build_push_image.outputs.image_ref }}
@@ -110,10 +123,9 @@ jobs:
           image_name: router-qp
           image_description: 'Cosmo Router Query Planner'
           image_platforms: linux/amd64
-          with_tests: "false"
   build-cli:
-    needs: filter-changes
-    if: ${{ needs.filter-changes.outputs.cli_changed == 'true' }}
+    needs: [filter-changes, check-labels-and-engine-changes]
+    if: ${{ needs.filter-changes.outputs.cli_changed == 'true' && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true'}}
     runs-on: ubuntu-latest
     outputs:
       wgc: ${{ steps.cli-build.outputs.artifact-url }}
@@ -125,8 +137,9 @@ jobs:
           github-sha: ${{ github.sha }}
           target: bun-linux-x64
   cli-release-url:
+    needs: [filter-changes, check-labels-and-engine-changes]
     runs-on: ubuntu-latest
-    if: ${{ needs.filter-changes.outputs.cli_changed != 'true' }}
+    if: ${{ needs.filter-changes.outputs.cli_changed != 'true' && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true'}}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -139,13 +152,13 @@ jobs:
   build_test: # This job is use to lock the merge of the PR if anything fails in the query planner
     runs-on: ubuntu-latest
     if: ${{ always() }}
-    needs: [ build-router, build-cli, cli-release-url, check-label-and-engine-changes ]
+    needs: [build-router, build-cli, cli-release-url, check-labels-and-engine-changes]
     outputs:
       workflow_url: ${{ steps.trigger_workflow.outputs.workflow_url }}
       workflow_id: ${{ steps.trigger_workflow.outputs.workflow_id }}
     steps:
       - uses: convictional/[email protected]
-        if: ${{ needs.check-label-and-engine-changes.outputs.has_label == 'true' || needs.check-label-and-engine-changes.outputs.engine_changed == 'true' }}
+        if: ${{ (needs.check-labels-and-engine-changes.outputs.has_label == 'true' || needs.check-labels-and-engine-changes.outputs.engine_changed == 'true') && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true' }}
         id: trigger_workflow
         name: Trigger Query Planner CI
         with:
@@ -162,9 +175,9 @@ jobs:
               "wgc": "${{ needs.build-cli.outputs.wgc || needs.cli-release-url.outputs.wgc }}"
             }
   get_pr_url:
-    needs: [ build_test, check-label-and-engine-changes ]
+    needs: [build_test, check-labels-and-engine-changes]
     runs-on: ubuntu-latest
-    if: ${{ always() && (needs.check-label-and-engine-changes.outputs.has_label == 'true' || needs.check-label-and-engine-changes.outputs.engine_changed == 'true') }}
+    if: ${{ always() && (needs.check-labels-and-engine-changes.outputs.has_label == 'true' || needs.check-labels-and-engine-changes.outputs.engine_changed == 'true') && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true' }}
     outputs:
       pullrequest_url: ${{ steps.get_url.outputs.pr_url }}
     steps:
@@ -200,8 +213,8 @@ jobs:
           pr_url=$(cat pr-url.txt)
           echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
   comment-on-failure:
-    needs: [build_test, get_pr_url, check-label-and-engine-changes]
-    if: ${{ (needs.check-label-and-engine-changes.outputs.has_label == 'true' || needs.check-label-and-engine-changes.outputs.engine_changed == 'true') && failure() }}
+    needs: [build_test, get_pr_url, check-labels-and-engine-changes]
+    if: ${{ (needs.check-labels-and-engine-changes.outputs.has_label == 'true' || needs.check-labels-and-engine-changes.outputs.engine_changed == 'true') && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true' && failure() }}
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR on failure
@@ -219,8 +232,8 @@ jobs:
             The Internal Query Planner CI checks failed in the celestial repository, and this is going to stop the merge of this PR.
             If you are part of the WunderGraph organization, you can [see the PR with more details](${{ needs.get_pr_url.outputs.pullrequest_url }}).
   comment-on-success:
-    needs: [build_test, get_pr_url, check-label-and-engine-changes]
-    if: ${{ (needs.check-label-and-engine-changes.outputs.has_label == 'true' || needs.check-label-and-engine-changes.outputs.engine_changed == 'true') && success() }}
+    needs: [build_test, get_pr_url, check-labels-and-engine-changes]
+    if: ${{ (needs.check-labels-and-engine-changes.outputs.has_label == 'true' || needs.check-labels-and-engine-changes.outputs.engine_changed == 'true') && needs.check-labels-and-engine-changes.outputs.has_skip_label != 'true' && success() }}
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR on failure
@@ -231,4 +244,3 @@ jobs:
             # ✅ Internal Query Planner CI checks passed
             The Internal Query Planner CI checks passed in the celestial repository, and this is going to allow the merge of this PR.
             If you are part of the WunderGraph organization, you can [see the PR with more details](${{ needs.get_pr_url.outputs.pullrequest_url }}).
-      

.github/workflows/router-ci.yaml

@@ -187,11 +187,50 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        credentials:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
         ports:
           - 6379:6379
+      redis-0:
+        image: bitnamilegacy/redis-cluster:7.2
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          ALLOW_EMPTY_PASSWORD: "yes"
+          REDIS_NODES: "redis-0 redis-1 redis-2"
+          REDIS_CLUSTER_REPLICAS: "0"
+          REDIS_CLUSTER_CREATOR: "no"
+        ports:
+          - 7001:6379
+      redis-1:
+        image: bitnamilegacy/redis-cluster:7.2
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          ALLOW_EMPTY_PASSWORD: "yes"
+          REDIS_NODES: "redis-0 redis-1 redis-2"
+          REDIS_CLUSTER_REPLICAS: "0"
+          REDIS_CLUSTER_CREATOR: "no"
+        ports:
+          - 7002:6379
+      redis-2:
+        image: bitnamilegacy/redis-cluster:7.2
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          ALLOW_EMPTY_PASSWORD: "yes"
+          REDIS_NODES: "redis-0 redis-1 redis-2"
+          REDIS_CLUSTER_REPLICAS: "0"
+          REDIS_CLUSTER_CREATOR: "yes"
+        ports:
+          - 7003:6379
       kafka:
         image: bitnamilegacy/kafka:3.7.0
         options: >-
@@ -214,6 +253,45 @@ jobs:
         ports:
           - '9092:9092'
     steps:
+      - name: Wait for Redis Cluster
+        run: |
+          echo "[CHECK] Waiting for Redis Cluster to become healthy..."
+          cluster_containers=$(docker ps --quiet --filter "ancestor=bitnamilegacy/redis-cluster:7.2")
+
+          success=0
+          for i in {1..30}; do
+            if [ $i -eq 1 ]; then
+              echo "[INIT] Forcing cluster creation..."
+              # pick one container as the "creator"
+              creator=$(echo $cluster_containers | awk '{print $1}')
+              # run the cluster create command inside it
+              docker exec "$creator" redis-cli --cluster create redis-0:6379 redis-1:6379 redis-2:6379 --cluster-replicas 0 --cluster-yes || true
+            fi
+
+            for cid in $cluster_containers; do
+              docker exec "$cid" redis-cli -p 6379 cluster info
+              if docker exec "$cid" redis-cli -p 6379 cluster info 2>/dev/null | grep -q "cluster_state:ok"; then
+                echo "[SUCCESS] Redis Cluster is ready (reported by $cid)"
+                success=1
+                break 2
+              fi
+            done
+
+            echo "[WAITING] Cluster not ready yet (attempt $i)..."
+            sleep 2
+          done
+
+          if [ $success -eq 0 ]; then
+            echo "[ERROR] Redis Cluster did not become healthy in time"
+            for cid in $cluster_containers; do
+              echo "--- Cluster info for $cid ---"
+              docker exec "$cid" redis-cli -p 6379 cluster info || true
+              docker exec "$cid" redis-cli -p 6379 cluster nodes || true
+              echo "--- Logs for $cid ---"
+              docker logs "$cid" | tail -n 100
+            done
+            exit 1
+          fi
       - uses: actions/checkout@v4
       - uses: ./.github/actions/go
         with:
@@ -224,39 +302,26 @@ jobs:
       - name: Install dependencies
         working-directory: ./router-tests
         run: go mod download
-      - name: Setup Redis Cluster (for Cluster tests)
-        uses: vishnudxb/[email protected]
-        with:
-          master1-port: 7001
-          master2-port: 7002
-          master3-port: 7003
-          slave1-port: 7004
-          slave2-port: 7005
-          slave3-port: 7006
-          sleep-duration: 5
       - name: Configure Redis Authentication & ACL
         run: |
-          sudo apt-get install -y redis-tools
           docker ps -a
           # Set a password for each master node
-          for port in 7001 7002 7003; do
-            redis-cli -h 127.0.0.1 -p $port ACL SETUSER cosmo on ">test" "~*" "+@all"
-            redis-cli -u "redis://cosmo:test@127.0.0.1:$port" ping
-            echo "ACL user 'cosmo' created with full access on port $port"
+          for cid in $(docker ps --format "{{.ID}} {{.Image}}" | grep "redis-cluster" | awk '{print $1}'); do
+            echo "Configuring ACLs in container $cid"
+            docker exec "$cid" redis-cli -p 6379 ACL SETUSER cosmo on ">test" "~*" "+@all"
+            docker exec "$cid" redis-cli -p 6379 ping
           done
+          cid=$(docker ps --format "{{.ID}} {{.Image}}" | grep "redis:7" | awk '{print $1}')
+          # Sanity checks
+          docker exec "$cid" redis-cli -p 6379 ping
+          docker exec "$cid" redis-cli -u "redis://cosmo:test@redis-0:6379" ping
+          docker exec "$cid" redis-cli -u "redis://cosmo:test@redis-0:6379" cluster nodes
       - name: Run Integration tests ${{ matrix.test_target }}
         working-directory: ./router-tests
-        run: make test test_params="-run '^Test[^(Flaky)]' --timeout=5m -p 1 --parallel 10" test_target="${{ matrix.test_target }}"
+        run: make test test_retry_count=0 test_params="-run '^Test[^(Flaky)]' --timeout=5m -p 1 --parallel 10" test_target="${{ matrix.test_target }}"
       - name: Run Flaky Integration tests ${{ matrix.test_target }}
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 5
-          retry_wait_seconds: 5
-          retry_on: error
-          command: |
-            cd router-tests
-            make test test_params="-run '^TestFlaky' --timeout=5m --parallel 1" test_target="${{ matrix.test_target }}"
+        working-directory: ./router-tests
+        run: make test test_retry_count=3 test_params="-run '^TestFlaky' --timeout=5m -p 1 --parallel 10" test_target="${{ matrix.test_target }}"
 
   image_scan:
     if: github.event.pull_request.head.repo.full_name == github.repository

Makefile

@@ -4,7 +4,7 @@ setup-build-tools:
 	go install github.com/bufbuild/buf/cmd/[email protected]
 	go install google.golang.org/protobuf/cmd/[email protected]
 	go install connectrpc.com/connect/cmd/[email protected]
-	go install gotest.tools/gotestsum@v1.12.3
+	go install gotest.tools/gotestsum@v1.13.0
 
 setup-dev-tools: setup-build-tools
 	go install github.com/amacneil/dbmate/[email protected]

admission-server/package.json

@@ -6,7 +6,7 @@
   ],
   "scripts": {
     "dev": "tsx watch src/index.ts",
-    "build": "del dist && tsc"
+    "build": "rm -rf dist && tsc"
   },
   "dependencies": {
     "@hono/node-server": "1.13.7",

cdn-server/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.5](https://github.com/wundergraph/cosmo/compare/[email protected]@0.14.5) (2025-10-03)
+
+**Note:** Version bump only for package cdn
+
 ## [0.14.4](https://github.com/wundergraph/cosmo/compare/[email protected]@0.14.4) (2025-08-07)
 
 **Note:** Version bump only for package cdn

cdn-server/cdn/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.5](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-10-03)
+
+**Note:** Version bump only for package @wundergraph/cosmo-cdn
+
 ## [0.9.4](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-08-07)
 
 **Note:** Version bump only for package @wundergraph/cosmo-cdn

cdn-server/cdn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wundergraph/cosmo-cdn",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "author": {
     "name": "WunderGraph Maintainers",
     "email": "[email protected]"
@@ -14,7 +14,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "dev": "tsc --watch",
-    "build": "del dist && tsc",
+    "build": "rm -rf dist && tsc",
     "test:watch": "vitest test",
     "test": "vitest run",
     "lint": "eslint --cache && prettier -c src test",

cdn-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdn",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "private": true,
   "author": {
     "name": "WunderGraph Maintainers",
@@ -16,7 +16,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "dev": "tsx watch src/index.ts",
-    "build": "del dist && tsc",
+    "build": "rm -rf dist && tsc",
     "start": "tsx src/index.ts",
     "lint": "eslint --cache && prettier -c src",
     "format:fix": "prettier --write -c src",