Fikset merge conflicts

navikt · Feb 21, 2025 · 8d008cd · 8d008cd
2 parents 2f16aa6 + c46d73b
commit 8d008cd
Show file tree

Hide file tree

Showing 177 changed files with 3,192 additions and 3,705 deletions.
diff --git a/.github/workflows/app.levende-arbeidsforhold-ansettelse.yml b/.github/workflows/app.levende-arbeidsforhold-ansettelse.yml
@@ -3,14 +3,16 @@ name: levende-arbeidsforhold-ansettelse
 on:
   push:
     paths:
+      - .github/workflows/app.levende-arbeidsforhold-ansettelse.yml
+      - apps/levende-arbeidsforhold-ansettelse/**
       - libs/commands/**
       - libs/data-transfer-objects/**
+      - libs/data-transfer-search-objects/**
+      - libs/reactive-core/**
+      - libs/reactive-security/**
       - libs/security-core/**
-      - libs/servlet-core/**
-      - libs/servlet-security/**
       - libs/servlet-insecure-security/**
-      - apps/levende-arbeidsforhold-ansettelse/**
-      - .github/workflows/app.levende-arbeidsforhold-ansettelse.yml
+      - libs/testing/**
 
 
 jobs:

diff --git a/.github/workflows/app.testnorge-statisk-data-forvalter.yml b/.github/workflows/app.testnorge-statisk-data-forvalter.yml
@@ -24,7 +24,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "apps/testnorge-statisk-data-forvalter"
-      deploy-tag: "#deploy-testnorge-statisk-data-forvalter"
+      deploy-tag: "#deploy-statisk-data-forvalter"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -2,15 +2,18 @@ name: Integration Tests
 on:
   push:
     paths:
-      - 'apps/bruker-service/**'
+      - "apps/altinn3-tilgang-service/**"
+      - "apps/bruker-service/**"
+      - "mocks/maskinporten-mock/**"
+      - "mocks/tokendings-mock/**"
   workflow_dispatch:
 
 jobs:
   bruker-service:
     if: github.event.pull_request.draft == false
     uses: ./.github/workflows/common.integration-test.yml
     with:
-      working-directory: 'apps/bruker-service/'
-      healthcheck: 'http://localhost:8002/internal/isAlive'
+      working-directory: "apps/bruker-service/"
+      healthcheck: "http://localhost:8002/internal/isAlive"
     secrets:
       NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
@@ -3,11 +3,12 @@ name: inst-proxy
 on:
   push:
     paths:
-      - "plugins/**"
-      - "libs/reactive-core/**"
-      - "libs/reactive-proxy/**"
-      - "proxies/inst-proxy/**"
-      - ".github/workflows/proxy.inst-proxy.yml"
+      - .github/workflows/proxy.inst-proxy.yml
+      - libs/reactive-core/**
+      - libs/reactive-proxy/**
+      - libs/reactive-security/**
+      - plugins/**
+      - proxies/inst-proxy/**
 
 jobs:
   workflow:

diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml
@@ -3,15 +3,16 @@ name: medl-proxy
 on:
   push:
     paths:
-      - "plugins/**"
-      - "proxies/medl-proxy/**"
-      - "libs/servlet-core/**"
-      - "libs/servlet-security/**"
-      - "libs/servlet-insecure-security/**"
-      - "libs/security-core/**"
-      - "libs/database/**"
-      - "libs/data-transfer-objects/**"
-      - ".github/workflows/proxy.medl-proxy.yml"
+      - .github/workflows/proxy.medl-proxy.yml
+      - libs/data-transfer-objects/**
+      - libs/database/**
+      - libs/reactive-security/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-insecure-security/**
+      - libs/servlet-security/**
+      - plugins/**
+      - proxies/medl-proxy/**
 
 jobs:
   workflow:

diff --git a/.github/workflows/proxy.yrkesskade-proxy.yml b/.github/workflows/proxy.yrkesskade-proxy.yml
@@ -3,13 +3,13 @@ name:  yrkesskade-proxy
 on:
   push:
     paths:
-      - plugins/**
+      - .github/workflows/proxy.yrkesskade-proxy.yml
       - libs/reactive-core/**
       - libs/reactive-proxy/**
       - libs/reactive-security/**
       - libs/security-core/**
+      - plugins/**
       - proxies/yrkesskade-proxy/**
-      - .github/workflows/proxy.yrkesskade-proxy.yml
 
 jobs:
   workflow:

diff --git a/.github/workflows/alert-dolly.yml → .github/workflows/scheduled.alerts.yml b/.github/workflows/alert-dolly.yml → .github/workflows/scheduled.alerts.yml
@@ -1,9 +1,9 @@
-name: Deploy dolly alerts to NAIS
 on:
+  schedule:
+    - cron: "0 9 * * MON"
   push:
     paths:
-      - '.nais/alerting-dolly.yml'
-      - '.github/workflows/alert-dolly.yml'
+      - "../../.nais/alerts.yml"
   workflow_dispatch:
 
 jobs:
@@ -21,4 +21,4 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: ".nais/alerting-dolly.yml"
+          RESOURCE: ".nais/alerts.yml"
diff --git a/.nais/alerting-dolly.yml → .nais/alerts.yml b/.nais/alerting-dolly.yml → .nais/alerts.yml
diff --git a/apps/brreg-stub/99-dolly-set-vault-token.sh b/apps/brreg-stub/99-dolly-set-vault-token.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+#
+# Load the contents of the NAIS provided Vault token into a Spring Boot friendly environment variable.
+#
+SPRING_CLOUD_VAULT_TOKEN=$(cat /var/run/secrets/nais.io/vault/vault_token)
+export SPRING_CLOUD_VAULT_TOKEN
diff --git a/apps/brreg-stub/Dockerfile b/apps/brreg-stub/Dockerfile
@@ -3,6 +3,7 @@ LABEL maintainer="Team Dolly"
 
 ENV JAVA_OPTS="-Dspring.profiles.active=prod"
 
-COPY build/libs/app.jar app.jar
+COPY /99-dolly-set-vault-token.sh /init-scripts/
+COPY /build/libs/app.jar app.jar
 
 EXPOSE 8080
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
@@ -1,18 +1,14 @@
 package no.nav.brregstub;
 
 import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
-import no.nav.dolly.libs.vault.VaultTokenApplicationContextInitializer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 
-
 @SpringBootApplication
 public class BrregApplicationLauncher {
     public static void main(String[] args) {
         new SpringApplicationBuilder(BrregApplicationLauncher.class)
-                .initializers(
-                        new VaultTokenApplicationContextInitializer(),
-                        new NaisEnvironmentApplicationContextInitializer())
+                .initializers(new NaisEnvironmentApplicationContextInitializer())
                 .run(args);
     }
 }
diff --git a/apps/bruker-service/src/main/resources/application-dev.yml b/apps/bruker-service/src/main/resources/application-dev.yml
@@ -6,7 +6,6 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   r2dbc:
     url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_DATABASE}

diff --git a/apps/bruker-service/src/main/resources/application-prod.yml b/apps/bruker-service/src/main/resources/application-prod.yml
@@ -4,7 +4,6 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   r2dbc:
     url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_DATABASE}

diff --git a/apps/bruker-service/src/main/resources/application-virtual.yml b/apps/bruker-service/src/main/resources/application-virtual.yml
@@ -4,7 +4,6 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: http://tokendings:8080
-          jwk-set-uri: http://tokendings:8080/jwks
           accepted-audience: dev-gcp:dolly:testnav-bruker-service
   jackson:
     serialization:

diff --git a/apps/bruker-service/src/test/resources/application-test.yml b/apps/bruker-service/src/test/resources/application-test.yml
@@ -8,7 +8,6 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: ${wiremockBaseUrl}
-          jwk-set-uri: ${wiremockBaseUrl}/jwks
 
 consumers:
   testnav-altinn3-tilgang-service:

diff --git a/...main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java b/...main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreAlderspensjonCommand.java
@@ -27,7 +27,7 @@
 public class LagreAlderspensjonCommand implements Callable<Flux<PensjonforvalterResponse>> {
 
     private static final String PENSJON_AP_VEDTAK_URL = "/api/v4/vedtak/ap";
-    private static final String PENSJON_AP_SOKNAD_URL = "/api/v3/vedtak/ap/soknad";
+    private static final String PENSJON_AP_SOKNAD_URL = "/api/v4/vedtak/ap/soknad";
 
     private final WebClient webClient;
 
@@ -77,4 +77,4 @@ public Flux<PensjonforvalterResponse> call() {
                                         .toList())
                                 .build()));
     }
-}
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingTpsMessagingStatusMapper.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingTpsMessagingStatusMapper.java
@@ -28,7 +28,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class BestillingTpsMessagingStatusMapper {
 
-    private static final List<String> HIDE_MILJOER = List.of("q5", "qa", "qx");
+    private static final List<String> HIDE_MILJOER = List.of("qx");
     private static final String OKEY = "OK";
     private static final String ADVARSEL = "Advarsel: ";
     private static final String FEIL = "Feil: ";

diff --git a/apps/dolly-backend/src/main/resources/application-dev.yml b/apps/dolly-backend/src/main/resources/application-dev.yml
@@ -15,7 +15,6 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 consumers:

diff --git a/apps/dolly-backend/src/main/resources/application-prod.yml b/apps/dolly-backend/src/main/resources/application-prod.yml
@@ -11,5 +11,4 @@ spring:
       resourceserver:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
             <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <maxStackTraceLength>-1</maxStackTraceLength>
                 <addCauses>true</addCauses>
-                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>
+<!--                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>-->
 <!--                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">-->
 <!--                    <rootCauseFirst>true</rootCauseFirst>-->
 <!--                    -->

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
 
     // Session
-    implementation "redis.clients:jedis:5.1.2"
+    implementation "redis.clients:jedis:5.2.0"
     implementation "org.springframework.session:spring-session-core"
     implementation "org.springframework.session:spring-session-data-redis"
 

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -149,4 +149,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                         .filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
                 ).uri(host);
     }
-}
+}
diff --git a/apps/dolly-frontend/src/main/js/.npmrc b/apps/dolly-frontend/src/main/js/.npmrc
@@ -1 +1,2 @@
-@navikt:registry=https://npm.pkg.github.com
+@navikt:registry=https://npm.pkg.github.com
+legacy-peer-deps=true
-Original file line number
+Diff line change
@@ Expand Up @@
                             .filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
                     ).uri(host);
         }
-    }
+    }