Refactor logging and adjust configuration limits

#deploy-idporten-frontend Refactored log statements in reactive-security to include more contextual details about authentication objects. Updated `config.idporten.yml` to reduce the maximum number of replicas to 1. Commented out the Playwright job in the frontend workflow file to disable it temporarily.
navikt · Dec 17, 2024 · 94e6e68 · 94e6e68
1 parent ae444be
commit 94e6e68
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
@@ -17,12 +17,12 @@ on:
       - ".github/workflows/common.playwright.yml"
 
 jobs:
-  playwright:
-    uses: ./.github/workflows/common.playwright.yml
-    with:
-      working-directory: "apps/dolly-frontend"
-    secrets:
-      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+#  playwright:
+#    uses: ./.github/workflows/common.playwright.yml
+#    with:
+#      working-directory: "apps/dolly-frontend"
+#    secrets:
+#      READER_TOKEN: ${{ secrets.READER_TOKEN }}
 
   workflow:
     uses: ./.github/workflows/common.workflow.frontend.yml

diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
@@ -17,7 +17,7 @@ spec:
       tenant: nav.no
   replicas:
     min: 1
-    max: 2
+    max: 1
   port: 8080
   ingresses:
     - "https://dolly-idporten.ekstern.dev.nav.no"

diff --git a/...ity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java b/...ity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
@@ -39,7 +39,7 @@ private Mono<String> getTokenAttribute(String attribute) {
 
     private String getTokenAttribute(Authentication authentication, String attribute) {
 
-        log.info("context.authentication {}, {}", authentication.getClass().getCanonicalName(), authentication);
+        log.info("GetAuthenticatedUserId context.authentication {}, {}", authentication.getClass().getPackageName(), authentication);
         if (authentication instanceof JwtAuthenticationToken jwtAuthenticationToken) {
             return jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
 

diff --git a/...ctive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java b/...ctive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
@@ -19,7 +19,7 @@ Mono<JwtAuthenticationToken> getJwtAuthenticationToken() {
         return ReactiveSecurityContextHolder
                 .getContext()
                 .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .doOnNext(context -> log.info("context.authentication {}", context.getAuthentication()))
+                .doOnNext(context -> log.info("JwtResolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
                 .map(SecurityContext::getAuthentication)
                 .map(JwtAuthenticationToken.class::cast)
                 .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))

diff --git a/...ve-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java b/...ve-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
@@ -20,7 +20,7 @@ public static Mono<OAuth2AuthenticationToken> getOauth2AuthenticationToken() {
         return ReactiveSecurityContextHolder
                 .getContext()
                 .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .doOnNext(context -> log.info("context.authentication {}", context.getAuthentication()))
+                .doOnNext(context -> log.info("Oauth2Resolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
                 .map(SecurityContext::getAuthentication)
                 .map(OAuth2AuthenticationToken.class::cast)
                 .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))