Fikset resterende proxier i crashbackloop

#deploy-proxy
navikt · Oct 20, 2023 · 4801f47 · 4801f47
1 parent a424ac5
commit 4801f47
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...oxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java b/...oxy/src/main/java/no/nav/testnav/proxies/arenaforvalterenproxy/ArenaServerProperties.java
@@ -21,8 +21,8 @@ private static ArenaServerProperties copyOf(ArenaServerProperties original) {
     ArenaServerProperties forEnvironment(String env) {
 
         var copy = copyOf(this);
-        copy.setUrl(copy.getUrl().replace("{env}", env));
-        copy.setName(copy.getName().replace("{env}", env));
+        copy.setUrl(copy.getUrl().replace("TEMP", env));
+        copy.setName(copy.getName().replace("TEMP", env));
         return copy;
     }
 }
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
@@ -25,7 +25,7 @@ spring:
 app:
   arena:
     services:
-      name: arena-services-{env}
+      name: arena-services-TEMP
       namespace: teamarenanais
-      url: http://arena-ords-{env}.teamarenanais.svc.nais.local
+      url: http://arena-ords-TEMP.teamarenanais.svc.nais.local
       cluster: dev-fss
diff --git a/...tnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java b/...tnav/proxies/pensjontestdatafacadeproxy/config/credentials/SamboerTestdataProperties.java
@@ -20,8 +20,8 @@ private static SamboerTestdataProperties copyOf(SamboerTestdataProperties origin
     public SamboerTestdataProperties forEnvironment(String env) {
 
         var copy = copyOf(this);
-        copy.setUrl(copy.getUrl().replace("{env}", env + ("q1".equals(env) ? ".very" : "")));
-        copy.setName(copy.getName().replace("{env}", env));
+        copy.setUrl(copy.getUrl().replace("TEMP", env + ("q1".equals(env) ? ".very" : "")));
+        copy.setName(copy.getName().replace("TEMP", env));
         return copy;
     }
 }
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
@@ -29,7 +29,7 @@ consumers:
     url: https://popp-testdata.intern.dev.nav.no
     cluster: dev-gcp
   samboer-testdata:
-    name: pensjon-samboerforhold-backend-{env}
+    name: pensjon-samboerforhold-backend-TEMP
     namespace: pensjon-person
-    url:  https://pensjon-samboerforhold-backend-{env}.intern.dev.nav.no
+    url:  https://pensjon-samboerforhold-backend-TEMP.intern.dev.nav.no
     cluster: dev-gcp
diff --git a/...proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java b/...proxy/src/main/java/no/nav/testnav/proxies/safproxy/config/credentials/SafProperties.java
@@ -20,8 +20,8 @@ private static SafProperties copyOf(SafProperties original) {
     public ServerProperties forEnvironment(String env) {
         var replacement = "q2".equals(env) ? "" : '-' + env;
         var copy = SafProperties.copyOf(this);
-        copy.setUrl(copy.getUrl().replace("-{env}", replacement));
-        copy.setName(copy.getName().replace("-{env}", replacement));
+        copy.setUrl(copy.getUrl().replace("-TEMP", replacement));
+        copy.setName(copy.getName().replace("-TEMP", replacement));
         return copy;
     }
 

diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
 
 consumers:
   saf:
-    url: http://saf-{env}.teamdokumenthandtering.svc.nais.local
+    url: http://saf-TEMP.teamdokumenthandtering.svc.nais.local
     cluster: dev-fss
-    name: saf-{env}
+    name: saf-TEMP
     namespace: teamdokumenthandtering