Merge branch 'main' into issues/688

Author: germanosin

.github/CODEOWNERS

@@ -16,7 +16,7 @@ gradle/libs.versions.toml   @kafbat/backend
 /frontend/                  @kafbat/frontend
 
 # TESTS
-/e2e-tests/                 @kafbat/qa
+/e2e-playwright/                 @kafbat/qa
 
 # INFRA
 /.github/workflows/         @kafbat/devops

.github/dependabot.yml

@@ -11,6 +11,11 @@ updates:
   labels:
     - "type/dependencies"
     - "scope/backend"
+  ignore:
+    # Disable dependabot pull requests for Netty
+    # In general, our Netty references are temporary overrides, usually applied to address transitive Spring vulnerabilities, and should be configured with caution
+    # In general, having conflicting Netty versions in the classpath is not recommended
+    - dependency-name: "io.netty:*"
   groups:
     spring-boot-dependencies:
       patterns:
@@ -20,7 +25,13 @@ updates:
       update-types:
         - "patch"
         - "minor"
+      exclude-patterns:
+          - "org.springframework.boot:*"
+          - "io.spring.dependency-management"
     other-dependencies:
+      exclude-patterns:
+        - "org.springframework.boot:*"
+        - "io.spring.dependency-management"
       patterns:
         - "*"
       update-types:

.github/workflows/cve_checks.yml

@@ -68,7 +68,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # infered from @v0.29.0
+        uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # infered from @v0.32.0
         with:
           image-ref: "ghcr.io/kafbat/kafka-ui:latest"
           format: "table"

.github/workflows/e2e-manual.yml

@@ -0,0 +1,22 @@
+name: "E2E: Playwright Manual run"
+on:
+  workflow_dispatch:
+    inputs:
+      sha:
+        description: Commit to run on
+        required: true
+        type: string
+
+permissions:
+  contents: read
+  checks: write
+  statuses: write
+
+jobs:
+  build-and-test:
+    uses: ./.github/workflows/e2e-playwright-run.yml
+    secrets: inherit
+    with:
+      sha: ${{ inputs.sha }}
+
+

.github/workflows/e2e-playwright-manual.yml

@@ -1,4 +1,4 @@
-name: "E2E: PR smoke tests"
+name: "Playwright E2E: PR tests"
 on:
   pull_request:
     types: [ "opened", "reopened", "synchronize" ]
@@ -12,7 +12,7 @@ on:
       - "api/**"
       - "serde-api/**"
       - "frontend/**"
-      - "e2e-tests/**"
+      - "e2e-playwright/**"
 
 permissions:
   contents: read
@@ -21,8 +21,7 @@ permissions:
 
 jobs:
   build-and-test:
-    uses: ./.github/workflows/e2e-run.yml
+    uses: ./.github/workflows/e2e-playwright-run.yml
     secrets: inherit
     with:
-      suite_name: "smoke"
       sha: ${{ github.event.pull_request.head.sha }}

.github/workflows/e2e-pr.yml renamed to .github/workflows/e2e-playwright-pr.yml

@@ -1,9 +1,11 @@
-name: "E2E: Playwright Manual run"
+name: "E2E: Playwright"
+
 on:
-  workflow_dispatch:
-    sha:
-      required: true
-      type: string
+  workflow_call:
+    inputs:
+      sha:
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -30,6 +32,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+          cache-dependency-path: ./e2e-playwright/package-lock.json
+          cache: 'npm'
 
       - name: Install NPM dependencies
         working-directory: ./e2e-playwright
@@ -54,10 +58,7 @@ jobs:
       - name: Build with Gradle
         id: build_app
         run: |
-          ./gradlew build \
-          -x :e2e-tests:check \
-          -x :e2e-tests:build \
-          -x test \
+          ./gradlew build -x test \
           -Pbuild-docker-images=true \
           -Pinclude-frontend=true \
           -Pversion=latest

.github/workflows/e2e-playwright.yml renamed to .github/workflows/e2e-playwright-run.yml

@@ -51,3 +51,4 @@ node_modules/
 .gradle
 @rerun.txt
 test-results
+frontend/test-report.xml