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

…ture/afp-offentlig-frontend

.github/workflows/app.person-organisasjon-tilgang-service.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       working-directory: "apps/person-organisasjon-tilgang-service"
       deploy-tag: "#deploy-person-organisasjon-tilgang-service"
-      deploy-tag-test: "#deploy-test-person-organisasjon-tilgang-service"
     permissions:
       contents: read
       id-token: write

apps/adresse-service/build.gradle

@@ -10,14 +10,15 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'no.nav.testnav.libs:security-core'
-    implementation 'no.nav.testnav.libs:servlet-core'
-    implementation 'no.nav.testnav.libs:servlet-security'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:servlet-core"
+    implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:vault"
 
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
     implementation "org.aspectj:aspectjweaver:$versions.jweaver"

apps/adresse-service/settings.gradle

@@ -10,6 +10,7 @@ includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-security'
+includeBuild '../../libs/vault'
 
 develocity {
     buildScan {

apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/LocalVaultConfig.java

@@ -0,0 +1,10 @@
+package no.nav.testnav.apps.adresseservice.config;
+
+import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("local")
+public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
+}

apps/amelding-service/build.gradle

@@ -11,21 +11,22 @@ sonarqube {
 
 dependencies {
 
-    implementation 'no.nav.testnav.libs:security-core'
-    implementation 'no.nav.testnav.libs:reactive-core'
-    implementation 'no.nav.testnav.libs:reactive-security'
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:vault"
 
-    implementation 'no.nav.testnav.libs:commands'
-    implementation 'no.nav.testnav.libs:avro-schema'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation "no.nav.testnav.libs:commands"
+    implementation "no.nav.testnav.libs:avro-schema"
+    implementation "no.nav.testnav.libs:data-transfer-objects"
 
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
+    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
 
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/amelding-service/settings.gradle

@@ -12,6 +12,7 @@ includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
 includeBuild '../../libs/security-core'
+includeBuild '../../libs/vault'
 
 develocity {
     buildScan {

apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/LocalVaultConfig.java

@@ -0,0 +1,10 @@
+package no.nav.registre.testnav.ameldingservice.config;
+
+import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("dev")
+public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
+}

apps/app-tilgang-analyse-service/build.gradle

@@ -10,24 +10,25 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'no.nav.testnav.libs:reactive-core'
-    implementation 'no.nav.testnav.libs:reactive-security'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:vault"
 
-    implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+    implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 
-    runtimeOnly 'com.h2database:h2'
-    runtimeOnly 'org.postgresql:postgresql'
-    implementation 'io.r2dbc:r2dbc-h2'
-    implementation 'org.postgresql:r2dbc-postgresql'
-    implementation 'org.flywaydb:flyway-core'
-    implementation 'org.flywaydb:flyway-database-postgresql'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.postgresql:postgresql"
+    implementation "io.r2dbc:r2dbc-h2"
+    implementation "org.postgresql:r2dbc-postgresql"
+    implementation "org.flywaydb:flyway-core"
+    implementation "org.flywaydb:flyway-database-postgresql"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/app-tilgang-analyse-service/settings.gradle

@@ -9,6 +9,7 @@ includeBuild "../../plugins/java"
 includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
+includeBuild '../../libs/vault'
 
 develocity {
     buildScan {

apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/LocalVaultConfig.java

@@ -0,0 +1,10 @@
+package no.nav.testnav.apps.apptilganganalyseservice.config;
+
+import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile({"local", "localdb"})
+public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
+}

apps/arbeidsforhold-service/build.gradle

@@ -15,23 +15,24 @@ dependencies {
     implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     implementation "javax.activation:activation:$versions.javaxActivation"
     implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
 
-    implementation 'no.nav.testnav.libs:commands'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
-    implementation 'no.nav.testnav.libs:reactive-core'
-    implementation 'no.nav.testnav.libs:security-core'
-    implementation 'no.nav.testnav.libs:servlet-core'
-    implementation 'no.nav.testnav.libs:servlet-security'
+    implementation "no.nav.testnav.libs:commands"
+    implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:servlet-core"
+    implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:vault"
 
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
 
     implementation "javax.annotation:javax.annotation-api:$versions.javaxAnnotation"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/arbeidsforhold-service/settings.gradle

@@ -12,6 +12,7 @@ includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-security'
+includeBuild '../../libs/vault'
 
 develocity {
     buildScan {

apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/LocalVaultConfig.java

@@ -0,0 +1,10 @@
+package no.nav.registre.testnorge.arbeidsforholdservice.config;
+
+import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("dev")
+public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
+}