Fikset merge conflicts

navikt · Apr 18, 2024 · dc53ef1 · dc53ef1
2 parents 9e67ddc + 1333bec
commit dc53ef1
Show file tree

Hide file tree

Showing 243 changed files with 2,143 additions and 2,560 deletions.
diff --git a/apps/adresse-service/config.yml b/apps/adresse-service/config.yml
@@ -39,31 +39,20 @@ spec:
  accessPolicy:
  inbound:
  rules:
- - application: testnav-oversikt-frontend
- cluster: dev-gcp
+ - application: dolly-frontend
+ - application: dolly-frontend-dev
+ - application: dolly-frontend-dev-unstable
+ - application: dolly-idporten
  - application: team-dolly-lokal-app
-  cluster: dev-gcp
+ - application: testnav-endringsmelding-service
  - application: testnav-organisasjon-forvalter
-  cluster: dev-gcp
+ - application: testnav-oversikt-frontend
  - application: testnav-pdl-forvalter
- cluster: dev-gcp
  - application: testnav-pdl-forvalter-dev
- cluster: dev-gcp
- - application: tps-forvalteren-dev
- cluster: dev-fss
  - application: tps-forvalteren
  cluster: dev-fss
- - application: dolly-frontend-dev
- cluster: dev-gcp
- - application: dolly-frontend
- cluster: dev-gcp
- - application: dolly-idporten
- cluster: dev-gcp
- - application: app-1
- namespace: plattformsikkerhet
- cluster: dev-gcp
- - application: testnav-endringsmelding-service
- cluster: dev-gcp
+ - application: tps-forvalteren-dev
+ cluster: dev-fss
  outbound:
  external:
  - host: testnav-pdl-proxy.dev-fss-pub.nais.io
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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
  <rootCauseFirst>true</rootCauseFirst>
  <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -35,5 +36,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/config.yml b/apps/amelding-service/config.yml
@@ -11,23 +11,13 @@ spec:
  accessPolicy:
  inbound:
  rules:
- - application: team-dolly-lokal-app
- cluster: dev-gcp
- - application: testnav-oversikt-frontend
- cluster: dev-gcp
- - application: dolly-backend-dev
- cluster: dev-gcp
  - application: dolly-backend
- cluster: dev-gcp
- - application: dolly-frontend-dev
- cluster: dev-gcp
+ - application: dolly-backend-dev
  - application: dolly-frontend
-  cluster: dev-gcp
+ - application: dolly-frontend-dev
  - application: dolly-idporten
- cluster: dev-gcp
- - application: app-1
- namespace: plattformsikkerhet
- cluster: dev-gcp
+ - application: team-dolly-lokal-app
+ - application: testnav-oversikt-frontend
  outbound:
  rules:
  - application: testnav-oppsummeringsdokument-service

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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
  <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
  <rootCauseFirst>true</rootCauseFirst>
  <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml
@@ -19,12 +19,7 @@ spec:
  inbound:
  rules:
  - application: team-dolly-lokal-app
- cluster: dev-gcp
  - application: testnav-oversikt-frontend
- cluster: dev-gcp
- - application: app-1
- cluster: dev-gcp
- namespace: plattformsikkerhet
  outbound:
  external:
  - host: api.github.com

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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
  <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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
  <rootCauseFirst>true</rootCauseFirst>
  <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml
@@ -15,12 +15,11 @@ spec:
  inbound:
  rules:
  - application: team-dolly-lokal-app
- cluster: dev-gcp
  - application: testnav-oversikt-frontend
- cluster: dev-gcp
  outbound:
  rules:
  - application: dolly-backend
+ - application: dolly-backend-dev
  azure:
  application:
  allowAllUsers: true

diff --git a/...vice/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java b/...vice/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -13,17 +14,18 @@
 @Configuration
 @Profile("dev")
 @VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false)
