Merge branch 'master' of https://github.com/navikt/testnorge into fea…

…ture/bestillingsvisning-omskrivning
navikt · Jan 5, 2024 · 1fcd11f · 1fcd11f
2 parents 6397b09 + c6175a6
commit 1fcd11f
Show file tree

Hide file tree

Showing 412 changed files with 647 additions and 11,022 deletions.
diff --git a/.github/workflows/app.hodejegeren.yml b/.github/workflows/app.hodejegeren.yml
diff --git a/.github/workflows/app.mn-synt-arbeidsforhold-service.yml b/.github/workflows/app.mn-synt-arbeidsforhold-service.yml
diff --git a/.github/workflows/proxy.hodejegeren-proxy.yml b/.github/workflows/proxy.hodejegeren-proxy.yml
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-proxy"
+      deploy-tag: "#deploy-inst-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -19,12 +19,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_adresse_service"

diff --git a/apps/adresse-service/config.yml b/apps/adresse-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   webproxy: true
   tokenx:
     enabled: true

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_amelding_service"

diff --git a/apps/amelding-service/config.yml b/apps/amelding-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   accessPolicy:
     inbound:

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_app_tilgang_analyse_service"

diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml
@@ -13,7 +13,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   accessPolicy:
     inbound:

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-arbeidsforhold-service"

diff --git a/apps/arbeidsforhold-service/config.yml b/apps/arbeidsforhold-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-batch-bestilling-service"

diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   webproxy: true
   tokenx:

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -19,12 +19,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "brreg-stub"

diff --git a/apps/brreg-stub/config.yml b/apps/brreg-stub/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   liveness:
     path: /isAlive

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -27,12 +27,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-bruker-service"

diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
@@ -90,7 +90,7 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/budpro-service/config.yml b/apps/budpro-service/config.yml
@@ -19,7 +19,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   ingresses:
     - "https://testnav-budpro-service.intern.dev.nav.no"
   liveness:

diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -86,7 +86,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.retry:spring-retry:2.0.0'

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -70,7 +70,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   openSearch:
     instance: bestillinger
     access: admin

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -77,7 +77,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   openSearch:
     instance: bestillinger
     access: admin

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivClient.java
@@ -23,6 +23,7 @@
 import no.nav.dolly.util.TransactionHelperService;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -58,11 +59,17 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                                 .flatMap(request -> dokarkivConsumer.getEnvironments()
                                         .flatMapIterable(env -> env)
                                         .filter(env -> bestilling.getEnvironments().contains(env))
-                                        .filter(env -> !transaksjonMappingService.existAlready(DOKARKIV,
-                                                dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre)
-                                        .flatMap(env -> dokarkivConsumer.postDokarkiv(env, request)
-                                                .map(status ->
-                                                        getStatus(dollyPerson.getIdent(), progress.getBestilling().getId(), status))))
+                                        .flatMap(env ->
+                                                !transaksjonMappingService.existAlready(DOKARKIV,
+                                                        dollyPerson.getIdent(), env, bestilling.getId()) || isOpprettEndre ?
+
+                                                        dokarkivConsumer.postDokarkiv(env, request)
+                                                                .map(status ->
+                                                                        getStatus(dollyPerson.getIdent(),
+                                                                                bestilling.getId(), status)) :
+
+                                                        Mono.just(env + ":OK")
+                                        ))
                                 .collect(Collectors.joining(",")))
                         .map(status -> futurePersist(progress, status)));
     }
@@ -79,6 +86,8 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) {
 
     private String getStatus(String ident, Long bestillingId, DokarkivResponse response) {
 
+        log.info("Dokarkiv response {} for ident {}", response, ident);
+
         if (isNull(response)) {
             return null;
         }
@@ -123,6 +132,8 @@ private DokarkivRequest buildRequest(RsDokarkiv rsDokarkiv, PdlPersonBolk.Person
 
     private void saveTransaksjonId(DokarkivResponse response, String ident, Long bestillingId, String miljoe) {
 
+        log.info("Lagrer transaksjon for {} i {} ", ident, miljoe);
+
         transaksjonMappingService.save(
                 TransaksjonMapping.builder()
                         .ident(ident)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/dokarkiv/DokarkivConsumer.java
@@ -44,7 +44,7 @@ public DokarkivConsumer(
     @Timed(name = "providers", tags = { "operation", "dokarkiv-opprett" })
     public Flux<DokarkivResponse> postDokarkiv(String environment, DokarkivRequest dokarkivRequest) {
 
-        log.info("Sender dokarkiv melding for ident {} miljoe {} request {}",
+        log.info("Dokarkiv sender melding for ident {} miljoe {} request {}",
                 dokarkivRequest.getBruker().getId(), environment, dokarkivRequest);
 
         return tokenService.exchange(serverProperties)

diff --git a/...kend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java b/...kend/src/main/java/no/nav/dolly/bestilling/dokarkiv/command/DokarkivGetMiljoeCommand.java
@@ -42,6 +42,7 @@ public Mono<List<String>> call() {
                 .bodyToMono(String[].class)
                 .map(Arrays::asList)
                 .doOnError(WebClientFilter::logErrorMessage)
+                .onErrorResume(error -> Mono.just(List.of("q1", "q2", "q4")))
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                         .filter(WebClientFilter::is5xxException));
     }