Skip to content

Commit 9f24a21

Browse files
betsytraranbetsytraran
committed
Fikset merge conflicts
2 parents 320f215 + 1333bec commit 9f24a21

File tree

1,685 files changed

+34457
-34971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,685 files changed

+34457
-34971
lines changed

‎.github/workflows/alert-dolly.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ jobs:
88
apply-alerts:
99
name: Apply alerts to cluster
1010
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
id-token: write
1114
steps:
1215
- name: Checkout code
13-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1417
- name: deploy to dev
15-
uses: nais/deploy/actions/deploy@v1
18+
uses: nais/deploy/actions/deploy@v2
1619
env:
17-
APIKEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
1820
CLUSTER: dev-gcp
1921
RESOURCE: .nais/alerting-dolly.yml

‎.github/workflows/all.workflows.yml

+9-33
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- "frontend"
1010
type:
1111
type: choice
12-
description: "App or proxy. Used to resolve the working directory together with name, as <type>/<name>."
12+
description: "Apps or proxies. Used to resolve the working directory together with name, as <type>/<name>."
1313
options:
1414
- "apps"
1515
- "proxies"
@@ -28,31 +28,22 @@ on:
2828
type: boolean
2929
description: "Deploy? Make sure the effective working directory contains a NAIS manifest as named below! Note: For dolly-frontend, this will also deploy with config.idporten.yml."
3030
default: false
31-
nais-manifest:
32-
type: string
33-
description: "Custom NAIS manifest filename."
34-
default: "config.yml"
3531
force-deploy-test:
3632
type: boolean
3733
description: "Deploy to test? Make sure the effective working directory contains a config.test.yml! Note: For dolly-frontend, this will also deploy with config.unstable.yml."
3834
default: false
35+
sonar-enabled:
36+
type: boolean
37+
description: "Run Sonar scan?"
38+
default: true
3939

4040
permissions:
4141
contents: read
4242
id-token: write
4343

4444
jobs:
4545

46-
start:
47-
runs-on: ubuntu-latest
48-
steps:
49-
- name: "Log inputs"
50-
run: |
51-
echo "branch: ${{ github.ref_name }}"
52-
echo "inputs: ${{ toJSON(inputs) }}"
53-
5446
backend:
55-
needs: start
5647
if: inputs.workflow == 'backend'
5748
uses: ./.github/workflows/common.workflow.backend.yml
5849
with:
@@ -62,35 +53,20 @@ jobs:
6253
deploy-tag: ""
6354
force-deploy: ${{ inputs.force-deploy }}
6455
force-deploy-test: ${{ inputs.force-deploy-test }}
65-
permissions:
66-
contents: read
67-
id-token: write
68-
secrets:
69-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
70-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
71-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
72-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
56+
sonar-enabled: ${{ inputs.sonar-enabled }}
57+
secrets: inherit
7358

7459
frontend:
75-
needs: start
7660
if: inputs.workflow == 'frontend'
7761
uses: ./.github/workflows/common.workflow.frontend.yml
7862
with:
7963
cluster: ${{ inputs.cluster }}
8064
working-directory: "${{ inputs.type }}/${{ inputs.name }}"
8165
image-suffix: ${{ inputs.name }}
8266
deploy-tag: ""
83-
nais-manifest: ${{ inputs.nais-manifest }}
8467
force-deploy: ${{ inputs.force-deploy }}
8568
force-deploy-test: ${{ inputs.force-deploy-test }}
8669
force-deploy-idporten: ${{ inputs.name == 'dolly-frontend' && inputs.force-deploy }}
8770
force-deploy-unstable: ${{ inputs.name == 'dolly-frontend' && inputs.force-deploy-test }}
88-
permissions:
89-
contents: read
90-
id-token: write
91-
secrets:
92-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
93-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
94-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
95-
READER_TOKEN: ${{ secrets.READER_TOKEN }}
96-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
71+
sonar-enabled: ${{ inputs.sonar-enabled }}
72+
secrets: inherit

‎.github/workflows/app.adresse-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,4 @@ jobs:
1919
permissions:
2020
contents: read
2121
id-token: write
22-
secrets:
23-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
24-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
25-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
26-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
secrets: inherit

‎.github/workflows/app.amelding-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.app-tilgang-analyse-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ jobs:
1818
permissions:
1919
contents: read
2020
id-token: write
21-
secrets:
22-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
23-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
24-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
25-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
21+
secrets: inherit

