From af06d3db3bbdb61e9ce4a62a3aea409df4dd7844 Mon Sep 17 00:00:00 2001
From: Miles Mason Winther <42948872+mmwinther@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:32:02 +0100
Subject: [PATCH] Switch Mabl workspace (#437)

* Remove nais deploy key

This repository is trusted by nais so we don't
need the key anymore.

* Give GHA id-token permission

* Use ssb.no domain name
---
 .github/workflows/integration-test.yml | 6 ++++--
 .nais/test-pr.yaml                     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 9eb11d4f..aba4406d 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -77,11 +77,13 @@ jobs:
     name: Deploy to NAIS
     runs-on: ubuntu-latest
     needs: docker-build
+    permissions:
+      contents: "read"
+      id-token: "write"
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: test
           RESOURCE: .nais/test-pr.yaml
           VAR: image=${{ needs.docker-build.outputs.image-tag }},pr-number=${{github.event.number}}
@@ -102,6 +104,6 @@ jobs:
         with:
           application-id: ${{ secrets.DATADOC_MABL_APPLICATION_ID }}
           environment-id: ${{ secrets.DATADOC_MABL_ENVIRONMENT_ID }}
-          uri: https://datadoc-pr-${{github.event.number}}.external.test.ssb.cloud.nais.io
+          uri: https://datadoc-pr-${{github.event.number}}.test.ssb.no
           mabl-branch: ${{ github.head_ref }}
           plan-labels: Datadoc
diff --git a/.nais/test-pr.yaml b/.nais/test-pr.yaml
index 6ff61414..79899a39 100644
--- a/.nais/test-pr.yaml
+++ b/.nais/test-pr.yaml
@@ -34,7 +34,7 @@ spec:
     enabled: false
 
   ingresses:
-    - https://datadoc-pr-{{ pr-number }}.external.test.ssb.cloud.nais.io
+    - https://datadoc-pr-{{ pr-number }}.test.ssb.no
 
   filesFrom:
     - configmap: integration-test-dataset