Tidy up

.github/workflows/build-and-deploy.yml

@@ -96,5 +96,5 @@ jobs:
         env:
           CLUSTER: ${{ needs.docker-build.outputs.nais_cluster }}
           RESOURCE: ${{ needs.docker-build.outputs.nais_config_path }}
-          VAR: image=${{ env.DOCKER_IMAGE }}
+          WORKLOAD_IMAGE: ${{ env.DOCKER_IMAGE }}
           DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443

.github/workflows/run-tests.yml

@@ -3,11 +3,17 @@ name: Run tests
 
 on:
   push:
-    paths-ignore:
-      - README.md
+    paths:
+      - src
+      - gradle/libs.versions.toml
+      - build.gradle.kts
+      - .github/workflows/run-tests.yml
+permissions:
+  contents: "read"
 
 jobs:
-  build-branch:
+  run-tests:
+    name: Run tests
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
@@ -34,11 +40,33 @@ jobs:
       - name: Build and test project
         run: >
           ./gradlew
-          check
+          test
           jacocoTestReport
           --daemon --parallel --build-cache
-        env:
-          KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
+
+  check-format-and-code-quality:
+    name: Check format and code quality
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          java-version: 21
+          distribution: 'zulu'
+
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Check format
+        run: >
+          ./gradlew
+          ktlintCheck
+          --daemon --parallel --build-cache
 
       - name: SonarQube Cloud Scan
         env:

.nais/prod/nais.yaml

@@ -7,27 +7,18 @@ metadata:
   labels:
     team: dapla-metadata
 spec:
-  image: "{{ image }}"  # Injected from the GitHub Action
   port: 8080
 
-  ingresses:
-    - https://vardef.intern.ssb.no
-
   accessPolicy:
     inbound:
       rules:
         - application: metadata-api-gateway
-    outbound:
-      rules:
-        - application: dapla-team-api
-          namespace: dapla-platform
       external:
         # Allow egress to Klass
         - host: data.ssb.no
         # Allow egress to Vardok
         - host: ssb.no
         - host: www.ssb.no
-        # Allow egress to auth
         - host: dapla-api.ssb.no
         # Allow egress to mongodb
         - host: metadata-prod-shard-00-01.9txq8.mongodb.net

.nais/test/nais.yaml

@@ -7,27 +7,18 @@ metadata:
   labels:
     team: dapla-metadata
 spec:
-  image: "{{ image }}"  # Injected from the GitHub Action
   port: 8080
 
-  ingresses:
-    - https://vardef.intern.test.ssb.no
-
   accessPolicy:
     inbound:
       rules:
         - application: metadata-api-gateway
-    outbound:
-      rules:
-        - application: dapla-team-api
-          namespace: dapla-platform
       external:
         # Allow egress to Klass
         - host: data.ssb.no
         # Allow egress to Vardok
         - host: ssb.no
         - host: www.ssb.no
-        # Allow egress to auth
         - host: dapla-api.ssb.no
         # Allow egress to mongodb
         - host: metadata-test-shard-00-01.fuld2.mongodb.net