Merge branch 'master' into bugfix/synt-vedtakshistorikk

Author: krharum

.github/workflows/all.workflows.yml

@@ -59,8 +59,8 @@ jobs:
     if: inputs.workflow == 'frontend'
     uses: ./.github/workflows/common.workflow.frontend.yml
     permissions:
+      id-token: write
       packages: write
-
     with:
       cluster: ${{ inputs.cluster }}
       working-directory: "${{ inputs.type }}/${{ inputs.name }}"

.github/workflows/app.dolly-frontend.yml

@@ -14,11 +14,22 @@ on:
       - "libs/security-core/**"
       - "apps/dolly-frontend/**"
       - ".github/workflows/app.dolly-frontend.yml"
-      - ".github/workflows/common.playwright-vitest.yml"
+      - ".github/workflows/common.playwright.yml"
+      - ".github/workflows/common.vitest.yml"
 
 jobs:
   playwright:
-    uses: ./.github/workflows/common.playwright-vitest.yml
+    uses: ./.github/workflows/common.playwright.yml
+    permissions:
+      packages: write
+      id-token: write
+      contents: read
+    with:
+      working-directory: "apps/dolly-frontend"
+    secrets:
+      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+  vitest:
+    uses: ./.github/workflows/common.vitest.yml
     permissions:
       packages: write
       id-token: write

.github/workflows/app.tps-messaging-frontend.yml

