Merge branch 'main' into fix/document-pdf-rendering

island-is · Oct 18, 2024 · 5315d15 · 5315d15
2 parents bb1227c + de4f7a0
commit 5315d15
Show file tree

Hide file tree

Showing 266 changed files with 7,407 additions and 3,566 deletions.
diff --git a/apps/air-discount-scheme/api/infra/api.ts b/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,
       },

diff --git a/apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts b/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'],

diff --git a/apps/air-discount-scheme/web/infra/web.ts b/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;',
           },

diff --git a/apps/api/infra/api.ts b/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,
       },
     })

diff --git a/apps/consultation-portal/screens/Case/Case.json b/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": {

diff --git a/apps/contentful-apps/infra/contentful-apps.ts b/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({

diff --git a/apps/download-service/infra/download-service.ts b/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,
       },
     })

diff --git a/apps/financial-aid/web-veita/src/components/AidAmountModal/AidAmountModal.tsx b/apps/financial-aid/web-veita/src/components/AidAmountModal/AidAmountModal.tsx
@@ -22,7 +22,7 @@ const AidAmountModal = ({
   onVisibilityChange,
   calculations,
 }: Props) => {
-  const closeModal = (): void => {
+  const closeModal = () => {
     onVisibilityChange(false)
   }
 

diff --git a/apps/financial-aid/web-veita/src/components/Profile/ApplicationProfile.tsx b/apps/financial-aid/web-veita/src/components/Profile/ApplicationProfile.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useContext } from 'react'
+import React, { useState, useMemo } from 'react'
 import cn from 'classnames'
 import format from 'date-fns/format'
 

diff --git a/apps/github-actions-cache/infra/github-actions-cache.ts b/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,
       },

diff --git a/apps/services/auth/admin-api/src/app/v2/delegations/test/delegation-admin.spec.ts b/apps/services/auth/admin-api/src/app/v2/delegations/test/delegation-admin.spec.ts
@@ -25,6 +25,7 @@ import { getModelToken } from '@nestjs/sequelize'
 import { faker } from '@island.is/shared/mocking'
 import { TicketStatus, ZendeskService } from '@island.is/clients/zendesk'
 import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
+import { ErrorCodes } from '@island.is/shared/utils'
 
 const currentUser = createCurrentUser({
   scope: [DelegationAdminScopes.read, DelegationAdminScopes.admin],
@@ -339,6 +340,85 @@ describe('DelegationAdmin - With authentication', () => {
       expect(res.status).toEqual(400)
     })
 
+    it('POST /delegation-admin should not create delegation since it already exists', async () => {
+      // Arrange
+      const { toNationalId, fromNationalId } = {
+        toNationalId: '0101302399',
+        fromNationalId: '0101307789',
+      }
+
+      mockZendeskService(toNationalId, fromNationalId)
+
+      const existingDelegation = await factory.createCustomDelegation({
+        fromNationalId,
+        toNationalId,
+        domainName: null,
+        scopes: [{ scopeName: 's1' }],
+        referenceId: 'ref1',
+      })
+
+      const delegation: CreatePaperDelegationDto = {
+        toNationalId: existingDelegation.toNationalId,
+        fromNationalId: existingDelegation.fromNationalId,
+        referenceId: 'ref2',
+      }
+
+      // Act
+      const res = await getRequestMethod(
+        server,
+        'POST',
+      )('/delegation-admin').send(delegation)
+
+      // Assert
+      expect(res.status).toEqual(400)
+      expect(res.body).toMatchObject({
+        status: 400,
+        type: 'https://httpstatuses.org/400',
+        title: ErrorCodes.COULD_NOT_CREATE_DELEGATION,
+        detail: 'Could not create delegation',
+      })
+    })
+
+    it('POST /delegation-admin should not create delegation since the delegation id already exists', async () => {
+      // Arrange
+      const { toNationalId, fromNationalId } = {
+        toNationalId: '0101302399',
+        fromNationalId: '0101307789',
+      }
+
+      mockZendeskService(fromNationalId, toNationalId)
+
+      const existingDelegation = await factory.createCustomDelegation({
+        fromNationalId,
+        toNationalId,
+        domainName: null,
+        scopes: [{ scopeName: 's1' }],
+        referenceId: 'ref1',
+      })
+
+      // Send in opposite national ids so they will not exist in db
+      const delegation: CreatePaperDelegationDto = {
+        toNationalId: existingDelegation.fromNationalId,
+        fromNationalId: existingDelegation.toNationalId,
+        referenceId: 'ref1',
+      }
+
+      // Act
+      const res = await getRequestMethod(
+        server,
+        'POST',
+      )('/delegation-admin').send(delegation)
+
+      // Assert
+      expect(res.status).toEqual(400)
+      expect(res.body).toMatchObject({
+        status: 400,
+        type: 'https://httpstatuses.org/400',
+        title: ErrorCodes.REFERENCE_ID_ALREADY_EXISTS,
+        detail: 'Delegation with the same reference id already exists',
+      })
+    })
+
     it('POST /delegation-admin should not create delegation with incorrect zendesk ticket status', async () => {
       // Arrange
       mockZendeskService(toNationalId, fromNationalId, {

diff --git a/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts b/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts
@@ -20,11 +20,6 @@ export const serviceSetup =
             prod: 'contentful-entry-tagger-service.devland.is',
           },
           paths: ['/'],
-          extraAnnotations: {
-            dev: {},
-            staging: {},
-            prod: {},
-          },
         },
       })
       .liveness('/liveness')

diff --git a/apps/services/license-api/infra/license-api.ts b/apps/services/license-api/infra/license-api.ts
@@ -78,11 +78,6 @@ export const serviceSetup = (): ServiceBuilder<'license-api'> =>
         },
         paths: ['/'],
         public: false,
-        extraAnnotations: {
-          dev: {},
-          staging: {},
-          prod: {},
-        },
       },
     })
     .replicaCount({

diff --git a/apps/services/search-indexer/infra/search-indexer-service.ts b/apps/services/search-indexer/infra/search-indexer-service.ts
@@ -121,8 +121,12 @@ export const serviceSetup = (): ServiceBuilder<'search-indexer-service'> =>
         },
         paths: ['/'],
         extraAnnotations: {
-          dev: {},
-          staging: {},
+          dev: {
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
+          },
+          staging: {
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
+          },
           prod: {},
         },
       },

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -637,6 +637,8 @@ PensionCalculatorResults.getProps = async ({
         input: calculationInput,
       },
     }),
