Merge branch 'master' into bugfix/raskere-henting-av-gruppeidenter

navikt · Jan 4, 2024 · 78e963f · 78e963f
2 parents 20a0dcc + 9e021ad
commit 78e963f
Show file tree

Hide file tree

Showing 365 changed files with 323 additions and 10,394 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/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-frontend/build.gradle b/apps/dolly-frontend/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", "dolly-frontend"

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx
@@ -115,7 +115,10 @@ KrrstubForm.validation = {
 	krrstub: Yup.object({
 		epost: Yup.string(),
 		gyldigFra: Yup.date().nullable(),
-		mobil: Yup.string().matches(/^\+?\d*$/, 'Ugyldig mobilnummer'),
+		mobil: Yup.string().matches(/^\+?\d{8,14}$/, {
+			message: 'Ugyldig telefonnummer',
+			excludeEmptyString: true,
+		}),
 		sdpAdresse: Yup.string(),
 		sdpLeverandoer: Yup.string().nullable(),
 		spraak: Yup.string(),

diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
@@ -12,12 +12,12 @@ test {
 
 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-dollystatus"

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

diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/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-endringsmelding-frontend"

diff --git a/apps/endringsmelding-frontend/config.yml b/apps/endringsmelding-frontend/config.yml
@@ -41,6 +41,6 @@ spec:
     requests:
       cpu: 300m
       memory: 1024Mi
-  image: {{ image }}
+  image: "{{image}}"
   ingresses:
     - "https://testnav-endringsmelding.intern.dev.nav.no"
diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
@@ -12,12 +12,12 @@ test {
 
 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-endringsmelding-service"

diff --git a/apps/endringsmelding-service/config.yml b/apps/endringsmelding-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/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-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-ereg-batch-status-service"