Merge branch 'master' into feature/kodeverk-service

.github/workflows/app.ereg-batch-status-service.yml

@@ -14,7 +14,7 @@ jobs:
  workflow:
  uses: ./.github/workflows/common.workflow.backend.yml
  with:
- cluster: "dev-fss"
+ cluster: "dev-gcp"
  working-directory: "apps/ereg-batch-status-service"
  deploy-tag: "#deploy-ereg-batch-status-service"
  permissions:

.github/workflows/proxy.modapp-ereg-proxy.yml

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

.gitignore

@@ -1,6 +1,7 @@
 *.idea/
 *target/
 *.iml
+*.http
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

apps/adresse-service/src/main/resources/application.yaml

@@ -50,4 +50,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/amelding-service/src/main/resources/application.yml

@@ -43,4 +43,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/app-tilgang-analyse-service/src/main/resources/application.yml

@@ -48,4 +48,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/arbeidsforhold-service/src/main/resources/application.yml

@@ -46,4 +46,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/batch-bestilling-service/src/main/resources/application.yml

@@ -45,6 +45,8 @@ server:
  servlet:
  encoding:
  charset: UTF-8
+ error:
+ include-message: always
 
 consumers:
  dolly-backend:

apps/brreg-stub/src/main/resources/application.yaml

@@ -29,4 +29,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/bruker-service/src/main/resources/application.yml

@@ -44,4 +44,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/budpro-service/src/main/resources/application.yml

@@ -37,3 +37,10 @@ consumers:
 app:
  security:
  allow-api: true
+
+server:
+ servlet:
+ encoding:
+ charset: UTF-8
+ error:
+ include-message: always

apps/dolly-backend/src/main/resources/application.yaml

@@ -17,6 +17,8 @@ server:
  encoding:
  charset: UTF-8
  max-http-header-size: 70KB
+ error:
+ include-message: always
 
 spring:
  cloud:
@@ -83,11 +85,6 @@ open:
  total-fields: 1500
  index: bestilling
 
-tps:
- person:
- service:
- wait: 30_000
-
 consumers:
  testnav-organisasjon-forvalter:
  name: testnav-organisasjon-forvalter

apps/dolly-frontend/src/main/resources/application.yml

@@ -233,6 +233,8 @@ server:
  servlet:
  encoding:
  charset: UTF-8
+ error:
+ include-message: always
 
 logging:
  pattern:

apps/dollystatus/src/main/resources/application.yml

@@ -15,6 +15,8 @@ server:
  servlet:
  encoding:
  charset: UTF-8
+ error:
+ include-message: always
 
 logging:
  level:

apps/endringsmelding-frontend/src/main/resources/application.yml

@@ -60,6 +60,8 @@ server:
  servlet:
  encoding:
  charset: UTF-8
+ error:
+ include-message: always
 
 logging:
  level:

apps/endringsmelding-service/src/main/resources/application.yml

@@ -66,4 +66,6 @@ management:
 server:
  servlet:
  encoding:
- charset: UTF-8
+ charset: UTF-8
+ error:
+ include-message: always

apps/ereg-batch-status-service/README.md

@@ -2,7 +2,7 @@
 App for å hente ut batch status.
 
 ## Swagger
