Fixes to integration tests.

rfc3092 · rfc3092 · commit 29e5eb476308 · 2025-02-11T16:12:54.000+01:00
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,8 +1,5 @@
-ALTINN_URL: https://platform.tt02.altinn.no
 MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
-MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
-MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
 
 spring:
   cache:
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-virtual.yml b/apps/altinn3-tilgang-service/src/main/resources/application-virtual.yml
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -1,6 +1,5 @@
 spring:
   application:
-    version: application.version.todo
     name: testnav-altinn3-tilgang-service
     description: Tjeneste for å hente og sette tilganger for orgnisasjoner
   security:
@@ -30,20 +29,19 @@ altinn:
 
 management:
   endpoints:
-    enabled-by-default: true
+    access:
+      default: read_only
     web:
       base-path: /internal
       exposure:
         include: prometheus,health
       path-mapping:
         prometheus: metrics
-  endpoint:
-    prometheus:
-      enabled: true
   prometheus:
     metrics:
       export:
         enabled: true
+
 server:
   servlet:
     encoding:
diff --git a/apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml b/apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
@@ -13,7 +14,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="local">
+    <springProfile name="local,virtual">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/bruker-service/src/main/resources/application-virtual.yml b/apps/bruker-service/src/main/resources/application-virtual.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false
   security:
     oauth2:
       resourceserver:
@@ -27,9 +23,4 @@ consumers:
     url: http://testnav-altinn3-tilgang-service:8080
     cluster: dev-gcp
     namespace: dolly
-    name: testnav-altinn3-tilgang-service
-
-TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service
-JWT_SECRET: dummy
-CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
+    name: testnav-altinn3-tilgang-service
diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
@@ -1,6 +1,5 @@
 spring:
   application:
-    version: application.version.todo
     name: testnav-bruker-service
     description: Tjeneste for brukere
   security:
@@ -29,20 +28,19 @@ consumers:
 
 management:
   endpoints:
-    enabled-by-default: true
+    access:
+      default: read_only
     web:
       base-path: /internal
       exposure:
         include: prometheus,health
       path-mapping:
         prometheus: metrics
-  endpoint:
-    prometheus:
-      enabled: true
   prometheus:
     metrics:
       export:
         enabled: true
+
 server:
   servlet:
     encoding:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,61 +1,74 @@
 services:
+
   testnav-altinn3-tilgang-service:
-    container_name: testnav-altinn3-tilgang-service
-    environment:
-      - SPRING_PROFILES_ACTIVE=virtual
-      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-      - TOKEN_X_PRIVATE_JWK=${JWK}
-      - MASKINPORTEN_CLIENT_JWK=${JWK}
-    build:
-      context: ./apps/altinn3-tilgang-service
     depends_on:
       - tokendings
       - maskinporten
       - altinn
+    build:
+      context: ./apps/altinn3-tilgang-service
+    environment:
+      - ALTINN_URL=http//altinn:8080
+      - AZURE_OPENID_CONFIG_ISSUER=dummy
+      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+      - MASKINPORTEN_CLIENT_ID=dummy
+      - MASKINPORTEN_CLIENT_JWK=${JWK}
+      - MASKINPORTEN_SCOPES=altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
+      - MASKINPORTEN_WELL_KNOWN_URL=http://maskinporten:8080
+      - SPRING_PROFILES_ACTIVE=virtual
+      - TOKEN_X_ISSUER=http://tokendings:8080
+      - TOKEN_X_PRIVATE_JWK=${JWK}
     ports:
       - "8001:8080"
       - "5001:5005"
+
   tokendings:
-    container_name: tokendings
     build:
       context: ./mocks/tokendings-mock
     environment:
       - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+      - SPRING_PROFILES_ACTIVE=virtual
     ports:
       - "9001:8080"
+
   maskinporten:
-    container_name: maskinporten
     build:
       context: ./mocks/maskinporten-mock
     environment:
       - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+      - SPRING_PROFILES_ACTIVE=virtual
     ports:
       - "9002:8080"
+
   altinn:
     image: wiremock/wiremock
-    container_name: altinn
     volumes:
       - ./mocks/altinn-mock/wiremock/__files:/home/wiremock/__files
       - ./mocks/altinn-mock/wiremock/mappings:/home/wiremock/mappings
+
   testnav-bruker-service-db:
     image: postgres
-    restart: always
-    container_name: testnav-bruker-service-db
     environment:
       - POSTGRES_USER=compose-postgres
       - POSTGRES_PASSWORD=compose-postgres
+    restart: always
+
   testnav-bruker-service:
-    container_name: testnav-bruker-service
-    environment:
-      - SPRING_PROFILES_ACTIVE=virtual
-      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-      - TOKEN_X_PRIVATE_JWK=${JWK}
-    build:
-      context: ./apps/bruker-service
     depends_on:
       - testnav-bruker-service-db
       - testnav-altinn3-tilgang-service
       - tokendings
+    build:
+      context: ./apps/bruker-service
+    environment:
+      - AZURE_OPENID_CONFIG_ISSUER=dummy
+      - CRYPTOGRAPHY_SECRET=dummy
+      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+      - JWT_SECRET=dummy
+      - SPRING_PROFILES_ACTIVE=virtual
+      - TOKEN_X_CLIENT_ID=dev-gcp:dolly:testnav-bruker-service
+      - TOKEN_X_PRIVATE_JWK=${JWK}
+      - TOKEN_X_WELL_KNOWN_URL=http://tokendings:8080/.well-known/oauth-authorization-server
     ports:
       - "8002:8080"
       - "5002:5005"
diff --git a/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java b/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java
@@ -34,6 +34,7 @@ private static void configureForLocalProfile(Map<String, Object> properties) {
         log.info("Configuring environment for local profile using Secret Manager");
 
         // Emulating NAIS provided environment variables.
+        properties.putIfAbsent("ALTINN_URL", "${sm\\://altinn-url}"); // Used by altinn3-tilgang-service only.
         properties.putIfAbsent("AZURE_APP_CLIENT_ID", "${sm\\://azure-app-client-id}");
         properties.putIfAbsent("AZURE_APP_CLIENT_SECRET", "${sm\\://azure-app-client-secret}");
         properties.putIfAbsent("AZURE_OPENID_CONFIG_ISSUER", "${sm\\://azure-openid-config-issuer}");
@@ -64,7 +65,7 @@ private static void configureForTestProfile(Map<String, Object> properties) {
                         "ALTINN_API_KEY",
                         "ALTINN_URL",
                         "AZURE_OPENID_CONFIG_ISSUER",
-                        "AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", // CATO: Remove?
+                        "AZURE_OPENID_CONFIG_TOKEN_ENDPOINT",
                         "CRYPTOGRAPHY_SECRET", // Used by bruker-service only.
                         "IDPORTEN_CLIENT_ID", // Used by dolly-frontend only.
                         "IDPORTEN_CLIENT_JWK", // Used by dolly-frontend only.
@@ -86,6 +87,7 @@ private static void configureForOtherProfiles(Map<String, Object> properties) {
         log.info("Configuring environment for non-test, non-local profiles");
 
         properties.putIfAbsent("spring.main.banner-mode", "off");
+        properties.putIfAbsent("spring.cloud.gcp.secretmanager.enabled", "false"); // Unless we actually start using Secret Manager in deployment.
 
     }
 
diff --git a/mocks/maskinporten-mock/src/main/resources/application.yml b/mocks/maskinporten-mock/src/main/resources/application.yml
@@ -1,3 +1,7 @@
 spring:
   application:
-    name: maskinporten-mock
+    name: maskinporten-mock
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: false
