Merge branch 'main' into pw-psb

navikt · Dec 12, 2023 · f83de9e · f83de9e
2 parents 0701568 + 34298f8
commit f83de9e
Show file tree

Hide file tree

Showing 403 changed files with 35,259 additions and 26,181 deletions.
diff --git a/.github/workflows/.deploy-app-to-dev.yml b/.github/workflows/.deploy-app-to-dev.yml
@@ -9,6 +9,9 @@ on:
             app-name:
                 type: string
                 required: true
+            is-next-app:
+                type: boolean
+                required: false
 
 jobs:
     deploy-to-dev:
@@ -20,17 +23,34 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
+            - name: Setup .yarnrc.yml
+              run: |
+                  yarn config set npmScopes.navikt.npmRegistryServer "https://npm.pkg.github.com"
+                  yarn config set npmScopes.navikt.npmAlwaysAuth true
+                  yarn config set npmScopes.navikt.npmAuthToken $NODE_AUTH_TOKEN
+              env:
+                NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+
             - name: Setup Node.js environment
               uses: actions/setup-node@v4
               with:
                   node-version: 18
                   cache: 'yarn'
 
             - name: Install dependencies (yarn)
-              run: yarn
+              run: yarn install
+              env:
+                  NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+
+            - name: Copy .env.dev for next.js build
+              if: ${{ inputs.is-next-app == true }}
+              shell: bash
+              run: |
+                  echo "Copying .env.dev to app root"
+                  cp apps/${{inputs.app-name}}/nais/envs/.env.dev apps/${{inputs.app-name}}/.env.production
 
             - name: Build application
-              run: yarn build-${{ inputs.app-name }}
+              run: yarn turbo run build-app --filter=@navikt/${{ inputs.app-name }}
 
             - name: Build and publish docker image
               uses: nais/docker-build-push@v0
@@ -54,3 +74,4 @@ jobs:
                   VAR: GITHUB_REF_NAME=${{ github.ref_name }} # brukes i applikasjonerna
                   APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
                   IMAGE: ${{ steps.docker-push.outputs.image }}
+                  NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
diff --git a/.github/workflows/.deploy-app-to-prod.yml b/.github/workflows/.deploy-app-to-prod.yml
@@ -9,6 +9,9 @@ on:
             app-name:
                 type: string
                 required: true
+            is-next-app:
+                type: boolean
+                required: false
 
 jobs:
     deploy-to-prod:
@@ -22,6 +25,14 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
+            - name: Setup .yarnrc.yml
+              run: |
+                  yarn config set npmScopes.navikt.npmRegistryServer "https://npm.pkg.github.com"
+                  yarn config set npmScopes.navikt.npmAlwaysAuth true
+                  yarn config set npmScopes.navikt.npmAuthToken $NODE_AUTH_TOKEN
+              env:
+                NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+
             - name: Setup Node.js environment
               uses: actions/setup-node@v4
               with:
@@ -31,8 +42,15 @@ jobs:
             - name: Install dependencies (yarn)
               run: yarn
 
+            - name: Copy .env.prod for next.js build
+              if: ${{ inputs.is-next-app == true }}
+              shell: bash
+              run: |
+                  echo "Copying .env.prod to app root"
+                  cp apps/${{inputs.app-name}}/nais/envs/.env.prod apps/${{inputs.app-name}}/.env.production
+
             - name: Build application
-              run: yarn build-${{ inputs.app-name }}
+              run: yarn turbo run build-app --filter=@navikt/${{ inputs.app-name }}
 
             - name: Build and publish docker image
               uses: nais/docker-build-push@v0

