Merge pull request #231 from navikt/feature/fjern-beregning-tester

Fjernet tester for beregning ettersom disse ikke lengre er egne nais-…
navikt · Apr 4, 2024 · 7a09d67 · 7a09d67
2 parents de06a6a + 45959b2
commit 7a09d67
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 700 deletions.
diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml
@@ -178,74 +178,6 @@ jobs:
                ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
           cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
 
-  run-tests-for-bidrag-beregn-saertilskudd:
-    runs-on: ubuntu-latest
-    name: bidrag-beregn-saertilskudd
-    needs: [deploy-feature, deploy-main]
-
-    env:
-      INGRESS_BEREGN_SAERTILSKUDD: https://bidrag-beregn-saertilskudd-rest.intern.dev.nav.no
-
-    steps:
-      - name: feature ingresses
-        if: github.ref != 'refs/heads/main'
-        run: |
-          echo "INGRESS_CUCUMBER=https://bidrag-cucumber-cloud-feature.ekstern.dev.nav.no" >> $GITHUB_ENV
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-                -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-saertilskudd-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_SAERTILSKUDD }}@tag:bidrag-beregn-saertilskudd-rest"
-                 ]}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
-
-  run-tests-for-bidrag-beregn-forskudd:
-    runs-on: ubuntu-latest
-    name: bidrag-beregn-forskudd
-    needs: [deploy-feature, deploy-main]
-
-    env:
-      INGRESS_BEREGN_FORSKUDD: https://bidrag-beregn-forskudd-rest.intern.dev.nav.no
-
-    steps:
-      - name: feature ingresses
-        if: github.ref != 'refs/heads/main'
-        run: |
-          echo "INGRESS_CUCUMBER=https://bidrag-cucumber-cloud-feature.ekstern.dev.nav.no" >> $GITHUB_ENV
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-                -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-forskudd-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_FORSKUDD }}@tag:bidrag-beregn-forskudd-rest"
-                 ]}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
-
-  run-tests-for-bidrag-beregn-barnebidrag:
-    runs-on: ubuntu-latest
-    name: bidrag-beregn-barnebidrag
-    needs: [deploy-feature, deploy-main]
-
-    env:
-      INGRESS_BEREGN_BARNEBIDRAG: https://bidrag-beregn-barnebidrag-rest.intern.dev.nav.no
-
-    steps:
-      - name: feature ingresses
-        if: github.ref != 'refs/heads/main'
-        run: |
-          echo "INGRESS_CUCUMBER=https://bidrag-cucumber-cloud-feature.ekstern.dev.nav.no" >> $GITHUB_ENV
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-              -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-barnebidrag-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_BARNEBIDRAG }}@tag:bidrag-beregn-barnebidrag-rest"
-                 ], "testUsername":"z992903"}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
 
   run-tests-for-arbeidsflyt:
     runs-on: ubuntu-latest
@@ -335,9 +267,6 @@ jobs:
       - run-tests-for-bidrag-stonad
       - run-tests-for-bidrag-vedtak
       - run-tests-for-bidrag-grunnlag
-      - run-tests-for-bidrag-beregn-saertilskudd
-      - run-tests-for-bidrag-beregn-forskudd
-      - run-tests-for-bidrag-beregn-barnebidrag
       - run-tests-for-bidrag-dokument-forsendelse
 
     steps:

diff --git a/.github/workflows/run-nightly.yaml b/.github/workflows/run-nightly.yaml
@@ -187,78 +187,6 @@ jobs:
           MELDING: "<https://github.com/navikt/bidrag-cucumber-cloud/actions|Cucumber tests> for tag @arbeidsflyt-opprett-oppgave feilet"
           WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
 
-  run-tests-for-bidrag-beregn-saertilskudd:
-    runs-on: ubuntu-latest
-    name: "bidrag-beregn-saertilskudd"
-
-    env:
-      INGRESS_BEREGN_SAERTILSKUDD: https://bidrag-beregn-saertilskudd-rest.intern.dev.nav.no
-
-    steps:
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-          -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-saertilskudd-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_SAERTILSKUDD }}@tag:bidrag-beregn-saertilskudd-rest"
-                 ]}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
-      - run: |
-          curl -X POST --data-urlencode "payload={\"channel\": \"#team-bidrag-dev\", \"username\": \"webhookbot\", \"text\": \"$MELDING\", \"icon_emoji\": \":boom:\"}" $WEBHOOK_URL
-        if: ${{ failure() }}
-        env:
-          MELDING: "<https://github.com/navikt/bidrag-cucumber-cloud/actions|Cucumber tests> for tag @bidrag-beregn-saertilskudd-rest feilet"
-          WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-
-  run-tests-for-bidrag-beregn-forskudd:
-    runs-on: ubuntu-latest
-    name: "bidrag-beregn-forskudd"
-
-    env:
-      INGRESS_BEREGN_FORSKUDD: https://bidrag-beregn-forskudd-rest.intern.dev.nav.no
-
-    steps:
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-          -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-forskudd-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_FORSKUDD }}@tag:bidrag-beregn-forskudd-rest"
-                 ]}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
-      - run: |
-          curl -X POST --data-urlencode "payload={\"channel\": \"#team-bidrag-dev\", \"username\": \"webhookbot\", \"text\": \"$MELDING\", \"icon_emoji\": \":boom:\"}" $WEBHOOK_URL
-        if: ${{ failure() }}
-        env:
-          MELDING: "<https://github.com/navikt/bidrag-cucumber-cloud/actions|Cucumber tests> for tag @bidrag-beregn-forskudd-rest feilet"
-          WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-
-  run-tests-for-bidrag-beregn-barnebidrag:
-    runs-on: ubuntu-latest
-    name: "bidrag-beregn-barnebidrag"
-
-    env:
-      INGRESS_BEREGN_BARNEBIDRAG: https://bidrag-beregn-barnebidrag-rest.intern.dev.nav.no
-
-    steps:
-      - run: |
-          curl -H "Content-Type: application/json" -i \
-          -H "Authorization: Basic ${{ secrets.BIDRAG_CUCUMBER_CLOUD_AUTH }}" \
-               --request POST \
-               --data '{"noContextPathForApps":["bidrag-beregn-barnebidrag-rest"],"ingressesForApps":[
-                   "${{ env.INGRESS_BEREGN_BARNEBIDRAG }}@tag:bidrag-beregn-barnebidrag-rest"
-                 ]}' \
-               ${{ env.INGRESS_CUCUMBER }}/bidrag-cucumber-cloud/run | tee .cucumber-result
-          cat .cucumber-result | grep HTTP/2 | grep -c 200 > /dev/null # fails if count is 0 (http status is not ok, aka http status code is not 200)
-      - run: |
-          curl -X POST --data-urlencode "payload={\"channel\": \"#team-bidrag-dev\", \"username\": \"webhookbot\", \"text\": \"$MELDING\", \"icon_emoji\": \":boom:\"}" $WEBHOOK_URL
-        if: ${{ failure() }}
-        env:
-          MELDING: "<https://github.com/navikt/bidrag-cucumber-cloud/actions|Cucumber tests> for tag @bidrag-beregn-barnebidrag-rest feilet"
-          WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-
   run-tests-for-bidrag-dokument-forsendelse:
     runs-on: ubuntu-latest
     name: "bidrag-dokument-forsendelse"

diff --git a/.nais/feature.yaml b/.nais/feature.yaml
@@ -12,16 +12,10 @@ access:
     grunnlag: bidrag-grunnlag-feature.intern.dev.nav.no
     vedtak: bidrag-vedtak-feature.intern.dev.nav.no
     stonad: bidrag-stonad-feature.intern.dev.nav.no
-    barnebidrag: bidrag-beregn-barnebidrag.intern.dev.nav.no
-    forskudd: bidrag-beregn-forskudd.intern.dev.nav.no
-    saertilskudd: bidrag-beregn-saertilskudd.intern.dev.nav.no
 kafka-topic-journalpost: bidrag.journalpost-feature
 scope:
   oppgave: dev-fss.oppgavehandtering.oppgave-q1
   sak: dev-fss.bidrag.bidrag-sak-feature
