Merge branch 'ui5-migrate-v2' into ui5-fix-cypress

.github/actions/rebase/action.yml

@@ -0,0 +1,36 @@
+name: 'Rebase'
+description: 'Action for rebasing to the main branch'
+
+runs:
+  using: 'composite'
+  steps:
+    # Setup identity to avoid errors when git is trying to rebase without identity set
+    - name: Setup git identity
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "Rebase Action"
+      shell: bash
+
+    # Update origin/main branch locally to cover case when repo is not fully cloned
+    # for example when using `actions/checkout@v4` action with default `fetch-depth` value (1)
+    # read more: https://github.com/actions/checkout?tab=readme-ov-file#usage
+    - name: Update origin/main
+      run: |
+        git fetch origin main
+        git checkout origin/main
+        git checkout -B main
+        git pull --unshallow origin main
+
+        # go back to the HEAD commit
+        git switch --detach ${{ github.sha }}
+      shell: bash
+
+    - name: Rebase to main
+      run: |
+        git rebase main
+      shell: bash
+
+    - name: Print branch log
+      run: |
+        git log origin/main~1..
+      shell: bash

.github/workflows/accessibility-tests.yml

@@ -3,6 +3,12 @@ name: Accessibility Tests
 on:
   schedule:
     - cron: "0 6 * * 1"
+  pull_request_target:
+    types: [opened, edited, synchronize, reopened, ready_for_review]
+    paths:
+      - ".github/workflows/accessibility-tests.yml"
+      - "tests/integration/tests/accessibility/**"
+      - "tests/integration/support/**"
 
 jobs:
   run-accessibility-tests:

.github/workflows/busola-backend-build.yml

@@ -22,6 +22,7 @@ permissions:
 jobs:
   build-backend-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
+    if: github.event.pull_request.draft == false
     with:
       name: busola-backend
       dockerfile: Dockerfile

.github/workflows/busola-build.yml

@@ -34,6 +34,7 @@ permissions:
 jobs:
   build-busola-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
+    if: github.event.pull_request.draft == false
     with:
       name: busola
       dockerfile: Dockerfile

.github/workflows/busola-web-build.yml

@@ -33,6 +33,7 @@ permissions:
 jobs:
   build-web-image:
     uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
+    if: github.event.pull_request.draft == false
     with:
       name: busola-web
       dockerfile: Dockerfile.web

.github/workflows/lint-check-pr.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   run-lint-check:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/pull-integration-cluster-k3d.yml

@@ -9,17 +9,18 @@ on:
       - "tests/**"
       - "nginx/**"
       - "src/**"
+      - "backend/**"
 
 jobs:
   run-cluster-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-integration-namespace-k3d.yml

@@ -9,17 +9,18 @@ on:
       - "tests/**"
       - "nginx/**"
       - "src/**"
+      - "backend/**"
 
 jobs:
   run-namespace-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-kyma-integration-tests.yml

@@ -9,18 +9,19 @@ on:
       - "tests/integration/**"
       - "nginx/**"
       - "src/**"
+      - "backend/**"
       - "kyma/**"
       - "Dockerfile*"
 jobs:
   run-integration-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-lighthouse.yml

@@ -13,13 +13,13 @@ on:
 jobs:
   run-lighthouse-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-smoke-test-prod.yml

@@ -15,13 +15,13 @@ on:
 jobs:
   run-smoke-test-prod:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-smoke-test-stage.yml

@@ -15,13 +15,13 @@ on:
 jobs:
   run-smoke-test-stage:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-unit-tests.yml

@@ -12,13 +12,13 @@ on:
 jobs:
   run-unit-test:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
       - uses: gardenlinux/workflow-telemetry-action@v2
         with:
           comment_on_pr: false
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: ./.github/actions/rebase
       - uses: actions/setup-node@v4
         with:
           node-version: 20

backend/common.js

@@ -142,10 +142,12 @@ function extractHeadersData(req) {
   const clientCAHeader = 'x-client-certificate-data';
   const clientKeyDataHeader = 'x-client-key-data';
   const authorizationHeader = 'x-k8s-authorization';
-
-  const targetApiServer = handleDockerDesktopSubsitution(
-    new URL(req.headers[urlHeader]),
-  );
+  let targetApiServer;
+  if (req.headers[urlHeader]) {
+    targetApiServer = handleDockerDesktopSubsitution(
+      new URL(req.headers[urlHeader]),
+    );
+  }
   const ca = decodeHeaderToBuffer(req.headers[caHeader]) || certs;
   const cert = decodeHeaderToBuffer(req.headers[clientCAHeader]);
   const key = decodeHeaderToBuffer(req.headers[clientKeyDataHeader]);

backend/index.js

@@ -1,4 +1,5 @@
 import { makeHandleRequest, serveStaticApp, serveMonaco } from './common';
+import { proxyHandler } from './proxy.js';
 import { handleTracking } from './tracking.js';
 import jsyaml from 'js-yaml';
 //import { requestLogger } from './utils/other'; //uncomment this to log the outgoing traffic
@@ -53,6 +54,8 @@ if (process.env.NODE_ENV === 'development') {
   app.use(cors({ origin: '*' }));
 }
 
+app.get('/proxy', proxyHandler);
+
 let server = null;
 
 if (
@@ -81,13 +84,15 @@ const isDocker = process.env.IS_DOCKER === 'true';
 const handleRequest = makeHandleRequest();
 
 if (isDocker) {
+  // Running in dev mode
   // yup, order matters here
   serveMonaco(app);
   app.use('/backend', handleRequest);
   serveStaticApp(app, '/', '/core-ui');
 } else {
+  // Running in prod mode
   handleTracking(app);
-  app.use(handleRequest);
+  app.use('/backend', handleRequest);
 }
 
 process.on('SIGINT', function() {

backend/package.json

@@ -16,7 +16,7 @@
     "@babel/runtime": "^7.13.10",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
-    "express": "^4.21.0",
+    "express": "^4.21.2",
     "https": "^1.0.0",
     "jose": "^5.2.4",
     "js-yaml": "^4.1.0",