Merge branch 'main' into feature/connector-failed-modal

Author: mehmetcangulesci

.github/dependabot.yml

@@ -20,10 +20,19 @@ updates:
       update-types:
         - "patch"
         - "minor"
+      exclude-patterns:
+          - "org.springframework.boot:*"
+          - "io.spring.dependency-management"
+          # All netty references are temporary overwrites that must be set carefully
+          # We do not need dependabot to send pull requests
+          - "io.netty:*"    
     other-dependencies:
       exclude-patterns:
         - "org.springframework.boot:*"
         - "io.spring.dependency-management"
+        # All netty references are temporary overwrites that must be set carefully
+        # We do not need dependabot to send pull requests
+        - "io.netty:*"
       patterns:
         - "*"
       update-types:

.github/workflows/e2e-playwright-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-pr.yml

@@ -0,0 +1,27 @@
+name: "Playwright E2E: PR tests"
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+    paths:
+      - "build.gradle"
+      - "gradle.properties"
+      - "settings.gradle"
+      - "gradle/libs.versions.toml"
+
+      - "contract/**"
+      - "api/**"
+      - "serde-api/**"
+      - "frontend/**"
+      - "e2e-playwright/**"
+
+permissions:
+  contents: read
+  checks: write
+  statuses: write
+
+jobs:
+  build-and-test:
+    uses: ./.github/workflows/e2e-playwright-run.yml
+    secrets: inherit
+    with:
+      sha: ${{ github.event.pull_request.head.sha }}

.github/workflows/e2e-playwright.yml .github/workflows/e2e-playwright-run.yml.github/workflows/e2e-playwright.yml renamed to .github/workflows/e2e-playwright-run.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,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+          cache: 'npm'
 
       - name: Install NPM dependencies
         working-directory: ./e2e-playwright

api/build.gradle

@@ -68,6 +68,10 @@ dependencies {
     // CVE Fixes
     implementation libs.apache.commons.compress
     implementation libs.okhttp3.logging.intercepter
+    // START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
+    implementation libs.netty.codec
+    implementation libs.netty.codec.http
+    // END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
     // CVE Fixes End
 
     implementation libs.modelcontextprotocol.spring.webflux

e2e-playwright/src/features/navigation.feature

@@ -28,7 +28,7 @@ Feature: Navigation panel links
     Given Kafka Connect is visible
     When click on Kafka Connect link
     Then Kafka Connect heading visible
-    Then the end of current URL should be "connectors"
+    Then the end of current URL should be "kafka-connect/clusters"
 
   Scenario: Navigate to KSQL DB
     Given KSQL DB is visible

e2e-playwright/src/pages/Connectors/ConnectorsLocators.ts

@@ -7,7 +7,5 @@ export default class ConnectorsLocators {
       this.page = page;
     }
 
-    get heading(): Locator { return this.page.getByRole('heading', { name: 'Connectors' })};
-    get searchBox(): Locator { return this.page.getByRole('textbox', { name: 'SSearch by Connect Name' })};
-    get createConnectorButton(): Locator { return this.page.getByRole('button', { name: 'Create Schema' })};
-}
+    get clustersTab(): Locator { return this.page.getByRole('link', { name: 'Clusters' })};
+}

e2e-playwright/src/pages/Topics/TopicsCreateLocators.ts

@@ -14,7 +14,7 @@ export default class TopicCreateLocators {
   get minInSyncReplicas(): Locator { return this.page.getByRole('spinbutton', { name: 'Min In Sync Replicas' }); }
   get replicationFactor(): Locator { return this.page.getByRole('spinbutton', { name: 'Replication Factor' }); }
   get timeToRetainData(): Locator { return this.page.getByRole('spinbutton', { name: 'Time to retain data (in ms)' }); }
-  get button12Hours(): Locator { return this.page.getByRole('button', { name: 'hours' }); }
+  get button12Hours(): Locator { return this.page.getByRole('button', { name: '12 hours' }); }
   get button1Day(): Locator { return this.page.getByRole('button', { name: '1 day' }); }
   get button2Day(): Locator { return this.page.getByRole('button', { name: '2 days' }); }
   get button7Day(): Locator { return this.page.getByRole('button', { name: '7 days' }); }
@@ -27,4 +27,4 @@ export default class TopicCreateLocators {
 
   maxPartitionSizeSelect(value: string): Locator { return this.page.getByRole('option', { name: value }); }
   cleanupPolicySelect(value: string): Locator { return this.page.getByRole('list').getByRole('option', { name: value, exact: true }); }
-}
+}

e2e-playwright/src/steps/navigation.steps.ts

@@ -67,7 +67,7 @@ When('click on Kafka Connect link', async function() {
 });
 
 Then('Kafka Connect heading visible', async function() {
-  await this.locators.connectors.heading.waitFor({ state: 'visible' });
+  await this.locators.connectors.clustersTab.waitFor({ state: 'visible' });
 });
 
 Given('KSQL DB is visible', async function() {

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 spring-boot = '3.5.5'
 nimbus-jose-jwt = '10.0.2'
+netty = '4.1.125.Final'
 
 aws-msk-auth = '2.3.0'
 azure-identity = '1.15.4'
@@ -149,3 +150,9 @@ prometheus-metrics-textformats = { module = 'io.prometheus:prometheus-metrics-ex
 prometheus-metrics-exporter-pushgateway  = { module = 'io.prometheus:prometheus-metrics-exporter-pushgateway', version.ref = 'prometheus'}
 
 snappy = {module = 'org.xerial.snappy:snappy-java', version = '1.1.10.7'}
+
+# CVE fixes
+# START Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057
+netty-codec = {module = 'io.netty:netty-codec', version.ref = 'netty'}
+netty-codec-http = {module = 'io.netty:netty-codec-http', version.ref = 'netty'}
+# END Fixes https://www.cve.org/CVERecord?id=CVE-2025-58056 and https://www.cve.org/CVERecord?id=CVE-2025-58057