PEK-617 slett appene i fss, rydde opp i oppsett og test

.github/workflows/deploy_prod.yaml

@@ -44,24 +44,6 @@ jobs:
     outputs:
       image: ${{ steps.build-image.outputs.image }}
 
-  deploy_prod_fss:
-    name: Deploy to prod-fss
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      checks: write
-      packages: write
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v2
-        name: Deploy to prod-fss
-        env:
-          CLUSTER: prod-fss
-          RESOURCE: .nais/nais-prod.yaml
-          IMAGE: ${{ needs.build.outputs.image }}
-
   deploy_prod:
     name: Deploy to prod
     needs: build

.github/workflows/manual_deploy_dev.yaml

@@ -43,23 +43,6 @@ jobs:
     outputs:
       image: ${{ steps.build-image.outputs.image }}
 
-  deploy_dev:
-    name: Deploy to dev-fss
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      checks: write
-      packages: write
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v2
-        env:
-          CLUSTER: dev-fss
-          RESOURCE: .nais/nais-dev.yaml
-          IMAGE: ${{ needs.build.outputs.image }}
-
   deploy_dev-gcp:
     name: Deploy to dev-gcp
     needs: build

src/main/kotlin/no/nav/tjenestepensjon/simulering/config/WebClientConfig.kt

@@ -13,7 +13,6 @@ import org.slf4j.MDC
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Profile
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.http.client.reactive.ReactorClientHttpConnector
@@ -28,16 +27,10 @@ import reactor.netty.transport.logging.AdvancedByteBufFormat
 @Configuration
 class WebClientConfig {
 
-    @Profile(value = ["prod", "preprod", "test"])
-    @Bean
-    fun httpClient(): HttpClient =
-        HttpClient.create().proxyWithSystemProperties().option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT_MILLIS)
-            .doOnConnected { it.addHandlerLast(ReadTimeoutHandler(READ_TIMEOUT_MILLIS / 1000)) }
-
-    @Profile(value = ["prod-gcp", "dev-gcp"])
     @Bean
     fun client(): HttpClient =
-        HttpClient.create().option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 10_000)
+        HttpClient.create().option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT_MILLIS)
+            .doOnConnected { it.addHandlerLast(ReadTimeoutHandler(READ_TIMEOUT_MILLIS / 1000)) }
             .compress(true)
             .followRedirect(true)
             .doOnConnected { it.addHandlerLast(ReadTimeoutHandler(30)) }

src/main/kotlin/no/nav/tjenestepensjon/simulering/v1/consumer/GatewayTokenClient.kt

@@ -4,14 +4,12 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import no.nav.tjenestepensjon.simulering.domain.Token
 import no.nav.tjenestepensjon.simulering.domain.TokenImpl
 import no.nav.tjenestepensjon.simulering.service.TokenService
-import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Service
 import org.springframework.web.reactive.function.BodyInserters
 import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.reactive.function.client.WebClientRequestException
 import org.springframework.web.reactive.function.client.WebClientResponseException
 
-@Profile(value = ["prod-gcp", "dev-gcp"])
 @Service
 class GatewayTokenClient(private val soapGatewayAuthWebClient: WebClient,
                          private val fssGatewayAuthService: FssGatewayAuthService,