Merge branch 'master' into master

Author: DSingh0304

.devcontainer/docker-compose.yml

@@ -1,6 +1,6 @@
 include:
   - path:
-    - ../e2e/server/docker-compose.common.yml
+    - ../e2e/server/docker-compose.yml
     - docker-compose.override.yml
 services:
   apisix-dashboard:

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # 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)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
       #    make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/e2e.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           run_install: false
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "22"
           cache: "pnpm"
@@ -72,14 +72,13 @@ jobs:
       - name: Waiting dashboard service to be healthy
         working-directory: ./e2e/server
         run: |
-          E2E_SERVER="dashboard-e2e"
           TIMEOUT=30
           timeout $TIMEOUT bash -c '
-            until [ "$(docker inspect --format="{{.State.Health.Status}}" $(docker compose ps -q '$E2E_SERVER'))" = "healthy" ]; do
-              echo "'$E2E_SERVER' is starting..."
+            until curl -f http://127.0.0.1:9180/ui > /dev/null 2>&1; do
+              echo "Waiting for APISIX dashboard to be ready..."
               sleep 5
             done
-          ' || (echo "$E2E_SERVER not healthy after $TIMEOUT seconds" && exit 1)
+          ' || (echo "APISIX dashboard not ready after $TIMEOUT seconds" && exit 1)
 
       - name: Run e2e tests
         run: |

e2e/server/Dockerfile

@@ -35,6 +35,6 @@ COPY . .
 RUN apk add --no-cache git
 RUN corepack enable pnpm && pnpm build
 
-# serve ui
-FROM nginx:1.28.0-alpine-slim AS runner
-COPY --from=builder /app/dist /usr/share/nginx/html
+# embed dashboard ui into apisix
+FROM apache/apisix:dev
+COPY --from=builder /app/dist /usr/local/apisix/ui/

e2e/server/docker-compose.common.yml

@@ -15,32 +15,38 @@
 # limitations under the License.
 #
 
-include:
-  - docker-compose.common.yml
 services:
-  dashboard-e2e:
+  apisix:
     build:
       context: ../..
       dockerfile: e2e/server/Dockerfile
+    restart: always
     volumes:
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
-    networks:
-      - apisix
+      - ./apisix_conf.yml:/usr/local/apisix/conf/config.yaml:ro
     ports:
-      - '6174:6174'
+      - '9180:9180'
     depends_on:
+      - etcd
+    networks:
+      - apisix
+
+  etcd:
+    image: bitnamilegacy/etcd:3.5
+
+    restart: always
+    volumes:
+      - etcd_data:/bitnami/etcd
+    environment:
+      ETCD_ENABLE_V2: 'true'
+      ALLOW_NONE_AUTHENTICATION: 'yes'
+      ETCD_ADVERTISE_CLIENT_URLS: 'http://etcd:2379'
+      ETCD_LISTEN_CLIENT_URLS: 'http://0.0.0.0:2379'
+    networks:
       - apisix
-    healthcheck:
-      test:
-        [
-          'CMD',
-          'wget',
-          '--quiet',
-          '--tries=1',
-          '--spider',
-          'http://127.0.0.1:6174/ui/',
-        ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
+
+networks:
+  apisix:
+    driver: bridge
+
+volumes:
+  etcd_data:

e2e/server/docker-compose.yml

@@ -36,6 +36,7 @@ import path from 'node:path';
 import { promisify } from 'node:util';
 
 import { streamRoutesPom } from '@e2e/pom/stream_routes';
+import { env } from '@e2e/utils/env';
 import { test } from '@e2e/utils/test';
 import { expect } from '@playwright/test';
 import { produce, type WritableDraft } from 'immer';
@@ -67,11 +68,11 @@ const updateAPISIXConf = async (
 
 const restartDockerServices = async () => {
   await execAsync('docker compose restart apisix', { cwd: getE2EServerDir() });
-  const url = 'http://127.0.0.1:6174/ui/';
+  const url = env.E2E_TARGET_URL;
   const maxRetries = 20;
   const interval = 1000;
   for (let i = 0; i < maxRetries; i++) {
-    const res = await fetch(url);
+    const res = await fetch(url).catch(() => ({ ok: false }));
     if (res.ok) return;
     await new Promise((resolve) => setTimeout(resolve, interval));
   }

e2e/server/nginx.conf

@@ -28,8 +28,8 @@ export const env = parseEnv(process.env, {
   E2E_TARGET_URL: z
     .string()
     .url()
-    .default(`http://localhost:6174${BASE_PATH}/`)
+    .default(`http://localhost:9180${BASE_PATH}/`)
     .describe(
-      `If you want to access the test server from dev container playwright to host e2e server, try http://host.docker.internal:6174${BASE_PATH}/`
+      `If you want to access the test server from dev container playwright to host e2e server, try http://host.docker.internal:9180${BASE_PATH}/`
     ),
 });

e2e/tests/stream_routes.show-disabled-error.spec.ts

@@ -16,7 +16,7 @@
  */
 import { InputWrapper, type InputWrapperProps, Skeleton } from '@mantine/core';
 import { Editor } from '@monaco-editor/react';
-import classNames from 'clsx';
+import { clsx } from 'clsx';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import {
   type FieldValues,