@@ -0,0 +1,34 @@
+name: tps-messaging-frontend
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-frontend/**"
+      - "libs/reactive-session-security/**"
+      - "libs/security-core/**"
+      - "apps/tps-messaging-frontend/**"
+      - ".github/workflows/app.tps-messaging-frontend.yml"
+      - ".github/workflows/common.vitest.yml"
+
+jobs:
+  vitest:
+    uses: ./.github/workflows/common.vitest.yml
+    permissions:
+      packages: write
+      id-token: write
+      contents: read
+    with:
+      working-directory: "apps/tps-messaging-frontend"
+    secrets:
+      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+  workflow:
+    uses: ./.github/workflows/common.workflow.frontend.yml
+    with:
+      working-directory: "apps/tps-messaging-frontend"
+      deploy-tag: "#deploy-tps-messaging-frontend"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

.github/workflows/common.playwright-vitest.yml .github/workflows/common.playwright.yml

@@ -1,4 +1,4 @@
-name: Playwright/Vitest Tests
+name: Playwright Tests
 on:
   workflow_call:
     inputs:
@@ -44,11 +44,6 @@ jobs:
           name: blob-report-${{ matrix.shardIndex }}
           path: ${{ inputs.working-directory }}/src/main/js/blob-report
           retention-days: 1
-
-      - name: Run Vitest/RTL tests
-        if: ${{ matrix.shardIndex == 1 }}
-        working-directory: ${{ inputs.working-directory }}/src/main/js
-        run: npm run test:vitest-run
 
   merge-reports:
     if: ${{ !cancelled() }}
@@ -85,7 +80,6 @@ jobs:
           source: ${{ inputs.working-directory }}/src/main/js/playwright-report
           destination: /${{ github.repository }}/${{ github.run_number }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-      #          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
       - name: Merge to json report
         working-directory: ${{ inputs.working-directory }}/src/main/js

.github/workflows/common.vitest.yml

@@ -0,0 +1,33 @@
+name: Vitest Tests
+on:
+  workflow_call:
+    inputs:
+      working-directory:
+        type: string
+        description: "The working directory for the job, e.g. apps/dolly-frontend (without leading/trailing slash)."
+        required: true
+    secrets:
+      READER_TOKEN:
+        required: true
+
+jobs:
+  vitest:
+    runs-on: ubuntu-latest
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          registry-url: https://npm.pkg.github.com/
+          scope: "@navikt"
+      - name: Install dependencies
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npm ci
+      - name: Install Playwright Browsers
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npx playwright install --with-deps
+      - name: Run Vitest/RTL tests
+        working-directory: ${{ inputs.working-directory }}/src/main/js
+        run: npm run test:vitest-run

.github/workflows/valkey-dolly-dev-session.yml

@@ -0,0 +1,18 @@
+name: Deploy Valkey (valkey-dolly-dev-session)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Deploy Valkey
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: ".nais/valkey-dolly-dev-session.yml"

.github/workflows/valkey-dolly-session.yml

@@ -0,0 +1,18 @@
+name: Deploy Valkey (valkey-dolly-session)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Deploy Valkey
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: ".nais/valkey-dolly-session.yml"

.gitignore

@@ -5,6 +5,10 @@
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# testing
+*vitest-result.json
+*__screenshots__/
+
 # dependencies
 *node_modules/
 

.nais/valkey-dolly-dev-session.yml

@@ -0,0 +1,24 @@
+apiVersion: aiven.io/v1alpha1
+kind: Valkey
+metadata:
+  labels:
+    app: valkey-dolly-dev-session
+    team: dolly
+  name: valkey-dolly-dev-session
+  namespace: dolly
+spec:
+  plan: startup-4
+  project: nav-dev
+---
+apiVersion: aiven.io/v1alpha1
+kind: ServiceIntegration
+metadata:
+  labels:
+    team: dolly
+  name: valkey-dolly-dev-session
+  namespace: dolly
+spec:
+  project: nav-dev
+  integrationType: prometheus
+  destinationEndpointId: f20f5b48-18f4-4e2a-8e5f-4ab3edb19733
+  sourceServiceName: valkey-dolly-dev-session

.nais/valkey-dolly-session.yml

@@ -0,0 +1,24 @@
+apiVersion: aiven.io/v1alpha1
+kind: Valkey
+metadata:
+  labels:
+    app: valkey-dolly-session
+    team: dolly
+  name: valkey-dolly-session
+  namespace: dolly
+spec:
+  plan: startup-4
+  project: nav-dev
+---
+apiVersion: aiven.io/v1alpha1
+kind: ServiceIntegration
+metadata:
+  labels:
+    team: dolly
+  name: valkey-dolly-session
+  namespace: dolly
+spec:
+  project: nav-dev
+  integrationType: prometheus
+  destinationEndpointId: f20f5b48-18f4-4e2a-8e5f-4ab3edb19733
+  sourceServiceName: valkey-dolly-session

apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/consumer/command/PdlAdresseSoekCommand.java

@@ -7,6 +7,7 @@
 import no.nav.testnav.apps.adresseservice.exception.BadRequestException;
 import no.nav.testnav.apps.adresseservice.exception.NotFoundException;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -33,7 +34,7 @@ public Mono<PdlAdresseResponse> call() {
                 .uri(builder -> builder.path("/pdl-api/graphql").build())
                 .body(BodyInserters.fromValue(query))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(TEMA, TemaGrunnlag.GEN.name())
                 .retrieve()
                 .bodyToMono(PdlAdresseResponse.class)

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java

@@ -6,6 +6,7 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -34,7 +35,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .uri(builder -> builder.path(ALTINN_URL)
                         .build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
                 .bodyValue(organisasjon)
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
                 .bodyToMono(AltinnAccessListResponseDTO.class)

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java

@@ -6,6 +6,7 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -37,7 +38,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .uri(builder -> builder.path(ALTINN_URL)
                         .build(altinnConfig.getOwner(), altinnConfig.getIdentifier())
                 )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .bodyValue(identifiers)
                 .retrieve()

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java

@@ -5,6 +5,7 @@
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -29,7 +30,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .get()
                 .uri(builder -> builder.path(ALTINN_URL)
                         .build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
                 .bodyToMono(AltinnAccessListResponseDTO.class)

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java

@@ -5,6 +5,7 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -30,7 +31,7 @@ public Mono<AuthorizedPartyDTO[]> call() {
                 .post()
                 .uri(builder -> builder.path(ALTINN_URL)
                         .build())
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .bodyValue(request)
                 .retrieve()

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -27,7 +28,7 @@ public Mono<String> call() {
                 .uri(builder -> builder.path(ALTINN_URL)
                         .build()
                 )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
                 .bodyToMono(String.class)

apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/command/GetAktiveBestillingerCommand.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
-import org.springframework.http.HttpHeaders;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
@@ -28,7 +28,7 @@ public Flux<Object> call() {
                         .path("/api/v1/bestilling/gruppe/{gruppeId}/ikkeferdig")
                         .build(gruppeId)
                 )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .retrieve()
                 .bodyToFlux(Object.class)
                 .onErrorResume(throwable -> throwable instanceof WebClientResponseException.NotFound,

apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/command/PostBestillingCommand.java

@@ -4,15 +4,14 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.registre.testnorge.batchbestillingservice.request.RsDollyBestillingRequest;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.Disposable;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.Callable;
 
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-
 @Slf4j
 @RequiredArgsConstructor
 public class PostBestillingCommand implements Callable<Disposable> {
@@ -28,7 +27,7 @@ public Disposable call() {
         return webClient.post()
                 .uri(builder -> builder
                         .path("/api/v1/gruppe/{gruppeId}/bestilling").build(gruppeId))
-                .header(AUTHORIZATION, "Bearer " + token)
+                .headers(WebClientHeader.bearer(token))
                 .bodyValue(request)
                 .retrieve()
                 .toBodilessEntity()

apps/bruker-service/config.yml

@@ -23,6 +23,7 @@ spec:
         - application: dolly-backend
         - application: dolly-frontend
         - application: dolly-idporten
+        - application: testnav-tps-messaging-frontend
         - application: testnav-oversikt-frontend
     outbound:
       rules:

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/BrukerServiceApplicationStarter.java

@@ -22,4 +22,4 @@ public static void main(String[] args) {
                 .initializers(new NaisEnvironmentApplicationContextInitializer())
                 .run(args);
     }
-}
+}