diff --git a/.github/workflows/.test-deploy-omssoknad-distroless.yml b/.github/workflows/.test-deploy-omssoknad-distroless.yml
diff --git a/.github/workflows/dispatch.deploy-dine-pleiepenger-to-prod.yml b/.github/workflows/dispatch.deploy-dine-pleiepenger-to-prod.yml
@@ -0,0 +1,30 @@
+name: Deploy dine-pleiepenger to prod
+run-name: Deploy dine-pleiepenger to prod
+
+on:
+    push:
+        branches:
+            - main
+        paths:
+            - 'apps/dine-pleiepenger/**/*'
+    workflow_dispatch:
+
+jobs:
+    run-tests:
+        uses: ./.github/workflows/test.dine-pleiepenger.yml
+        secrets: inherit
+
+    deploy-to-prod:
+        name: Deploy dine-pleiepenger to prod
+        needs: [run-tests]
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
+        secrets: inherit
+        permissions:
+            contents: write
+            security-events: write
+            id-token: write
+            actions: read
+        with:
+            app-name: 'dine-pleiepenger'
+            working-directory: 'apps/dine-pleiepenger'
+            is-next-app: true
diff --git a/.github/workflows/dispatch.deploy-ekstra-omsorgsdager-andre-forelder-ikke-tilsyn-to-prod.yml b/.github/workflows/dispatch.deploy-ekstra-omsorgsdager-andre-forelder-ikke-tilsyn-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy ekstra-omsorgsdager-andre-forelder-ikke-tilsyn to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-endringsmelding-pleiepenger-to-prod.yml b/.github/workflows/dispatch.deploy-endringsmelding-pleiepenger-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.endringsmelding-pleiepenger.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy endringsmelding-pleiepenger to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-ettersending-to-prod.yml b/.github/workflows/dispatch.deploy-ettersending-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.sif-ettersending.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy sif-ettersending to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-omsorgsdager-aleneomsorg-dialog-to-prod.yml b/.github/workflows/dispatch.deploy-omsorgsdager-aleneomsorg-dialog-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy omsorgsdager-aleneomsorg-dialog to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-omsorgsdager-kalkulator-to-prod.yml b/.github/workflows/dispatch.deploy-omsorgsdager-kalkulator-to-prod.yml
@@ -0,0 +1,29 @@
+name: Deploy omsorgsdager kalkulator to prod
+run-name: Deploy omsorgsdager kalkulator to prod
+
+on:
+    push:
+        branches:
+            - main
+        paths:
+            - 'apps/omsorgsdager-kalkulator/**/*'
+    workflow_dispatch:
+
+jobs:
+    run-tests:
+        uses: ./.github/workflows/test.omsorgsdager-kalkulator.yml
+        secrets: inherit
+
+    deploy-to-prod:
+        name: Deploy omsorgsdager kalkulator to prod
+        needs: [run-tests]
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
+        secrets: inherit
+        permissions:
+            contents: write
+            security-events: write
+            id-token: write
+            actions: read
+        with:
+            app-name: 'omsorgsdager-kalkulator'
+            working-directory: 'apps/omsorgsdager-kalkulator'
diff --git a/.github/workflows/dispatch.deploy-omsorgspengerutbetaling-soknad-to-prod.yml b/.github/workflows/dispatch.deploy-omsorgspengerutbetaling-soknad-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.omsorgspengerutbetaling-soknad.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy omsorgspengerutbetaling-soknad to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-omsorgspengesøknad-to-prod.yml b/.github/workflows/dispatch.deploy-omsorgspengesøknad-to-prod.yml
@@ -12,11 +12,12 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.omsorgspengesøknad.yml
+        secrets: inherit
 
     deploy-to-prod:
         name: Deploy omsorgspengesøknad to prod
         needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
         secrets: inherit
         permissions:
             contents: write

diff --git a/.github/workflows/dispatch.deploy-pleiepenger-i-livets-sluttfase-soknad-to-prod.yml b/.github/workflows/dispatch.deploy-pleiepenger-i-livets-sluttfase-soknad-to-prod.yml
@@ -12,17 +12,18 @@ on:
 jobs:
     run-tests:
         uses: ./.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml
+        secrets: inherit
 
-    # deploy-to-prod:
-    #    name: Deploy pleiepenger-i-livets-sluttfase-soknad to prod
-    #    needs: [run-tests]
-    #    uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
-    #   secrets: inherit
-    #   permissions:
-    #       contents: write
-    #       security-events: write
-    #       id-token: write
-    #       actions: read
-    #    with:
-    #        app-name: 'pleiepenger-i-livets-sluttfase-soknad'
-    #        working-directory: 'apps/pleiepenger-i-livets-sluttfase-soknad'
+    deploy-to-prod:
+        name: Deploy pleiepenger-i-livets-sluttfase-soknad to prod
+        needs: [run-tests]
+        uses: ./.github/workflows/.deploy-app-to-prod.yml
+        secrets: inherit
+        permissions:
+            contents: write
+            security-events: write
+            id-token: write
+            actions: read
+        with:
+            app-name: 'pleiepenger-i-livets-sluttfase-soknad'
+            working-directory: 'apps/pleiepenger-i-livets-sluttfase-soknad'
diff --git a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml
@@ -10,53 +10,20 @@ on:
     workflow_dispatch:
 
 jobs:
-    run-tests:
-        name: Run tests
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup Node.js environment
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 18
-                  cache: 'yarn'
-
-            - name: Install dependencies (yarn)
-              run: yarn
-
-            - name: Run code tests
-              run: yarn test --filter=pleiepenger-sykt-barn
-
-            - name: Build and start e2e server
-              uses: cypress-io/[email protected]
-              env:
-                  DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
-                  PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger
-                  FRONTEND_API_PATH: http://localhost:8082/
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                  project: ./apps/pleiepenger-sykt-barn/e2e
-                  build: yarn build-pleiepenger-sykt-barn
-                  start: yarn turbo start-e2e-server --filter=pleiepenger-sykt-barn
-                  wait-on: 'http://localhost:8080'
-                  wait-on-timeout: 60
-                  runTests: false
-
-            - name: Run cypress tests
-              run: yarn turbo cypress-run --filter=pleiepenger-sykt-barn
-
-    deploy-to-prod:
-        name: Deploy pleiepenger-sykt-barn to prod
-        needs: [run-tests]
-        uses: navikt/sif-brukerdialog/.github/workflows/.deploy-app-to-prod.yml@main
-        secrets: inherit
-        permissions:
-          contents: write
-          security-events: write
-          id-token: write
-          actions: read
-        with:
-            app-name: 'pleiepenger-sykt-barn'
-            working-directory: 'apps/pleiepenger-sykt-barn'
+  run-tests:
+    uses: ./.github/workflows/test.pleiepenger-sykt-barn.yml
+    secrets: inherit
+
+  deploy-to-prod:
+    name: Deploy pleiepenger-sykt-barn to prod
+    needs: [run-tests]
+    uses: ./.github/workflows/.deploy-app-to-prod.yml
+    secrets: inherit
+    permissions:
+      contents: write
+      security-events: write
+      id-token: write
+      actions: read
+    with:
+        app-name: 'pleiepenger-sykt-barn'
+        working-directory: 'apps/pleiepenger-sykt-barn'