Merge branch 'refs/heads/master' into feature/cypress-to-playwright-m…

…igration
navikt · Jun 5, 2024 · ae15a1c · ae15a1c
2 parents 3ee33b8 + 93416a5
commit ae15a1c
Show file tree

Hide file tree

Showing 23 changed files with 87 additions and 80 deletions.
diff --git a/.github/workflows/alert-dolly.yml b/.github/workflows/alert-dolly.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   apply-alerts:
     name: Apply alerts to cluster
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -18,4 +19,4 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/alerting-dolly.yml
+          RESOURCE: ".nais/alerting-dolly.yml"
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   deploy:
     name: Deploy team-dolly-lokal-app
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -18,4 +19,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/team-dolly-lokal-app.yml
+          RESOURCE: ".nais/team-dolly-lokal-app.yml"
diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml
@@ -54,6 +54,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"
@@ -127,7 +128,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/${{ inputs.nais-manifest }}
+          RESOURCE: "${{ inputs.working-directory }}/${{ inputs.nais-manifest }}"
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
@@ -142,5 +143,5 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.test.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.test.yml"
           VAR: image=${{ needs.build.outputs.image }}
diff --git a/.github/workflows/common.workflow.frontend.yml b/.github/workflows/common.workflow.frontend.yml
@@ -69,6 +69,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"
@@ -164,7 +165,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
@@ -179,7 +180,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.test.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.test.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   # Only used by dolly-frontend.
@@ -195,7 +196,7 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.idporten.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.idporten.yml"
           VAR: image=${{ needs.build.outputs.image }}
 
   # Only used by dolly-frontend.
@@ -211,5 +212,5 @@ jobs:
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: ${{ inputs.working-directory }}/config.unstable.yml
+          RESOURCE: "${{ inputs.working-directory }}/config.unstable.yml"
           VAR: image=${{ needs.build.outputs.image }}
diff --git a/.github/workflows/common.workflow.libs.backend.yml b/.github/workflows/common.workflow.libs.backend.yml
@@ -19,6 +19,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"

diff --git a/.github/workflows/common.workflow.libs.frontend.yml b/.github/workflows/common.workflow.libs.frontend.yml
@@ -12,6 +12,7 @@ on:
 jobs:
 
   start:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: "Logging"

diff --git a/.github/workflows/idporten.yml b/.github/workflows/idporten.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   deploy-idporten:
+    if: github.event.pull_request.draft == false
     name: Deploy idporten
     runs-on: ubuntu-latest
     permissions:
@@ -19,4 +20,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/idporten.yml
+          RESOURCE: ".nais/idporten.yml"
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -3,23 +3,27 @@ on:
   push:
     branches:
       - master
-    paths-ignore:
-      - 'navikt/**'
-      - '.github/**'
-      - '.nais/alerting-dolly.yml'
+    paths:
+      - 'apps/bruker-service/**'
+      - 'apps/person-organisasjon-tilgang-service/**'
   pull_request:
-    types: [ assigned, opened, synchronize, reopened ]
+    paths:
+      - 'apps/bruker-service/**'
+      - 'apps/person-organisasjon-tilgang-service/**'
+    types: [ ready_for_review, review_requested ]
   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'
     secrets:
       NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
   person-organisasjon-tilgang-service:
+    if: github.event.pull_request.draft == false
     uses: ./.github/workflows/common.integration-test.yml
     with:
       working-directory: 'apps/person-organisasjon-tilgang-service/'

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
diff --git a/.github/workflows/kafka-topics.yml b/.github/workflows/kafka-topics.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   deploy-kafka-topics-dev:
     name: Deploy to Aiven Dev
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -22,4 +23,4 @@ jobs:
         env:
           CLUSTER: dev-gcp
           VAR: kafka-pool=nav-dev
-          RESOURCE: .nais/topics.yml
+          RESOURCE: ".nais/topics.yml"
diff --git a/.github/workflows/lib.integration-test.yml b/.github/workflows/lib.integration-test.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   workflow:
+    if: github.event.pull_request.draft == false
     uses: ./.github/workflows/common.workflow.libs.backend.yml
     with:
       working-directory: 'libs/integration-test'

