Rydder

navikt · Apr 27, 2023 · be7e7ad · be7e7ad
1 parent cc8d9f6
commit be7e7ad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/...rasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java b/...rasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/FpApplication.java
@@ -67,29 +67,37 @@ static String contextPathFor(FpApplication application, Environment currentEnvir
             throw new IllegalArgumentException("Utviklerfeil: angitt app er ikke i fp-familien");
         }
         var appname = application.name().toLowerCase();
-        var cluster = currentEnvironment.getCluster();
 
-        if (cluster.isLocal()) {
-            return Optional.ofNullable(currentEnvironment.getProperty(application.name().toLowerCase() + ".override.url"))
-                .orElseGet(() -> String.format("http://localhost:%s/%s", LOCAL_PORTS.get(application), appname));
+        if (currentEnvironment.isLocal()) {
+            return urlForLocal(application, currentEnvironment, appname);
         }
 
         var clusterForApplication = getClusterTilFPApplikasjonenSomSkalKalles(application, currentEnvironment);
-        if (cluster.isCoLocated(clusterForApplication)) {
-            return String.format("http://%s/%s", appname, appname);
-        } else {
-            var prefix = "https://" + appname;
-            if (currentEnvironment.isFss()) { // Kaller fra FSS til GCP
-                return prefix + ".intern" + (cluster.isProd() ? "" : ".dev") + ".nav.no/" + appname;
-            } else { // Kaller fra GCP til FSS
-                if (FPSAK.equals(application)) {
-                    prefix += "-api";
-                }
-                return prefix + "." + clusterForApplication.clusterName() + "-pub.nais.io/" + appname;
+        if (currentEnvironment.getCluster().isCoLocated(clusterForApplication)) {
+            return String.format("http://%s/%s", appname, appname); // service discovery
+        }
+
+        return urlForCommunicationBetweenDifferentClusters(application, currentEnvironment, appname, clusterForApplication);
+
+    }
+
+    private static String urlForCommunicationBetweenDifferentClusters(FpApplication application, Environment currentEnvironment, String appname, Cluster clusterForApplication) {
+        var prefix = "https://" + appname;
+        if (currentEnvironment.isFss()) { // Kaller fra FSS til GCP
+            return prefix + ".intern" + (currentEnvironment.isProd() ? "" : ".dev") + ".nav.no/" + appname;
+        } else { // Kaller fra GCP til FSS
+            if (FPSAK.equals(application)) {
+                prefix += "-api";
             }
+            return prefix + "." + clusterForApplication.clusterName() + "-pub.nais.io/" + appname;
         }
     }
 
+    private static String urlForLocal(FpApplication application, Environment currentEnvironment, String appname) {
+        return Optional.ofNullable(currentEnvironment.getProperty(application.name().toLowerCase() + ".override.url"))
+            .orElseGet(() -> String.format("http://localhost:%s/%s", LOCAL_PORTS.get(application), appname));
+    }
+
     static String scopesFor(FpApplication application, Environment currentEnvironment) {
         if (currentEnvironment.isLocal()) {
             return "api://" + Cluster.VTP.clusterName() + "." + FORELDREPENGER.getName() + "." + Cluster.VTP.clusterName() + "/.default";

diff --git a/...on/rest-klient/src/test/java/no/nav/vedtak/felles/integrasjon/rest/FpApplicationTest.java b/...on/rest-klient/src/test/java/no/nav/vedtak/felles/integrasjon/rest/FpApplicationTest.java
@@ -11,7 +11,7 @@
 
 class FpApplicationTest {
 
-    private Environment environment = Mockito.mock(Environment.class);
+    private final Environment environment = Mockito.mock(Environment.class);
 
     @Test
     void test_at_service_discovery_brukes_mellom_FPAppp_i_samme_cluster() {
@@ -49,7 +49,7 @@ void test_at_gcp_til_fpsak_i_fss_bruker_ingress_av_type_pub() {
     @Test
     void test_at_vi_bruker_default_lokalhost_ved_lokal_kjøring_uten_override_url_satt() {
         when(environment.getCluster()).thenReturn(Cluster.VTP);
-        when(environment.isDev()).thenReturn(true);
+        when(environment.isLocal()).thenReturn(true);
         when(environment.getProperty("fpabakus.override.url")).thenReturn(null);
         var contextPath = FpApplication.contextPathFor(FpApplication.FPABAKUS, environment);
         assertThat(contextPath).isEqualTo("http://localhost:8015/fpabakus");
@@ -59,6 +59,7 @@ void test_at_gcp_til_fpsak_i_fss_bruker_ingress_av_type_pub() {
     void bruk_override_url_hvis_oppgitt_og_cluster_er_vtp() {
         var overrideUrl = "http://override.url/";
         when(environment.getCluster()).thenReturn(Cluster.VTP);
+        when(environment.isLocal()).thenReturn(true);
         when(environment.getProperty("fpabakus.override.url")).thenReturn(overrideUrl);
         var contextPath = FpApplication.contextPathFor(FpApplication.FPABAKUS, environment);
         assertThat(contextPath).isEqualTo(overrideUrl);