-@VaultPropertySource(value = "secret/.common/tokenx/dev/app-1", ignoreSecretNotFound = false)
 public class DevConfig extends AbstractVaultConfiguration {
 
-  private static final String VAULT_TOKEN = "spring.cloud.vault.token";
+ private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
  @Override
+ @NonNull
  public VaultEndpoint vaultEndpoint() {
  return VaultEndpoint.create("vault.adeo.no", 443);
  }
 
  @Override
+ @NonNull
  public ClientAuthentication clientAuthentication() {
  if (System.getenv().containsKey("VAULT_TOKEN")) {
  System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
  <rootCauseFirst>true</rootCauseFirst>
  <maxDepthPerThrowable>256</maxDepthPerThrowable>

diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml
@@ -20,19 +20,11 @@ spec:
  accessPolicy:
  inbound:
  rules:
- - application: team-dolly-lokal-app
- cluster: dev-gcp
- - application: testnav-oversikt-frontend
- cluster: dev-gcp
  - application: dolly-frontend-dev
- cluster: dev-gcp
- - application: dolly-idporten
- cluster: dev-gcp
  - application: dolly-frontend-dev-unstable
- cluster: dev-gcp
- - application: app-1
- namespace: plattformsikkerhet
- cluster: dev-gcp
+ - application: dolly-idporten
+ - application: team-dolly-lokal-app
+ - application: testnav-oversikt-frontend
  outbound:
  rules:
  - application: testnav-person-organisasjon-tilgang-service-dev

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,8 @@
 <configuration>
  <springProfile name="prod">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
  <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
  <rootCauseFirst>true</rootCauseFirst>
  <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -24,7 +25,8 @@
 
  <springProfile name="dev">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <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,8 @@
 <configuration>
  <springProfile name="prod,dev">
  <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
  <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
@@ -16,23 +16,16 @@ spec:
  accessPolicy:
  inbound:
  rules:
- - application: testnav-oversikt-frontend
- cluster: dev-gcp
  - application: dolly-frontend-dev
- cluster: dev-gcp
- - application: dolly-idporten
- cluster: dev-gcp
  - application: dolly-frontend-dev-unstable
- cluster: dev-gcp
- - application: testnav-batch-bestilling-service
- cluster: dev-gcp
+ - application: dolly-idporten
  - application: team-dolly-lokal-app
- cluster: dev-gcp
- - application: app-1
- namespace: plattformsikkerhet
- cluster: dev-gcp
+ - application: testnav-batch-bestilling-service
+ - application: testnav-dollystatus
+ - application: testnav-oversikt-frontend
  outbound:
  rules:
+ - application: generer-navn-service
  - application: testnav-amelding-service
  - application: testnav-arbeidsforhold-service
  - application: testnav-arbeidsplassencv-proxy

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -16,30 +16,18 @@ spec:
  inbound:
  rules:
  - application: dolly-frontend
- cluster: dev-gcp
  - application: dolly-idporten
-  cluster: dev-gcp
+ - application: testnav-batch-bestilling-service
  - application: testnav-dollystatus
-  cluster: dev-gcp
+ - application: testnav-helsepersonell-service
  - application: testnav-oversikt-frontend
- cluster: dev-gcp
- - application: testnav-batch-bestilling-service
- cluster: dev-gcp
  - application: etterlatte-testdata
- cluster: dev-gcp
  namespace: etterlatte
- - application: devtools
- cluster: dev-gcp
- namespace: aap
- - application: bot
- cluster: dev-gcp
- namespace: aap
- - application: testnav-helsepersonell-service
- cluster: dev-gcp
  - application: statuspoll
  namespace: navdig
  outbound:
  rules:
+ - application: generer-navn-service
  - application: testnav-amelding-service
  - application: testnav-arbeidsforhold-service
  - application: testnav-arbeidsplassencv-proxy
@@ -50,6 +38,7 @@ spec:
  - application: testnav-organisasjon-service
  - application: testnav-pdl-forvalter
  - application: testnav-person-service
+ - application: testnav-skattekort-service
  - application: testnav-sykemelding-api
  - application: testnav-synt-sykemelding-api
  - application: testnav-tps-messaging-service

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
  SpringApplication.run(DollyBackendApplicationStarter.class, args);
  }
-}
+}
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()));
  }
-}
+}