-Swagger finnes under [/swagger](https://ereg-batch-status-service.dev.intern.nav.no/swagger) -endepunktet til applikasjonen.
+Swagger finnes under [/swagger](https://testnav-ereg-batch-status-service.intern.dev.nav.no/swagger) -endepunktet til applikasjonen.
 
 ## Lokal kjøring
 Ha naisdevice kjørende og kjør EregBatchServiceServiceApplicationStarter med følgende argumenter:

apps/ereg-batch-status-service/build.gradle

@@ -44,21 +44,21 @@ dependencies {
 
  implementation 'no.nav.testnav.libs:data-transfer-objects'
  implementation 'no.nav.testnav.libs:reactive-core'
- implementation 'no.nav.testnav.libs:servlet-core'
- implementation 'no.nav.testnav.libs:servlet-security'
+ implementation 'no.nav.testnav.libs:reactive-security'
+ implementation 'no.nav.testnav.libs:security-core'
 
  implementation 'org.springframework.boot:spring-boot-starter-webflux'
- implementation 'org.springframework.boot:spring-boot-starter-web'
  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-security'
 
+ implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
  implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
 
- implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
  implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
  implementation 'io.micrometer:micrometer-registry-prometheus'
- implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+ implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
  implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
  implementation 'net.logstash.logback:logstash-logback-encoder:7.4'

apps/ereg-batch-status-service/config.yml

@@ -18,6 +18,9 @@ spec:
  cluster: dev-gcp
  - application: organisasjon-bestilling-service
  cluster: dev-gcp
+ outbound:
+ external:
+ - host: testnav-modapp-ereg-proxy.dev-fss-pub.nais.io
  tokenx:
  enabled: true
  azure:
@@ -48,4 +51,4 @@ spec:
  limits:
  memory: 2048Mi
  ingresses:
- - "https://ereg-batch-status-service.dev-fss-pub.nais.io"
+ - "https://testnav-ereg-batch-status-service.intern.dev.nav.no"

apps/ereg-batch-status-service/settings.gradle

@@ -6,8 +6,8 @@ rootProject.name = 'ereg-batch-status-service'
 
 includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/servlet-core'
-includeBuild '../../libs/servlet-security'
+includeBuild '../../libs/reactive-security'
+includeBuild '../../libs/security-core'
 
 gradleEnterprise {
  buildScan {

apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/ApplicationConfig.java

@@ -1,14 +1,17 @@
 package no.nav.registre.testnorge.eregbatchstatusservice.config;
 
+import no.nav.testnav.libs.reactivecore.config.CoreConfig;
+import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.web.reactive.config.EnableWebFlux;
 
-import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
-import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
 
 @Configuration
+@EnableWebFlux
 @Import({
- ApplicationCoreConfig.class,
+ CoreConfig.class,
+ SecurityConfig.class,
  SecureOAuth2ServerToServerConfiguration.class
 })
 public class ApplicationConfig {

apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/Consumers.java

@@ -0,0 +1,29 @@
+package no.nav.registre.testnorge.eregbatchstatusservice.config;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import static lombok.AccessLevel.PACKAGE;
+
+/**
+ * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
+ * <br/><br/>
+ * Husk at Spring Boot bruker <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">relaxed binding</a>
+ * mellom configuration properties og field names.
+ *
+ * @see ServerProperties
+ */
+@Configuration
+@ConfigurationProperties(prefix = "consumers")
+@NoArgsConstructor(access = PACKAGE)
+@Getter
+@Setter(PACKAGE)
+public class Consumers {
+
+ private ServerProperties modappEregProxy;
+
+}

apps/ereg-batch-status-service/src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/OpenApiConfig.java

@@ -7,17 +7,15 @@
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.http.HttpHeaders;
 
 import java.util.Arrays;
 
-import no.nav.testnav.libs.servletcore.config.ApplicationProperties;
-
 @Configuration
-public class OpenApiConfig implements WebMvcConfigurer {
+public class OpenApiConfig {
 
  @Bean
  public OpenAPI openApi(ApplicationProperties applicationProperties) {
@@ -27,7 +25,7 @@ public OpenAPI openApi(ApplicationProperties applicationProperties) {
  .scheme("bearer")
  .bearerFormat("JWT")
  .in(SecurityScheme.In.HEADER)
- .name("Authorization")
+ .name(HttpHeaders.AUTHORIZATION)
  ))
  .addSecurityItem(
  new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write")))
@@ -47,9 +45,4 @@ public OpenAPI openApi(ApplicationProperties applicationProperties) {
  )
  );
  }
-
- @Override
- public void addViewControllers(ViewControllerRegistry registry) {
- registry.addViewController("/swagger").setViewName("redirect:/swagger-ui.html");
- }
 }