From cbe0b12a2ee2050939e066795c462ceb7a630669 Mon Sep 17 00:00:00 2001 From: sigurdgroneng Date: Fri, 26 Jul 2024 09:27:49 +0200 Subject: [PATCH] Also do not redirect kassring paths with postpending / --- .github/workflows/deploy-gcp.yml | 4 ++-- .github/workflows/deploy_feature_branch_gcp.yml | 3 +++ .../nav/veilarbaktivitet/config/filter/ProxyToOnPremFilter.kt | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-gcp.yml b/.github/workflows/deploy-gcp.yml index fe3f14fb0..67c62a64b 100644 --- a/.github/workflows/deploy-gcp.yml +++ b/.github/workflows/deploy-gcp.yml @@ -2,8 +2,8 @@ name: Deploy gcp dev og prod on: workflow_dispatch: push: - branches: - - gcp-main-2 +# branches: +# - gcp-main-2 permissions: packages: write diff --git a/.github/workflows/deploy_feature_branch_gcp.yml b/.github/workflows/deploy_feature_branch_gcp.yml index 3280369af..7d93d315f 100644 --- a/.github/workflows/deploy_feature_branch_gcp.yml +++ b/.github/workflows/deploy_feature_branch_gcp.yml @@ -2,6 +2,9 @@ name: Deploy feature branch GCP run-name: Deploy feature branch ${{ github.ref_name }} by @${{ github.actor }} on: workflow_dispatch: + push: + branches: + - gcp-main-2 permissions: packages: write diff --git a/src/main/kotlin/no/nav/veilarbaktivitet/config/filter/ProxyToOnPremFilter.kt b/src/main/kotlin/no/nav/veilarbaktivitet/config/filter/ProxyToOnPremFilter.kt index 6c37d889a..ba5857d2c 100644 --- a/src/main/kotlin/no/nav/veilarbaktivitet/config/filter/ProxyToOnPremFilter.kt +++ b/src/main/kotlin/no/nav/veilarbaktivitet/config/filter/ProxyToOnPremFilter.kt @@ -53,7 +53,9 @@ class ProxyToOnPremGateway( .or(path("/internal/isReady") .or(path("/internal/selftest")) .or(path("/internal/kassering")) + .or(path("/internal/kassering/")) .or(path("/internal/kassering/dialog")) + .or(path("/internal/kassering/dialog/")) ).negate(), sendToOnPrem ) .before(oboExchange { proxyToOnPremTokenProvider.getProxyToken() })