feature: Add oppfoelging route and update configuration #deploy-dolly-proxy

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/provider/BestillingController.java

@@ -14,6 +14,7 @@
 import no.nav.dolly.service.OrganisasjonBestillingService;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +24,8 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

proxies/dolly-proxy/src/main/java/no/nav/dolly/proxy/route/Oppfoelging.java

@@ -0,0 +1,35 @@
+package no.nav.dolly.proxy.route;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.dolly.proxy.auth.AuthenticationFilterService;
+import org.springframework.cloud.gateway.route.Route;
+import org.springframework.cloud.gateway.route.builder.Buildable;
+import org.springframework.cloud.gateway.route.builder.PredicateSpec;
+import org.springframework.stereotype.Component;
+
+import java.util.function.Function;
+
+@Component
+@RequiredArgsConstructor
+class Oppfoelging {
+
+    private static final String CLUSTER = "dev-gcp";
+    private static final String NAMESPACE = "poao";
+    private static final String NAME = "veilarboppfolging";
+
+    private final Targets targets;
+    private final AuthenticationFilterService authenticationFilterService;
+
+    Function<PredicateSpec, Buildable<Route>> build() {
+
+        var bearerAuthenticationFilter = authenticationFilterService
+                .getTrygdeetatenAuthenticationFilter(CLUSTER, NAMESPACE,
+                        NAME, targets.getOppfoelging());
+
+        return spec -> spec
+                .path("/oppfolging/**")
+                .filters(f -> f.stripPrefix(1)
+                        .filter(bearerAuthenticationFilter))
+                .uri(targets.getOppfoelging());
+    }
+}

proxies/dolly-proxy/src/main/java/no/nav/dolly/proxy/route/RouteLocatorConfig.java

@@ -29,6 +29,7 @@ class RouteLocatorConfig {
     private final Norg2 norg2;
     private final Pdl pdl;
     private final Pensjon pensjon;
+    private final Oppfoelging oppfoelging;
     private final Saf saf;
     private final Sigrunstub sigrunstub;
     private final Skjermingsregister skjermingsregister;
@@ -78,6 +79,7 @@ RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route("pensjon-afp-q2", pensjon.build(Pensjon.SpecialCase.AFP_Q2))
                 .route("pensjon-samboer-q1", pensjon.build(Pensjon.SpecialCase.SAMBOER_Q1))
                 .route("pensjon-samboer-q2", pensjon.build(Pensjon.SpecialCase.SAMBOER_Q2))
+                .route("oppfoelging", oppfoelging.build())
                 .route("saf-q1", saf.build(Saf.SpecialCase.Q1))
                 .route("saf-q2", saf.build(Saf.SpecialCase.Q2))
                 .route("saf-q4", saf.build(Saf.SpecialCase.Q4))

proxies/dolly-proxy/src/main/java/no/nav/dolly/proxy/route/Targets.java

@@ -42,6 +42,7 @@ class Targets {
     String pensjon;
     String pensjonAfp;
     String pensjonSamboer;
+    String oppfoelging;
     String saf;
     String sigrunstub;
     String skjermingsregister;

proxies/dolly-proxy/src/main/resources/application.yml

@@ -54,6 +54,7 @@ app:
     krrstub: https://digdir-krr-stub.intern.dev.nav.no
     medl: https://medlemskap-medl-testdata.intern.dev.nav.no
     norg2: http://norg2.org.svc.nais.local
+    oppfoelging: https://veilarboppfolging.intern.dev.nav.no/veilarboppfolging
     pdl-api: http://pdl-api.pdl.svc.nais.local
     pdl-api-q1: https://pdl-api-q1.pdl.svc.nais.local
     pdl-identhendelse: http://pdl-identhendelse-lager.pdl.svc.nais.local