Merge branch 'main' into feat/ehic-new-client

.envrc

@@ -19,4 +19,6 @@ fi
 
 # Podman compatibility
 # NOTE: Exits direnv if user is using docker.
-source_env_if_exists .env.podman
+source_env_if_exists .envrc.podman
+
+source_env_if_exists .envrc.kube

.envrc.kube

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+for c in kubectx kubectl aws; do
+  if ! command -v "$c" >/dev/null; then
+    echo "$c not installed"
+    return
+  fi
+done
+
+set-kubectx() {
+  : "${AWS_PROFILE:=}"
+  if kubectx | grep -q "${AWS_PROFILE##islandis-}"; then
+    return
+  fi
+  echo "Setting kube context..." >&2
+  AWS_ACCOUNT_ID="$(aws sts get-caller-identity | jq -r '.Account')"
+  kubectx "$(kubectx | grep "${AWS_ACCOUNT_ID}")"
+  CLUSTER="$(kubectl config current-context | sed 's/.*\///')"
+  export CLUSTER
+}
+
+set-kubectx

.env.podman → .envrc.podman

@@ -6,15 +6,15 @@ set -euo pipefail
 if [[ -n "${DOCKER_HOST:-}" ]] ||
   command -v docker >/dev/null &&
   ! (docker --version | grep -i podman); then
-  exit 0
+  return 0
 fi
 
 echo "🐳 Using podman"
 
 SOCKET_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
 if [[ -S /run/podman/podman.sock ]]; then
   SOCKET_DIR="/run/podman"
-  exit 0
+  return 0
 fi
 
 export DOCKER_HOST=unix://$SOCKET_DIR/podman/podman.sock

.gitignore

@@ -29,8 +29,7 @@ TODO
 *.todo
 .env
 .env.*
-!.env.podman
-.envrc.*
+.envrc.private
 .nvmrc
 .node-version
 # IDE - VSCode

apps/air-discount-scheme/api/infra/api.ts

@@ -50,11 +50,6 @@ export const serviceSetup = (services: {
           staging: ['loftbru', 'loftbru-cf'],
           prod: ['loftbru'],
         },
-        extraAnnotations: {
-          dev: {},
-          staging: {},
-          prod: {},
-        },
         paths: ['/api/graphql'],
         public: true,
       },

apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts

@@ -50,8 +50,12 @@ export const serviceSetup = (): ServiceBuilder<'air-discount-scheme-backend'> =>
           prod: 'loftbru',
         },
         extraAnnotations: {
-          dev: {},
-          staging: {},
+          dev: {
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
+          },
+          staging: {
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
+          },
           prod: {},
         },
         paths: ['/api/swagger', '/api/public'],

apps/air-discount-scheme/web/infra/web.ts

@@ -60,6 +60,7 @@ export const serviceSetup = (services: {
           prod: {
             'nginx.ingress.kubernetes.io/proxy-buffering': 'on',
             'nginx.ingress.kubernetes.io/proxy-buffer-size': '8k',
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
             'nginx.ingress.kubernetes.io/configuration-snippet':
               'rewrite /$ https://island.is/loftbru; rewrite /en$ https://island.is/en/lower-airfares-for-residents-in-rural-areas;',
           },

apps/api/infra/api.ts

@@ -450,11 +450,6 @@ export const serviceSetup = (services: {
           prod: ['', 'www.island.is'],
         },
         paths: ['/api'],
-        extraAnnotations: {
-          dev: {},
-          staging: {},
-          prod: {},
-        },
         public: true,
       },
     })

apps/application-system/api/src/app/app.module.ts

@@ -60,6 +60,7 @@ import { FriggClientConfig } from '@island.is/clients/mms/frigg'
 import { smsModuleConfig } from '@island.is/nova-sms'
 import { emailModuleConfig } from '@island.is/email-service'
 import { sharedModuleConfig } from '@island.is/application/template-api-modules'
+import { UserNotificationClientConfig } from '@island.is/clients/user-notification'
 
 @Module({
   imports: [
@@ -119,6 +120,7 @@ import { sharedModuleConfig } from '@island.is/application/template-api-modules'
         smsModuleConfig,
         emailModuleConfig,
         sharedModuleConfig,
+        UserNotificationClientConfig,
       ],
     }),
   ],

apps/consultation-portal/screens/Case/Case.json

@@ -67,7 +67,7 @@
       "failure": "Ekki tókst á afskrá áskrift fyrir mál"
     },
     "loginCardSkeleton": {
-      "text": "Þú þarft að skrá þig inn á island.is til þess að geta skráð þig í eða úr áskrift.",
+      "text": "Þú þarft að skrá þig inn á Island.is til þess að geta skráð þig í eða úr áskrift.",
       "button": "Skrá mig inn"
     },
     "setEmailCardSkeleton": {

apps/contentful-apps/infra/contentful-apps.ts

@@ -12,11 +12,6 @@ export const serviceSetup = (): ServiceBuilder<'contentful-apps'> =>
           prod: 'contentful-apps',
         },
         paths: ['/'],
-        extraAnnotations: {
-          dev: {},
-          staging: {},
-          prod: {},
-        },
       },
     })
     .replicaCount({

apps/download-service/infra/download-service.ts

@@ -64,11 +64,6 @@ export const serviceSetup = (services: {
           prod: ['api'],
         },
         paths: ['/download'],
-        extraAnnotations: {
-          dev: {},
-          staging: {},
-          prod: {},
-        },
         public: true,
       },
     })

apps/github-actions-cache/infra/github-actions-cache.ts

@@ -23,8 +23,6 @@ export const serviceSetup = (): ServiceBuilder<'github-actions-cache'> => {
           dev: {
             'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
           },
-          staging: {},
-          prod: {},
         },
         public: true,
       },

apps/judicial-system/api/src/app/modules/auth/auth.controller.ts

@@ -256,16 +256,16 @@ export class AuthController {
             ? PRISON_CASES_ROUTE
             : CASES_ROUTE,
       }
-    } else {
-      const defender = await this.authService.findDefender(authUser.nationalId)
-
-      if (defender) {
-        return {
-          userId: defender.id,
-          userNationalId: defender.nationalId,
-          jwtToken: this.sharedAuthService.signJwt(defender, csrfToken),
-          redirectRoute: requestedRedirectRoute ?? DEFENDER_CASES_ROUTE,
-        }
+    }
+
+    const defender = await this.authService.findDefender(authUser.nationalId)
+
+    if (defender) {
+      return {
+        userId: defender.id,
+        userNationalId: defender.nationalId,
+        jwtToken: this.sharedAuthService.signJwt(defender, csrfToken),
+        redirectRoute: requestedRedirectRoute ?? DEFENDER_CASES_ROUTE,
       }
     }
 

apps/judicial-system/backend/migrations/20241015105921-update-notification.js

@@ -0,0 +1,70 @@
+'use strict'
+const replaceEnum = require('sequelize-replace-enum-postgres').default
+
+module.exports = {
+  up: (queryInterface) => {
+    // replaceEnum does not support transactions
+    return replaceEnum({
+      queryInterface,
+      tableName: 'notification',
+      columnName: 'type',
+      newValues: [
+        'HEADS_UP',
+        'READY_FOR_COURT',
+        'RECEIVED_BY_COURT',
+        'COURT_DATE',
+        'RULING',
+        'MODIFIED',
+        'REVOKED',
+        'DEFENDER_ASSIGNED',
+        'ADVOCATE_ASSIGNED',
+        'DEFENDANTS_NOT_UPDATED_AT_COURT',
+        'APPEAL_TO_COURT_OF_APPEALS',
+        'APPEAL_RECEIVED_BY_COURT',
+        'APPEAL_STATEMENT',
+        'APPEAL_COMPLETED',
+        'APPEAL_JUDGES_ASSIGNED',
+        'APPEAL_CASE_FILES_UPDATED',
+        'APPEAL_WITHDRAWN',
+        'INDICTMENT_DENIED',
+        'INDICTMENT_RETURNED',
+        'INDICTMENTS_WAITING_FOR_CONFIRMATION',
+        'SERVICE_SUCCESSFUL', // New value
+        'SERVICE_FAILED', // New value
+        'DEFENDANT_SELECTED_DEFENDER', // New value
+      ],
+      enumName: 'enum_notification_type',
+    })
+  },
+
+  down: (queryInterface) => {
+    // replaceEnum does not support transactions
+    return replaceEnum({
+      queryInterface,
+      tableName: 'notification',
+      columnName: 'type',
+      newValues: [
+        'HEADS_UP',
+        'READY_FOR_COURT',
+        'RECEIVED_BY_COURT',
+        'COURT_DATE',
+        'RULING',
+        'MODIFIED',
+        'REVOKED',
+        'DEFENDER_ASSIGNED',
+        'DEFENDANTS_NOT_UPDATED_AT_COURT',
+        'APPEAL_TO_COURT_OF_APPEALS',
+        'APPEAL_RECEIVED_BY_COURT',
+        'APPEAL_STATEMENT',
+        'APPEAL_COMPLETED',
+        'APPEAL_JUDGES_ASSIGNED',
+        'APPEAL_CASE_FILES_UPDATED',
+        'APPEAL_WITHDRAWN',
+        'INDICTMENT_DENIED',
+        'INDICTMENT_RETURNED',
+        'INDICTMENTS_WAITING_FOR_CONFIRMATION',
+      ],
+      enumName: 'enum_notification_type',
+    })
+  },
+}