+    calculationInput.typeOfBasePension ===
+      SocialInsurancePensionCalculationBasePensionType.Disability &&
     is2025PreviewActive(customPageData)
       ? apolloClient.query<Query, QueryGetPensionCalculationArgs>({
           query: GET_PENSION_CALCULATION,
@@ -645,6 +647,8 @@ PensionCalculatorResults.getProps = async ({
               ...calculationInput,
               startYear: 2025,
               startMonth: 9,
+              typeOfBasePension:
+                SocialInsurancePensionCalculationBasePensionType.NewSystem,
             },
           },
         })

diff --git a/charts/islandis/values.dev.yaml b/charts/islandis/values.dev.yaml
@@ -130,6 +130,7 @@ air-discount-scheme-backend:
     primary-alb:
       annotations:
         kubernetes.io/ingress.class: 'nginx-external-alb'
+        nginx.ingress.kubernetes.io/enable-global-auth: 'false'
         nginx.ingress.kubernetes.io/service-upstream: 'true'
       hosts:
         - host: 'loftbru.dev01.devland.is'
@@ -1987,6 +1988,7 @@ search-indexer-service:
     primary-alb:
       annotations:
         kubernetes.io/ingress.class: 'nginx-external-alb'
+        nginx.ingress.kubernetes.io/enable-global-auth: 'false'
         nginx.ingress.kubernetes.io/service-upstream: 'true'
       hosts:
         - host: 'search-indexer-service.dev01.devland.is'

diff --git a/charts/islandis/values.prod.yaml b/charts/islandis/values.prod.yaml
@@ -222,6 +222,7 @@ air-discount-scheme-web:
       annotations:
         kubernetes.io/ingress.class: 'nginx-external-alb'
         nginx.ingress.kubernetes.io/configuration-snippet: 'rewrite /$ https://island.is/loftbru; rewrite /en$ https://island.is/en/lower-airfares-for-residents-in-rural-areas;'
+        nginx.ingress.kubernetes.io/enable-global-auth: 'false'
         nginx.ingress.kubernetes.io/proxy-buffer-size: '8k'
         nginx.ingress.kubernetes.io/proxy-buffering: 'on'
         nginx.ingress.kubernetes.io/service-upstream: 'true'

diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
@@ -130,6 +130,7 @@ air-discount-scheme-backend:
     primary-alb:
       annotations:
         kubernetes.io/ingress.class: 'nginx-external-alb'
+        nginx.ingress.kubernetes.io/enable-global-auth: 'false'
         nginx.ingress.kubernetes.io/service-upstream: 'true'
       hosts:
         - host: 'loftbru.staging01.devland.is'
@@ -1725,6 +1726,7 @@ search-indexer-service:
     primary-alb:
       annotations:
         kubernetes.io/ingress.class: 'nginx-external-alb'
+        nginx.ingress.kubernetes.io/enable-global-auth: 'false'
         nginx.ingress.kubernetes.io/service-upstream: 'true'
       hosts:
         - host: 'search-indexer-service.staging01.devland.is'

diff --git a/infra/src/dsl/ingress.spec.ts b/infra/src/dsl/ingress.spec.ts
@@ -148,4 +148,73 @@ describe('Ingress definitions', () => {
       },
     })
   })
+  it('No annotations is permitted', async () => {
+    const sut = service('api').ingress({
+      primary: {
+        public: false,
+        host: { dev: 'a', staging: 'a', prod: 'a' },
+        paths: ['/api'],
+        extraAnnotations: {
+          staging: {
+            'nginx.ingress.kubernetes.io/foo': 'true',
+          },
+        },
+      },
+    })
+    const result = (await generateOutputOne({
+      outputFormat: renderers.helm,
+      service: sut,
+      runtime: new Kubernetes(Staging),
+      env: Staging,
+    })) as SerializeSuccess<HelmService>
+
+    expect(result.serviceDef[0].ingress).toEqual({
+      'primary-alb': {
+        annotations: {
+          'kubernetes.io/ingress.class': 'nginx-internal-alb',
+          'nginx.ingress.kubernetes.io/service-upstream': 'true',
+          'nginx.ingress.kubernetes.io/foo': 'true',
+        },
+        hosts: [
+          {
+            host: 'a.internal.staging01.devland.is',
+            paths: ['/api'],
+          },
+        ],
+      },
+    })
+  })
+  it('Empty annotations are valid', async () => {
+    const sut = service('api').ingress({
+      primary: {
+        public: false,
+        host: { dev: 'a', staging: 'a', prod: 'a' },
+        paths: ['/api'],
+        extraAnnotations: {
+          staging: {},
+        },
+      },
+    })
+    const result = (await generateOutputOne({
+      outputFormat: renderers.helm,
+      service: sut,
+      runtime: new Kubernetes(Staging),
+      env: Staging,
+    })) as SerializeSuccess<HelmService>
+
+    expect(result.serviceDef[0].ingress).toEqual({
+      'primary-alb': {
+        annotations: {
+          'kubernetes.io/ingress.class': 'nginx-internal-alb',
+          'nginx.ingress.kubernetes.io/service-upstream': 'true',
+        },
+        hosts: [
+          {
+            host: 'a.internal.staging01.devland.is',
+            paths: ['/api'],
+          },
+        ],
+      },
+    })
+  })
 })
diff --git a/infra/src/dsl/types/input-types.ts b/infra/src/dsl/types/input-types.ts
@@ -139,9 +139,9 @@ export interface Ingress {
   }
   paths: string[]
   public?: boolean
-  extraAnnotations?: {
+  extraAnnotations?: Partial<{
     [env in OpsEnv]: { [annotation: string]: string | null }
-  }
+  }>
 }
 
 export interface IngressForEnv {

diff --git a/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts b/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts
@@ -6,6 +6,7 @@ export enum BasePensionType {
   Disability = 'Disability',
   Rehabilitation = 'Rehabilitation',
   HalfRetirement = 'HalfRetirement',
+  NewSystem = 'NewSystem',
 }
 
 registerEnumType(BasePensionType, {

diff --git a/libs/api/domains/social-insurance/src/lib/utils.ts b/libs/api/domains/social-insurance/src/lib/utils.ts
@@ -21,6 +21,7 @@ const basePensionTypeMapping: Record<BasePensionType, number> = {
   [BasePensionType.Disability]: 3, // Örorkulífeyrir
   [BasePensionType.Rehabilitation]: 4, // Endurhæfingarlífeyrir
   [BasePensionType.HalfRetirement]: 5, // Hálfur Ellilífeyrir
+  [BasePensionType.NewSystem]: 6, // Nýtt kerfi sem tekur gildi 1. september 2025
 }
 
 const livingConditionMapping: Record<LivingCondition, number> = {