"Cosmetic" rename of http.proxy to HTTP_PROXY to indicate source is e…

…nvironment, with meta.
navikt · Dec 18, 2024 · 365e05b · 365e05b
1 parent c7a8c2a
commit 365e05b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/...ain/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java b/...ain/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java
@@ -18,8 +18,8 @@
 @AutoConfiguration(after = ClientCredentialAutoConfiguration.class)
 public class TokenServiceAutoConfiguration {
 
-    @Value("${http.proxy:#{null}}")
-    private String proxyHost;
+    @Value("${HTTP_PROXY:#{null}}")
+    private String httpProxy;
 
     @Primary
     @Bean
@@ -40,7 +40,7 @@ AzureTokenService azureAdTokenService(
             GetAuthenticatedToken getAuthenticatedToken
     ) {
         Assert.notNull(issuerUrl, "AAD_ISSUER_URI must be set");
-        return new AzureTokenService(proxyHost, issuerUrl, clientCredential, getAuthenticatedToken);
+        return new AzureTokenService(httpProxy, issuerUrl, clientCredential, getAuthenticatedToken);
     }
 
     @Primary
@@ -58,7 +58,7 @@ AzureNavTokenService azureNavTokenServiceTest(
     AzureNavTokenService azureNavTokenService(
             AzureNavClientCredential azureNavClientCredential
     ) {
-        return new AzureNavTokenService(proxyHost, azureNavClientCredential);
+        return new AzureNavTokenService(httpProxy, azureNavClientCredential);
     }
 
     @Primary
@@ -80,7 +80,7 @@ AzureTrygdeetatenTokenService trygdeetatenAzureAdTokenService(
             GetAuthenticatedUserId getAuthenticatedUserId,
             ObjectMapper objectMapper
     ) {
-        return new AzureTrygdeetatenTokenService(proxyHost, clientCredential, getAuthenticatedUserId, objectMapper);
+        return new AzureTrygdeetatenTokenService(httpProxy, clientCredential, getAuthenticatedUserId, objectMapper);
     }
 
 }
diff --git a/...active-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...active-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,9 @@
+{
+  "properties": [
+    {
+      "name": "HTTP_PROXY",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, hvis NAIS-manifestet har <tt>spec.webproxy</tt>."
+    }
+  ]
+}