From e016c4010a7d6168e2b1ec5536e2f21a3e18c750 Mon Sep 17 00:00:00 2001 From: mrCherry97 Date: Wed, 11 Dec 2024 14:40:44 +0100 Subject: [PATCH 1/3] chore: override path-to-regexp package in express --- backend/package-lock.json | 14 +++++++------- backend/package.json | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index a0477a86ad..8e67d3f18f 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9233,9 +9233,9 @@ "dev": true }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "node_modules/picocolors": { "version": "1.1.0", @@ -15042,7 +15042,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -18048,9 +18048,9 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "picocolors": { "version": "1.1.0", diff --git a/backend/package.json b/backend/package.json index 42fb1cc89c..13b645f36a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,5 +39,10 @@ }, "node": { "child_process": false + }, + "overrides": { + "express": { + "path-to-regexp": "0.1.12" + } } } From 925e7f38ca04da7c7a3ddfd87e32486a5b51303f Mon Sep 17 00:00:00 2001 From: mrCherry97 Date: Wed, 11 Dec 2024 14:46:49 +0100 Subject: [PATCH 2/3] chore: override cookie package in express --- backend/package-lock.json | 27 +++++++++++++-------------- backend/package.json | 3 ++- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 8e67d3f18f..fd12f61a1c 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -4480,14 +4480,6 @@ "safe-buffer": "~5.1.1" } }, - "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -5214,6 +5206,14 @@ "node": ">= 0.10.0" } }, + "node_modules/express/node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -14510,11 +14510,6 @@ "safe-buffer": "~5.1.1" } }, - "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" - }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -15028,7 +15023,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -15056,6 +15051,10 @@ "vary": "~1.1.2" }, "dependencies": { + "cookie": { + "version": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", diff --git a/backend/package.json b/backend/package.json index 13b645f36a..9ac2de0280 100644 --- a/backend/package.json +++ b/backend/package.json @@ -42,7 +42,8 @@ }, "overrides": { "express": { - "path-to-regexp": "0.1.12" + "path-to-regexp": "0.1.12", + "cookie": "0.7.0" } } } From 4d29908f21f8177b6d1b52628dbff7f2ae07012b Mon Sep 17 00:00:00 2001 From: mrCherry97 Date: Wed, 11 Dec 2024 14:54:06 +0100 Subject: [PATCH 3/3] add backend to paths for tests workflows --- .github/workflows/pull-integration-cluster-k3d.yml | 1 + .github/workflows/pull-integration-namespace-k3d.yml | 1 + .github/workflows/pull-kyma-integration-tests.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/pull-integration-cluster-k3d.yml b/.github/workflows/pull-integration-cluster-k3d.yml index 08edcc39fb..e87f7ebb9b 100644 --- a/.github/workflows/pull-integration-cluster-k3d.yml +++ b/.github/workflows/pull-integration-cluster-k3d.yml @@ -9,6 +9,7 @@ on: - "tests/**" - "nginx/**" - "src/**" + - "backend/**" jobs: run-cluster-test: diff --git a/.github/workflows/pull-integration-namespace-k3d.yml b/.github/workflows/pull-integration-namespace-k3d.yml index d80e4e1203..5f2fb883a8 100644 --- a/.github/workflows/pull-integration-namespace-k3d.yml +++ b/.github/workflows/pull-integration-namespace-k3d.yml @@ -9,6 +9,7 @@ on: - "tests/**" - "nginx/**" - "src/**" + - "backend/**" jobs: run-namespace-test: diff --git a/.github/workflows/pull-kyma-integration-tests.yml b/.github/workflows/pull-kyma-integration-tests.yml index ca9ce5b4d0..60fc82f6bc 100644 --- a/.github/workflows/pull-kyma-integration-tests.yml +++ b/.github/workflows/pull-kyma-integration-tests.yml @@ -9,6 +9,7 @@ on: - "tests/integration/**" - "nginx/**" - "src/**" + - "backend/**" - "kyma/**" - "Dockerfile*" jobs: