Merge branch 'master' into budpro

navikt · Oct 6, 2023 · 4d4726f · 4d4726f
2 parents 56ca8d7 + cfa5546
commit 4d4726f
Show file tree

Hide file tree

Showing 258 changed files with 15,652 additions and 7,719 deletions.
diff --git a/.github/workflows/app.organisasjon-tilgang-frontend-prod.yml b/.github/workflows/app.organisasjon-tilgang-frontend-prod.yml
diff --git a/.github/workflows/app.organisasjon-tilgang-service-prod.yml b/.github/workflows/app.organisasjon-tilgang-service-prod.yml
diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml
@@ -13,7 +13,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "apps/organisasjon-tilgang-service"
-      deploy-tag: "#deploy-test-organisasjon-tilgang-service"
+      deploy-tag: "#deploy-organisasjon-tilgang-service"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/common.js.build.yml b/.github/workflows/common.js.build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      id-token: write
+      packages: write
     steps:
       - uses: actions/checkout@v3
       - name: 'Setup Node'

diff --git a/.github/workflows/common.js.publish.yml b/.github/workflows/common.js.publish.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     permissions:
       contents: write
-      id-token: write
+      packages: write
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
@@ -31,22 +31,6 @@ jobs:
       - name: Build
         run: npm run build
         working-directory: ${{ inputs.working-directory }}
-      - name: Bump version
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name $GITHUB_ACTOR
-          COMMIT_MESSAGE=`git log -1 --pretty=%B`
-          npm version patch
-          git add package.json && git add package-lock.json
-          PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')
-          git commit -m "Bump to version $PACKAGE_VERSION, $COMMIT_MESSAGE, [skip ci]"
-          git tag $PACKAGE_VERSION
-        working-directory: ${{ inputs.working-directory }}
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
       - name: Deploy to GPR
         run: npm publish
         working-directory: ${{ inputs.working-directory }}

diff --git a/.github/workflows/lib.frontend.dolly-assets.yml b/.github/workflows/lib.frontend.dolly-assets.yml
@@ -11,16 +11,16 @@ jobs:
     name: Build
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-assets/'
   publish:
     name: Publish
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:
-      working-directory: 'navikt/dolly-assets/'
+      working-directory: 'navikt/dolly-assets/'
diff --git a/.github/workflows/lib.frontend.dolly-komponenter.yml b/.github/workflows/lib.frontend.dolly-komponenter.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-komponenter/'
@@ -21,10 +21,10 @@ jobs:
     name: Publish
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:
       working-directory: 'navikt/dolly-komponenter/'
     secrets:
-      READER_TOKEN: ${{ secrets.READER_TOKEN }}
+      READER_TOKEN: ${{ secrets.READER_TOKEN }}
diff --git a/.github/workflows/lib.frontend.dolly-lib.yml b/.github/workflows/lib.frontend.dolly-lib.yml
@@ -11,16 +11,16 @@ jobs:
     name: Build
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.build.yml
     with:
       working-directory: 'navikt/dolly-lib/'
   publish:
     name: Publish
     permissions:
       contents: write
-      id-token: write
+      packages: write
     uses: ./.github/workflows/common.js.publish.yml
     if: ${{ github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '#publish-libs') }}
     with:
-      working-directory: 'navikt/dolly-lib/'
+      working-directory: 'navikt/dolly-lib/'
diff --git a/.nais/alerting-dolly.yml b/.nais/alerting-dolly.yml
@@ -6,10 +6,6 @@ metadata:
   labels:
     team: dolly
 spec:
-  receivers:
-    slack:
-      channel: "#dolly-alerts"
-      icon_emoji: ':dolly-panic:'
   groups:
     - name: dolly-alerts
       rules:
