Merge branch 'refs/heads/master' into bugfix/audience_validation

.github/workflows/app.dolly-search-service.yml

@@ -19,6 +19,7 @@ jobs:
     with:
       working-directory: "apps/dolly-search-service"
       deploy-tag: "#deploy-dolly-search-service"
+      deploy-tag-test: "#deploy-test-dolly-search-service"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.brregstub-reverse-proxy.yml

@@ -0,0 +1,22 @@
+name: brregstub-reverse--proxy
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/brregstub-reverse-proxy/**"
+      - ".github/workflows/proxy.brregstub-reverse-proxy.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      cluster: "dev-fss"
+      working-directory: "proxies/brregstub-reverse-proxy"
+      deploy-tag: "#deploy-proxy-brregstub-reverse"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

apps/dolly-backend/config.test.yml

@@ -32,7 +32,6 @@ spec:
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
-        - application: testnav-dolly-search-service
         - application: testnav-inntektsmelding-service
         - application: testnav-kodeverk-service
         - application: testnav-miljoer-service

apps/dolly-backend/config.yml

@@ -34,7 +34,6 @@ spec:
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
-        - application: testnav-dolly-search-service
         - application: testnav-inntektsmelding-service
         - application: testnav-kodeverk-service
         - application: testnav-miljoer-service

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumer.java

@@ -51,7 +51,7 @@ public Mono<DigitalKontaktdataResponse> createDigitalKontaktdata(DigitalKontaktd
                 .flatMap(token -> new KontaktdataPostCommand(webClient, digitalKontaktdata, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = { "operation", "krrstub_getKontaktdata" })
+    @Timed(name = "providers", tags = { "operation", "krrstub_deleteKontaktdata" })
     public Flux<DigitalKontaktdataResponse> deleteKontaktdata(List<String> identer) {
 
         return tokenService.exchange(serverProperties)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/command/KontaktadataDeleteCommand.java

@@ -4,23 +4,23 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.krrstub.dto.DigitalKontaktdataResponse;
 import no.nav.dolly.metrics.Timed;
-import no.nav.dolly.util.RequestHeaderUtil;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID;
 import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_PERSON_IDENT;
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
 
 @Slf4j
@@ -36,15 +36,18 @@ public class KontaktadataDeleteCommand implements Callable<Mono<DigitalKontaktda
     @Timed(name = "providers", tags = { "operation", "krrstub_deleteKontaktdata" })
     public Mono<DigitalKontaktdataResponse> call() {
 
-        return webClient.delete()
+
+        var body = new HashMap<>();
+        body.put("personidentifikator", ident);
+
+        return webClient.method(HttpMethod.DELETE)
                 .uri(uriBuilder -> uriBuilder
                         .path(DIGITAL_KONTAKT_URL)
                         .build())
-                .header(HEADER_NAV_CALL_ID, RequestHeaderUtil.getNavCallId())
+                .bodyValue(body)
                 .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())
-                .header(HEADER_NAV_PERSON_IDENT, ident)
                 .retrieve()
                 .toBodilessEntity()
                 .map(response -> DigitalKontaktdataResponse.builder()

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/command/KontaktdataPostCommand.java

@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.bestilling.krrstub.dto.DigitalKontaktdataResponse;
 import no.nav.dolly.domain.resultset.krrstub.DigitalKontaktdata;
-import no.nav.dolly.util.RequestHeaderUtil;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
@@ -17,7 +16,6 @@
 import java.util.concurrent.Callable;
 
 import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID;
 import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
 
@@ -38,7 +36,6 @@ public Mono<DigitalKontaktdataResponse> call() {
                         .path(DIGITAL_KONTAKT_URL)
                         .build())
                 .contentType(MediaType.APPLICATION_JSON)
-                .header(HEADER_NAV_CALL_ID, RequestHeaderUtil.getNavCallId())
                 .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())

apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java

@@ -47,5 +47,4 @@ public class Consumers {
     private ServerProperties testnavSkattekortService;
     private ServerProperties yrkesskadeProxy;
     private ServerProperties arbeidssoekerregisteretProxy;
-    private ServerProperties dollySearchService;
 }

apps/dolly-backend/src/main/java/no/nav/dolly/elastic/dto/SearchRequest.java

@@ -4,7 +4,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import no.nav.dolly.elastic.ElasticTyper;
+import no.nav.testnav.libs.data.dollysearchservice.v1.ElasticTyper;
 
 import java.util.ArrayList;
 import java.util.List;

apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchQueryBuilder.java

@@ -1,8 +1,8 @@
 package no.nav.dolly.elastic.service;
 
 import lombok.experimental.UtilityClass;
-import no.nav.dolly.elastic.ElasticTyper;
 import no.nav.dolly.elastic.dto.SearchRequest;
+import no.nav.testnav.libs.data.dollysearchservice.v1.ElasticTyper;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;

apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java

@@ -5,11 +5,11 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.elastic.BestillingElasticRepository;
 import no.nav.dolly.elastic.ElasticBestilling;
-import no.nav.dolly.elastic.ElasticTyper;
 import no.nav.dolly.elastic.consumer.ElasticParamsConsumer;
 import no.nav.dolly.elastic.dto.SearchRequest;
 import no.nav.dolly.elastic.dto.SearchResponse;
 import no.nav.dolly.elastic.dto.Kategori;
+import no.nav.testnav.libs.data.dollysearchservice.v1.ElasticTyper;
 import org.opensearch.client.RequestOptions;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.index.query.BoolQueryBuilder;