Renamer LOADBALANCER_URL til UNG_SAK_WEB_URL

navikt · Nov 19, 2024 · e0b63ea · e0b63ea
1 parent 101fe63
commit e0b63ea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/deploy/dev-gcp.yml b/deploy/dev-gcp.yml
@@ -143,8 +143,7 @@ spec:
     - name: BOOTSTRAP_SERVERS
       value: b27apvl00045.preprod.local:8443,b27apvl00046.preprod.local:8443,b27apvl00047.preprod.local:8443
 
-    # Loadbalancerconfig
-    - name: LOADBALANCER_URL
+    - name: UNG_SAK_WEB_URL
       value: https://ung.intern.dev.nav.no
 
     # LDAP

diff --git a/deploy/prod-gcp.yml b/deploy/prod-gcp.yml
@@ -135,7 +135,7 @@ spec:
       value: k9saksbehandling.k9-infotrygd-feed-hendelse
 
     # Loadbalancerconfig
-    - name: LOADBALANCER_URL
+    - name: UNG_SAK_WEB_URL
       value: https://ung.intern.nav.no
 
     # LDAP

diff --git a/web/app-vtp.properties b/web/app-vtp.properties
@@ -52,7 +52,7 @@ token.x.well.known.url=http://vtp:8060/rest/tokenx/.well-known/oauth-authorizati
 token.x.client.id=dev-fss:k9saksbehandling:ung-sak
 
 # LDAP
-loadbalancer.url=http://localhost:8080
+ung.sak.web.url=http://localhost:8080
 ldap.url=ldap://localhost:8389/
 ldap.auth=none
 ldap.user.basedn=ou\=NAV,ou\=BusinessUnits,dc\=test,dc\=local

diff --git a/web/src/main/java/no/nav/ung/sak/web/app/exceptions/RedirectExceptionMapper.java b/web/src/main/java/no/nav/ung/sak/web/app/exceptions/RedirectExceptionMapper.java
@@ -12,7 +12,7 @@
 
 public class RedirectExceptionMapper implements ExceptionMapper<Throwable> {
 
-    private String loadBalancerUrl = System.getProperty("loadbalancer.url");
+    private String ungSakWebUrl = System.getProperty("ung.sak.web.url");
 
     private KnownExceptionMappers exceptionMappers = new KnownExceptionMappers();
 
@@ -34,6 +34,6 @@ public Response toResponse(Throwable exception) {
 
 
     protected String getBaseUrl() {
-        return loadBalancerUrl + ContextPathHolder.instance().getContextPath();
+        return ungSakWebUrl + ContextPathHolder.instance().getContextPath();
     }
 }
diff --git a/web/src/main/java/no/nav/ung/sak/web/app/oppgave/RedirectFactory.java b/web/src/main/java/no/nav/ung/sak/web/app/oppgave/RedirectFactory.java
@@ -7,7 +7,7 @@
 
 class RedirectFactory {
 
-    private String loadBalancerUrl;
+    private String ungSakWebUrl;
 
     //TODO (TOR) Denne bør ikkje ligga på server, men heller automatisk redirecte i klient. (Men dette er tryggast løysing tett opptil release)
     private String defaultPartUrl = "?punkt=default&fakta=default";
@@ -23,11 +23,11 @@ String lagRedirect(OppgaveRedirectData data) {
     }
 
     protected String getBaseUrl() {
-        return loadBalancerUrl + ContextPathHolder.instance().getContextPath();
+        return ungSakWebUrl + ContextPathHolder.instance().getContextPath();
     }
 
     @Inject
-    public void setLoadBalancerUrl(@KonfigVerdi("loadbalancer.url") String loadBalancerUrl) {
-        this.loadBalancerUrl = loadBalancerUrl;
+    public void setUngSakWebUrl(@KonfigVerdi("ung.sak.web.url") String ungSakWebUrl) {
+        this.ungSakWebUrl = ungSakWebUrl;
     }
 }