diff --git a/.github/workflows/smtp-transport-deploy-dev.yaml b/.github/workflows/smtp-transport-deploy-dev.yaml index 2825fe0..1139db9 100644 --- a/.github/workflows/smtp-transport-deploy-dev.yaml +++ b/.github/workflows/smtp-transport-deploy-dev.yaml @@ -7,6 +7,8 @@ on: - dev/** paths: - smtp-transport/** + - .nais/smtp-transport-dev.yaml + - .github/workflows/smtp-transport-deploy-dev.yaml env: MODULE_NAME: "smtp-transport" @@ -69,15 +71,6 @@ jobs: id-token: write steps: - uses: "actions/checkout@v4" - - - name: "Deploy secret to DEV" - uses: "nais/deploy/actions/deploy@v2" - env: - "APIKEY": "${{ secrets.NAIS_DEPLOY_APIKEY }}" - "CLUSTER": "dev-fss" - "RESOURCE": ".nais/smtp-router-secrets.yaml" - "VAR": "smtpPassword=${{ secrets.SMTP_PASSWORD }}" - - name: "Deploy to DEV" uses: "nais/deploy/actions/deploy@v2" env: diff --git a/.nais/smtp-router-secrets.yaml b/.nais/smtp-router-secrets.yaml deleted file mode 100644 index 402c250..0000000 --- a/.nais/smtp-router-secrets.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -type: kubernetes.io/Opaque -metadata: - name: smtp-router-secrets - namespace: team-emottak - labels: - team: team-emottak -stringData: - SMTP_PASSWORD: {{smtpPassword}} diff --git a/.nais/smtp-transport-dev.yaml b/.nais/smtp-transport-dev.yaml index b5b871a..ceea966 100644 --- a/.nais/smtp-transport-dev.yaml +++ b/.nais/smtp-transport-dev.yaml @@ -37,7 +37,7 @@ spec: ingresses: - "https://smtp-transport.intern.dev.nav.no" envFrom: - - secret: smtp-router-secrets + - secret: smtp-transport-secrets env: - name: SMTP_POP3_FACTORY_PORT value: "110" diff --git a/ebms-send-in/src/test/kotlin/no/nav/emottak/PasientlisteServiceTest.kt b/ebms-send-in/src/test/kotlin/no/nav/emottak/PasientlisteServiceTest.kt index 20d19a5..53882d1 100644 --- a/ebms-send-in/src/test/kotlin/no/nav/emottak/PasientlisteServiceTest.kt +++ b/ebms-send-in/src/test/kotlin/no/nav/emottak/PasientlisteServiceTest.kt @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test class PasientlisteServiceTest { - @Test fun `Should throw exception if SSN from certificate does not match SSN from message`() { val sendIndRequest = validSendInRequest.value