‎.github/workflows/app.arbeidsforhold-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.batch-bestilling-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,4 @@ jobs:
2222
permissions:
2323
contents: read
2424
id-token: write
25-
secrets:
26-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
27-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
28-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
29-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
25+
secrets: inherit

‎.github/workflows/app.brreg-stub.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ jobs:
1818
permissions:
1919
contents: read
2020
id-token: write
21-
secrets:
22-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
23-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
24-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
25-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
21+
secrets: inherit

‎.github/workflows/app.bruker-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.budpro-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,4 @@ jobs:
2222
permissions:
2323
contents: read
2424
id-token: write
25-
secrets:
26-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
27-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
28-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
29-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
25+
secrets: inherit

‎.github/workflows/app.dolly-backend.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@ jobs:
2323
permissions:
2424
contents: read
2525
id-token: write
26-
secrets:
27-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
28-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
29-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
30-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
26+
secrets: inherit

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- libs/security-core
1414
- apps/dolly-frontend/**
1515
- .github/workflows/app.dolly-frontend.yml
16+
- .github/workflows/common.cypress.yml
1617

1718
jobs:
1819

@@ -34,9 +35,4 @@ jobs:
3435
permissions:
3536
contents: read
3637
id-token: write
37-
secrets:
38-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
39-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
40-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
41-
READER_TOKEN: ${{ secrets.READER_TOKEN }}
42-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
38+
secrets: inherit

‎.github/workflows/app.dollystatus.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ jobs:
1515
permissions:
1616
contents: read
1717
id-token: write
18-
secrets:
19-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
20-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
21-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
22-
READER_TOKEN: ${{ secrets.READER_TOKEN }}
23-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
18+
secrets: inherit

‎.github/workflows/app.endringsmelding-frontend.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,4 @@ jobs:
1919
permissions:
2020
contents: read
2121
id-token: write
22-
secrets:
23-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
24-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
25-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
26-
READER_TOKEN: ${{ secrets.READER_TOKEN }}
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
secrets: inherit

‎.github/workflows/app.endringsmelding-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,4 @@ jobs:
1919
permissions:
2020
contents: read
2121
id-token: write
22-
secrets:
23-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
24-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
25-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
26-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
secrets: inherit

‎.github/workflows/app.ereg-batch-status-service.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@ jobs:
1414
workflow:
1515
uses: ./.github/workflows/common.workflow.backend.yml
1616
with:
17-
cluster: "dev-fss"
17+
cluster: "dev-gcp"
1818
working-directory: "apps/ereg-batch-status-service"
1919
deploy-tag: "#deploy-ereg-batch-status-service"
2020
permissions:
2121
contents: read
2222
id-token: write
23-
secrets:
24-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
25-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
26-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
23+
secrets: inherit

‎.github/workflows/app.faste-data-frontend.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,4 @@ jobs:
1919
permissions:
2020
contents: read
2121
id-token: write
22-
secrets:
23-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
24-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
25-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
26-
READER_TOKEN: ${{ secrets.READER_TOKEN }}
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
secrets: inherit

‎.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@ jobs:
2020
permissions:
2121
contents: read
2222
id-token: write
23-
secrets:
24-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
25-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
26-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
23+
secrets: inherit

‎.github/workflows/app.generer-navn-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.generer-organisasjon-populasjon-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,4 @@ jobs:
2525
permissions:
2626
contents: read
2727
id-token: write
28-
secrets:
29-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
30-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
31-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
32-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
28+
secrets: inherit

‎.github/workflows/app.generer-synt-amelding-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@ jobs:
2020
permissions:
2121
contents: read
2222
id-token: write
23-
secrets:
24-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
25-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
26-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
23+
secrets: inherit

‎.github/workflows/app.geografiske-kodeverk-service.yml

-25
This file was deleted.

‎.github/workflows/app.helsepersonell-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.inntektsmelding-generator-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ jobs:
1818
permissions:
1919
contents: read
2020
id-token: write
21-
secrets:
22-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
23-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
24-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
25-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
21+
secrets: inherit

‎.github/workflows/app.inntektsmelding-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,4 @@ jobs:
1919
permissions:
2020
contents: read
2121
id-token: write
22-
secrets:
23-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
24-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
25-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
26-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
22+
secrets: inherit

‎.github/workflows/app.jenkins-batch-status-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

‎.github/workflows/app.joark-dokument-service.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ jobs:
2121
permissions:
2222
contents: read
2323
id-token: write
24-
secrets:
25-
NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
26-
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
27-
NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
28-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
24+
secrets: inherit

0 commit comments

Comments
 (0)