@@ -20,47 +16,51 @@ spec:
           annotations:
             summary: 'Applikasjonen *{{ $labels.deployment }}* har hatt 0 replicas i >5min og er ikke tilgjengelig.'
             action: |
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-replicas-unavailable%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.deployment }}`
               Logger: `kubectl logs -l app={{ $labels.deployment }}`
-            labels:
-              namespace: 'dolly'
-              severity: 'critical'
+          labels:
+            namespace: 'dolly'
+            severity: 'critical'
 
         - alert: 'dolly-log-errors'
           expr: 'sum by (app,namespace) (increase(log_messages_errors{namespace="dolly",level="Error"}[15m]) > 1)'
           for: 1m
           annotations:
             summary: 'Applikasjonen *{{ $labels.app }}* har hatt mer enn 1 ERRORs i loggen i løpet av de siste 15 minuttene.'
             action: |
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-log-errors%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
-            labels:
-              namespace: 'dolly'
-              severity: 'warning'
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
+          labels:
+            namespace: 'dolly'
+            severity: 'warning'
 
         - alert: 'dolly-server-http-5xx'
           expr: 'sum by (app,namespace) (increase(http_server_requests_seconds_count{namespace="dolly",status=~"^5.."}[15m]) > 5)'
           for: 1m
           annotations:
             summary: 'Applikasjonen *{{ $labels.app }}* har gitt mer enn 5 HTTP 5xx-responser i løpet av de siste 15 minuttene.'
             action: |
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-server-http-5xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
-            labels:
-              namespace: 'dolly'
-              severity: 'warning'
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
+          labels:
+            namespace: 'dolly'
+            severity: 'warning'
 
         - alert: 'dolly-client-http-4xx'
           expr: 'sum by (app,namespace) (increase(http_client_requests_seconds_count{namespace="dolly",status=~"^4.."}[15m]) > 5)'
           for: 1m
           annotations:
             summary: 'Applikasjonen *{{ $labels.app }}* har fått mer enn 5 HTTP 4xx-responser i løpet av de siste 15 minuttene.'
             action: |
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-client-http-4xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
-            labels:
-              namespace: 'dolly'
-              severity: 'warning'
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
+          labels:
+            namespace: 'dolly'
+            severity: 'warning'
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -33,14 +33,12 @@ spec:
           cluster: dev-gcp
     outbound:
       rules:
-        - application: generer-navn-service
         - application: testnav-amelding-service
         - application: testnav-arbeidsforhold-service
         - application: testnav-inntektsmelding-service
         - application: testnav-miljoer-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-service
         - application: testnav-synt-sykemelding-api
@@ -64,7 +62,6 @@ spec:
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
-        - host: testnav-statisk-data-forvalter-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
   webproxy: true

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -40,15 +40,12 @@ spec:
           namespace: navdig
     outbound:
       rules:
-        - application: generer-navn-service
         - application: testnav-amelding-service
         - application: testnav-arbeidsforhold-service
         - application: testnav-inntektsmelding-service
         - application: testnav-miljoer-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
-          cluster: prod-gcp
         - application: testnav-pdl-forvalter
         - application: testnav-person-service
         - application: testnav-synt-sykemelding-api
@@ -72,7 +69,6 @@ spec:
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
-        - host: testnav-statisk-data-forvalter-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
   webproxy: true

diff --git a/...kend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVConsumer.java b/...kend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVConsumer.java
@@ -4,7 +4,6 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.ConsumerStatus;
 import no.nav.dolly.bestilling.arbeidsplassencv.command.ArbeidsplassenDeleteCVCommand;
-import no.nav.dolly.bestilling.arbeidsplassencv.command.ArbeidsplassenGetCVCommand;
 import no.nav.dolly.bestilling.arbeidsplassencv.command.ArbeidsplassenGodtaHjemmelCommand;
 import no.nav.dolly.bestilling.arbeidsplassencv.command.ArbeidsplassenGodtaVilkaarCommand;
 import no.nav.dolly.bestilling.arbeidsplassencv.command.ArbeidsplassenPostPersonCommand;
@@ -48,14 +47,6 @@ public ArbeidsplassenCVConsumer(
                 .build();
     }
 
-    @Timed(name = "providers", tags = { "operation", "arbeidsplassen_getCV" })
-    public Flux<ArbeidsplassenCVStatusDTO> hentCV(String ident, String uuid) {
-
-        return tokenService.exchange(serviceProperties)
-                .flatMapMany(token -> new ArbeidsplassenGetCVCommand(webClient, ident, uuid, token.getTokenValue()).call())
-                .doOnNext(resultat -> log.info("Hentet CV for ident {} {}", ident, resultat));
-    }
-
     @Timed(name = "providers", tags = { "operation", "arbeidsplassen_oppdaterCV" })
     public Flux<ArbeidsplassenCVStatusDTO> oppdaterCV(String ident, PAMCVDTO arbeidsplassenCV, String uuid) {
 

diff --git a/...ain/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenGetCVCommand.java b/...ain/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenGetCVCommand.java