diff --git a/.github/workflows/maskinporten.yml b/.github/workflows/maskinporten.yml
@@ -19,4 +19,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/maskinporten.yml
+          RESOURCE: ".nais/maskinporten.yml"
diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml
@@ -21,4 +21,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/opensearch.yml
+          RESOURCE: ".nais/opensearch.yml"
diff --git a/.github/workflows/pages-build-deploy.yml b/.github/workflows/pages-build-deploy.yml
@@ -0,0 +1,43 @@
+name: GitHub Pages
+
+on:
+  push:
+    branches: ["master"]
+    paths:
+      - "docs/**"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Configure
+        uses: actions/configure-pages@v5
+      - name: Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload
+        uses: actions/upload-pages-artifact@v3
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/redis-dev.yml b/.github/workflows/redis-dev.yml
@@ -18,4 +18,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/redis-dev.yml
+          RESOURCE: ".nais/redis-dev.yml"
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
@@ -20,4 +20,4 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/redis.yml
+          RESOURCE: ".nais/redis.yml"
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -93,7 +93,6 @@ dependencies {
     implementation 'org.ehcache:ehcache:3.10.8'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
 
-//    implementation 'com.fasterxml.jackson.datatype:jackson-core:2.17.1'
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
     implementation 'io.micrometer:micrometer-registry-prometheus'

diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/blankHeader/BlankHeader.tsx
@@ -14,7 +14,7 @@ export default () => {
 				<h1>Dolly</h1>
 			</div>
 			<div className="menu-links">
-				<a href="https://navikt.github.io/testnorge/applications/dolly/" target="_blank">
+				<a href="https://navikt.github.io/testnorge/docs/applications/dolly/" target="_blank">
 					Dokumentasjon
 				</a>
 			</div>

diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx
@@ -47,7 +47,7 @@ export const DokumentasjonDropdown = () => {
 						<Dropdown.Menu.List.Item
 							onClick={() =>
 								window.open(
-									'https://navikt.github.io/testnorge/applications/dolly/',
+									'https://navikt.github.io/testnorge/docs/applications/dolly/brukerveiledning',
 									'_blank',
 									'noopener',
 								)
@@ -60,7 +60,8 @@ export const DokumentasjonDropdown = () => {
 							<Dropdown.Menu.List.Item
 								onClick={() =>
 									window.open(
-										window.location.hostname.includes('frontend')
+										window.location.hostname.includes('frontend') ||
+											window.location.hostname.includes('localhost')
 											? 'https://dolly-backend-dev.intern.dev.nav.no/swagger'
 											: 'https://dolly-backend.intern.dev.nav.no/swagger',
 										'_blank',

diff --git a/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx b/apps/dolly-frontend/src/main/js/src/components/varslinger/VarslingerTekster.tsx
@@ -11,14 +11,17 @@ export const VarslingerTekster = ({ varslingId }: VarslingId) => {
 
 	const brukerveiledning = (
 		<a
-			href="https://navikt.github.io/testnorge/applications/dolly/brukerveiledning"
+			href="https://navikt.github.io/testnorge/docs/applications/dolly/brukerveiledning"
 			target="_blank"
 		>
 			her
 		</a>
 	)
 	const retningslinjer = (
-		<a href="https://navikt.github.io/testnorge/applications/dolly/retningslinjer" target="_blank">
+		<a
+			href="https://navikt.github.io/testnorge/docs/applications/dolly/retningslinjer"
+			target="_blank"
+		>
 			her
 		</a>
 	)

diff --git a/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx b/apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx
@@ -7,7 +7,7 @@ import { CypressSelector } from '../../../cypress/mocks/Selectors'
 
 const brukerveiledning = (
 	<a
-		href="https://navikt.github.io/testnorge/applications/dolly/brukerveiledning.html#feil-ved-innlogging"
+		href="https://navikt.github.io/testnorge/docs/applications/dolly/brukerveiledning.html#feil-ved-innlogging"
 		target="_blank"
 	>
 		brukerveiledningen

diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle
@@ -59,6 +59,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
     implementation 'org.opensearch.client:spring-data-opensearch:1.4.0'
 
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

diff --git a/dummy.placeholder.file b/dummy.placeholder.file