-  beregn_saertilskudd: dev-gcp.bidrag.bidrag-beregn-saertilskudd-rest
-  beregn_forskudd: dev-gcp.bidrag.bidrag-beregn-forskudd-rest
-  beregn_barnebidrag: dev-gcp.bidrag.bidrag-beregn-barnebidrag-rest
   dokument_forsendelse: dev-gcp.bidrag.bidrag-dokument-forsendelse-feature
   bidrag_vedtak: dev-gcp.bidrag.bidrag-vedtak-feature
   bidrag_grunnlag: dev-gcp.bidrag.bidrag-grunnlag-feature

diff --git a/.nais/main.yaml b/.nais/main.yaml
@@ -12,16 +12,10 @@ access:
     grunnlag: bidrag-grunnlag.intern.dev.nav.no
     vedtak: bidrag-vedtak.intern.dev.nav.no
     stonad: bidrag-stonad.intern.dev.nav.no
-    barnebidrag: bidrag-beregn-barnebidrag.intern.dev.nav.no
-    forskudd: bidrag-beregn-forskudd.intern.dev.nav.no
-    saertilskudd: bidrag-beregn-saertilskudd.intern.dev.nav.no
 kafka-topic-journalpost: bidrag.journalpost
 scope:
   oppgave: dev-fss.oppgavehandtering.oppgave
   sak: dev-fss.bidrag.bidrag-sak
-  beregn_saertilskudd: dev-gcp.bidrag.bidrag-beregn-saertilskudd-rest
-  beregn_forskudd: dev-gcp.bidrag.bidrag-beregn-forskudd-rest
-  beregn_barnebidrag: dev-gcp.bidrag.bidrag-beregn-barnebidrag-rest
   dokument_forsendelse: dev-gcp.bidrag.bidrag-dokument-forsendelse
   bidrag_vedtak: dev-gcp.bidrag.bidrag-vedtak
   bidrag_grunnlag: dev-gcp.bidrag.bidrag-grunnlag

diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -21,9 +21,6 @@ spec:
           - host: {{ access.outbound.grunnlag }}
           - host: {{ access.outbound.vedtak }}
           - host: {{ access.outbound.stonad }}
-          - host: {{ access.outbound.barnebidrag }}
-          - host: {{ access.outbound.forskudd }}
-          - host: {{ access.outbound.saertilskudd }}
   envFrom:
     - secret: test-auth-z992903
     - secret: bidrag-cucumber-cloud-secrets
@@ -61,12 +58,6 @@ spec:
       value: {{ scope.oppgave }}
     - name: SAK_SCOPE
       value: {{ scope.sak }}
-    - name: BEREGN_SAERTILSKUDD_SCOPE
-      value: {{ scope.beregn_saertilskudd }}
-    - name: BEREGN_FORSKUDD_SCOPE
-      value: {{ scope.beregn_forskudd }}
-    - name: BEREGN_BARNEBIDRAG_SCOPE
-      value: {{ scope.beregn_barnebidrag }}
     - name: DOKUMENT_FORSENDELSE_SCOPE
       value: {{ scope.dokument_forsendelse }}
     - name: BIDRAG_DOKUMENT_SCOPE

diff --git a/src/main/kotlin/no/nav/bidrag/cucumber/cloud/beregn/BeregnEgenskaper.kt b/src/main/kotlin/no/nav/bidrag/cucumber/cloud/beregn/BeregnEgenskaper.kt
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -17,9 +17,6 @@ testbrukere:
 appscope.clients:
   oppgave: api://${OPPGAVE_SCOPE}/.default
   bidrag-sak: api://${SAK_SCOPE}/.default
-  bidrag-beregn-saertilskudd-rest: api://${BEREGN_SAERTILSKUDD_SCOPE}/.default
-  bidrag-beregn-forskudd-rest: api://${BEREGN_FORSKUDD_SCOPE}/.default
-  bidrag-beregn-barnebidrag-rest: api://${BEREGN_BARNEBIDRAG_SCOPE}/.default
   bidrag-dokument-forsendelse: api://${DOKUMENT_FORSENDELSE_SCOPE}/.default
   bidrag-dokument: api://${BIDRAG_DOKUMENT_SCOPE}/.default
   bidrag-vedtak: api://${BIDRAG_VEDTAK_SCOPE}/.default

diff --git a/src/main/resources/no/nav/bidrag/cucumber/cloud/beregn/barnebidrag/barnebidrag.feature b/src/main/resources/no/nav/bidrag/cucumber/cloud/beregn/barnebidrag/barnebidrag.feature