Skip to content

Commit

Permalink
Revert "Merge branch 'main' into ui5-migrate-v2"
Browse files Browse the repository at this point in the history
This reverts commit 79fb867, reversing
changes made to 5b7fd61.
  • Loading branch information
OliwiaGowor committed Dec 13, 2024
1 parent 79fb867 commit 0c6d5ab
Show file tree
Hide file tree
Showing 60 changed files with 189 additions and 894 deletions.
36 changes: 0 additions & 36 deletions .github/actions/rebase/action.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/accessibility-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ 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:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/busola-backend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/busola-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/busola-web-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ 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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint-check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
jobs:
run-lint-check:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v4
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pull-integration-cluster-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ on:
- "tests/**"
- "nginx/**"
- "src/**"
- "backend/**"

jobs:
run-cluster-test:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Install Chrome # this step could be removed after https://github.com/cypress-io/cypress/issues/30374 is resolved
shell: bash
Expand All @@ -26,7 +24,8 @@ jobs:
with:
comment_on_pr: false
- uses: actions/checkout@v4
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Create Single Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pull-integration-namespace-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ on:
- "tests/**"
- "nginx/**"
- "src/**"
- "backend/**"

jobs:
run-namespace-test:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Install Chrome
shell: bash
Expand All @@ -26,7 +24,8 @@ jobs:
with:
comment_on_pr: false
- uses: actions/checkout@v4
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Create Single Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pull-kyma-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@ 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
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Install k3d
env:
K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Create Single Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-smoke-test-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Install k3d
env:
K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-smoke-test-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- name: Install k3d
env:
K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- uses: ./.github/actions/rebase
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down
10 changes: 4 additions & 6 deletions backend/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,10 @@ function extractHeadersData(req) {
const clientCAHeader = 'x-client-certificate-data';
const clientKeyDataHeader = 'x-client-key-data';
const authorizationHeader = 'x-k8s-authorization';
let targetApiServer;
if (req.headers[urlHeader]) {
targetApiServer = handleDockerDesktopSubsitution(
new URL(req.headers[urlHeader]),
);
}

const 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]);
Expand Down
7 changes: 1 addition & 6 deletions backend/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
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
Expand Down Expand Up @@ -54,8 +53,6 @@ if (process.env.NODE_ENV === 'development') {
app.use(cors({ origin: '*' }));
}

app.get('/proxy', proxyHandler);

let server = null;

if (
Expand Down Expand Up @@ -84,15 +81,13 @@ 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('/backend', handleRequest);
app.use(handleRequest);
}

process.on('SIGINT', function() {
Expand Down
50 changes: 23 additions & 27 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0c6d5ab

Please sign in to comment.