From 2e52d3a46fcf692ab6ba7dd72f88876138c6f086 Mon Sep 17 00:00:00 2001 From: Joakim Taule Kartveit Date: Tue, 3 Oct 2023 15:08:30 +0200 Subject: [PATCH] use syfohelsenettproxy in gcp --- naiserator-dev.yaml | 6 ++---- naiserator-prod.yaml | 6 ++---- src/main/kotlin/no/nav/syfo/EnvironmentVariables.kt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/naiserator-dev.yaml b/naiserator-dev.yaml index 4bbef4de..f333665c 100644 --- a/naiserator-dev.yaml +++ b/naiserator-dev.yaml @@ -52,8 +52,8 @@ spec: - application: flex-syketilfelle namespace: flex cluster: dev-gcp + - application: syfohelsenettproxy external: - - host: syfohelsenettproxy.dev-fss-pub.nais.io - host: pdl-api.dev-fss-pub.nais.io - host: smgcp-proxy.dev-fss-pub.nais.io kafka: @@ -62,9 +62,7 @@ spec: enabled: true env: - name: HELSENETT_SCOPE - value: api://dev-fss.teamsykmelding.syfohelsenettproxy/.default - - name: HELSENETT_ENDPOINT_URL - value: https://syfohelsenettproxy.dev-fss-pub.nais.io + value: api://dev-gcp.teamsykmelding.syfohelsenettproxy/.default - name: SMREGISTER_AUDIENCE value: api://dev-gcp.teamsykmelding.syfosmregister/.default - name: PDL_GRAPHQL_PATH diff --git a/naiserator-prod.yaml b/naiserator-prod.yaml index e9124248..9f42bfdd 100644 --- a/naiserator-prod.yaml +++ b/naiserator-prod.yaml @@ -51,8 +51,8 @@ spec: - application: flex-syketilfelle namespace: flex cluster: prod-gcp + - application: syfohelsenettproxy external: - - host: syfohelsenettproxy.prod-fss-pub.nais.io - host: pdl-api.prod-fss-pub.nais.io - host: smgcp-proxy.prod-fss-pub.nais.io kafka: @@ -61,9 +61,7 @@ spec: enabled: true env: - name: HELSENETT_SCOPE - value: api://prod-fss.teamsykmelding.syfohelsenettproxy/.default - - name: HELSENETT_ENDPOINT_URL - value: https://syfohelsenettproxy.prod-fss-pub.nais.io + value: api://prod-gcp.teamsykmelding.syfohelsenettproxy/.default - name: SMREGISTER_AUDIENCE value: api://prod-gcp.teamsykmelding.syfosmregister/.default - name: PDL_GRAPHQL_PATH diff --git a/src/main/kotlin/no/nav/syfo/EnvironmentVariables.kt b/src/main/kotlin/no/nav/syfo/EnvironmentVariables.kt index c6c60b1a..8b1d964e 100644 --- a/src/main/kotlin/no/nav/syfo/EnvironmentVariables.kt +++ b/src/main/kotlin/no/nav/syfo/EnvironmentVariables.kt @@ -9,7 +9,7 @@ data class EnvironmentVariables( val syketilfelleScope: String = getEnvVar("SYKETILLFELLE_SCOPE"), val applicationPort: Int = getEnvVar("APPLICATION_PORT", "8080").toInt(), val applicationThreads: Int = getEnvVar("APPLICATION_THREADS", "4").toInt(), - val norskHelsenettEndpointURL: String = getEnvVar("HELSENETT_ENDPOINT_URL"), + val norskHelsenettEndpointURL: String = "http://syfohelsenettproxy", val aadAccessTokenV2Url: String = getEnvVar("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT"), val clientIdV2: String = getEnvVar("AZURE_APP_CLIENT_ID"), val clientSecretV2: String = getEnvVar("AZURE_APP_CLIENT_SECRET"),