Merge branch 'main' into milinda/cacheTag-initial

Author: SkArchon

.github/CODEOWNERS

@@ -14,7 +14,7 @@
 /connect/           @wundergraph/Router
 /connect-go/        @wundergraph/Router
 /controlplane/      @wundergraph/Cosmo
-/graphqlmetrics/    @wundergraph/Platform
+/graphqlmetrics/    @wundergraph/Platform @wundergraph/Router
 /helm/              @wundergraph/Platform
 /infrastructure/    @wundergraph/Platform
 /keycloak/          @wundergraph/Cosmo

.github/actions/cli-build/action.yml

@@ -26,7 +26,10 @@ runs:
         bun-version: '1.2.19'
 
     - name: Setup Node
-      uses: ./.github/actions/node
+      uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+      with:
+        cache: true
+        install: false
 
     - name: Generate outfile name
       id: outfile

.github/actions/node/action.yaml

@@ -0,0 +1,23 @@
+services:
+  redis:
+    image: redis:7
+    ports:
+      - '6379:6379'
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'ping']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  postgres:
+    image: postgres:15
+    ports:
+      - '5432:5432'
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: changeme
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U postgres']
+      interval: 10s
+      timeout: 5s
+      retries: 5

.github/compose/controlplane-ci.yaml

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

.github/scripts/setup-keycloak.sh

@@ -21,7 +21,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ./.github/actions/node
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+        with:
+          cache: true
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.github/workflows/cdn-ci.yaml

@@ -24,7 +24,10 @@ jobs:
 
       - uses: oven-sh/setup-bun@v2
 
-      - uses: ./.github/actions/node
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+        with:
+          cache: true
+          install: false
 
       - name: Install dependencies
         run: pnpm --filter ./cli --filter ./connect --filter ./shared --filter ./composition --filter ./protographic install --frozen-lockfile

.github/workflows/cli-binary-release.yaml

@@ -25,7 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ./.github/actions/node
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+        with:
+          cache: true
+          install: false
       - uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies
@@ -71,14 +74,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ["22.x", "24.x"]
+        node-version: [22, 24]
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ./.github/actions/node
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
         with:
-          node-version: ${{ matrix.node-version }}
+          runtime: node@${{ matrix.node-version }}
+          cache: true
+          install: false
       - uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies

.github/workflows/cli-ci.yaml

@@ -22,7 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ./.github/actions/node
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+        with:
+          cache: true
+          install: false
 
       - uses: ./.github/actions/go
 

.github/workflows/composition-ci.yaml

@@ -7,7 +7,8 @@ on:
       - "connect/**/*"
       - "composition/**/*"
       - "shared/**/*"
-      - ".github/workflows/cp-ci.yaml"
+      - ".github/workflows/controlplane-ci.yaml"
+      - ".github/compose/controlplane-ci.yaml"
       - ".github/scripts/setup-keycloak.sh"
 
 concurrency:
@@ -22,37 +23,30 @@ jobs:
   build_test:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    services:
-      redis:
-        # Docker Hub image
-        image: redis:7
-        credentials:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
-        ports:
-          - 6379:6379
-      postgres:
-        # Docker Hub image
-        image: postgres:15
-        credentials:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: changeme
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+    permissions:
+      contents: read
+    env:
+      DOCKER_CREDENTIALS_AVAILABLE: ${{ secrets.DOCKER_USERNAME != '' && secrets.DOCKER_PASSWORD != '' }}
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Log in to Docker Hub
+        if: env.DOCKER_CREDENTIALS_AVAILABLE == 'true'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - uses: ./.github/actions/node
+      - name: Start service containers
+        run: docker compose --project-name controlplane-ci --file .github/compose/controlplane-ci.yaml up --detach --wait --wait-timeout 60
+
+      - uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2
+        with:
+          cache: true
+          install: false
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -106,6 +100,11 @@ jobs:
           retention-days: 14
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
 
+      - name: Stop service containers
+        if: always()
+        continue-on-error: true
+        run: docker compose --project-name controlplane-ci --file .github/compose/controlplane-ci.yaml down --volumes --remove-orphans
+
   build_push_image:
     # 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 contributors
@@ -124,4 +123,3 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           image_name: controlplane
           image_description: "Cosmo Controlplane"
-