Merge branch 'refs/heads/master' into feature/draft_pr_builds

navikt · May 31, 2024 · c06af21 · c06af21
2 parents 281d614 + b0e4a2d
commit c06af21
Show file tree

Hide file tree

Showing 431 changed files with 11,387 additions and 8,028 deletions.
diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml
@@ -15,7 +15,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.frontend.yml
     with:
       working-directory: "apps/organisasjon-tilgang-frontend"
-      deploy-tag: "#deploy-test-organisasjon-tilgang-frontend"
+      deploy-tag: "#deploy-organisasjon-tilgang-frontend"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-arbeidsplassencv-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml
@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/dokarkiv-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-dokarkiv-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-inst-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml
@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/pdl-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-pdl-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -35,5 +35,5 @@
             <appender-ref ref="CONSOLE"/>
         </root>
     </springProfile>
-    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
+    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
 </configuration>
diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +24,7 @@
 
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -23,6 +23,7 @@ spec:
         - application: testnav-batch-bestilling-service
         - application: testnav-dollystatus
         - application: testnav-oversikt-frontend
+        - application: testnav-tenor-search-service
     outbound:
       rules:
         - application: generer-navn-service

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -21,10 +21,9 @@ spec:
         - application: testnav-dollystatus
         - application: testnav-helsepersonell-service
         - application: testnav-oversikt-frontend
+        - application: testnav-tenor-search-service
         - application: etterlatte-testdata
           namespace: etterlatte
-        - application: statuspoll
-          namespace: navdig
     outbound:
       rules:
         - application: generer-navn-service

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java
@@ -9,7 +9,6 @@
 import no.nav.dolly.bestilling.pdldata.command.PdlDataOpprettingCommand;
 import no.nav.dolly.bestilling.pdldata.command.PdlDataOrdreCommand;
 import no.nav.dolly.bestilling.pdldata.command.PdlDataSlettCommand;
-import no.nav.dolly.bestilling.pdldata.command.PdlDataSlettUtenomCommand;
 import no.nav.dolly.bestilling.pdldata.command.PdlDataStanaloneCommand;
 import no.nav.dolly.bestilling.pdldata.dto.PdlResponse;
 import no.nav.dolly.config.Consumers;
@@ -33,8 +32,6 @@
 @Service
 public class PdlDataConsumer implements ConsumerStatus {
 
-    private static final int BLOCK_SIZE = 10;
-
     private final TokenExchange tokenService;
     private final WebClient webClient;
     private final ServerProperties serverProperties;
@@ -72,19 +69,6 @@ public Mono<List<Void>> slettPdl(List<String> identer) {
                 .collectList();
     }
 
-    @Timed(name = "providers", tags = {"operation", "pdl_delete_utenom"})
-    public Mono<List<Void>> slettPdlUtenom(List<String> identer) {
-
-        return tokenService.exchange(serverProperties)
-                .flatMapMany(token -> Flux.range(0, (identer.size() / BLOCK_SIZE) + 1)
-                        .delayElements(Duration.ofMillis(1000))
-                        .map(count -> new PdlDataSlettUtenomCommand(webClient,
-                                identer.subList(count * BLOCK_SIZE, Math.min((count + 1) * BLOCK_SIZE, identer.size())),
-                                token.getTokenValue()).call())
-                        .flatMap(Flux::from))
-                .collectList();
-    }
-
     @Timed(name = "providers", tags = {"operation", "pdl_opprett"})
     public Flux<PdlResponse> opprettPdl(BestillingRequestDTO request) {
 

diff --git a/...kend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataSlettUtenomCommand.java b/...kend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataSlettUtenomCommand.java
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/dto/PdlResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/dto/PdlResponse.java
@@ -1,21 +1,32 @@
 package no.nav.dolly.bestilling.pdldata.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.http.HttpStatus;
 
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class PdlResponse {
 
+    private static final String FINNES_IKKE = "finnes ikke";
+
     private String ident;
     private String jsonNode;
     private HttpStatus status;
     private String feilmelding;
+
+    @JsonIgnore
+    public boolean isFinnesIkke() {
+
+        return isNotBlank(feilmelding) && feilmelding.contains(FINNES_IKKE);
+    }
 }
diff --git a/.../src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/OpprettPersonCommand.java b/.../src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/OpprettPersonCommand.java
@@ -9,6 +9,7 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClientRequest;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
@@ -19,6 +20,7 @@
 import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
 import static no.nav.dolly.util.CallIdUtil.generateCallId;
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
+import static no.nav.dolly.util.RequestTimeout.REQUEST_DURATION;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 
 @Slf4j
@@ -41,6 +43,10 @@ public Flux<PensjonforvalterResponse> call() {
                 .uri(uriBuilder -> uriBuilder
                         .path(PENSJON_OPPRETT_PERSON_URL)
                         .build())
+                .httpRequest(httpRequest -> {
+                    HttpClientRequest reactorRequest = httpRequest.getNativeRequest();
+                    reactorRequest.responseTimeout(Duration.ofSeconds(REQUEST_DURATION));
+                })
                 .header(AUTHORIZATION, "Bearer " + token)
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())
                 .header(HEADER_NAV_CALL_ID, callId)
@@ -68,4 +74,4 @@ public Flux<PensjonforvalterResponse> call() {
                                         .toList())
                                 .build()));
     }
-}
+}