Skip to content

Commit

Permalink
Merge branch 'main' into j-s/civil-claimant-courts
Browse files Browse the repository at this point in the history
  • Loading branch information
unakb authored Oct 4, 2024
2 parents a4d7153 + 1482e07 commit 3fd81cc
Show file tree
Hide file tree
Showing 541 changed files with 16,096 additions and 2,386 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ codemagic.yaml
/libs/api/domains/official-journal-of-iceland-application/ @island-is/hugsmidjan
/libs/api/domains/document-provider/ @island-is/hugsmidjan @island-is/core
/libs/api/domains/housing-benefits/ @island-is/hugsmidjan
/libs/api/domains/law-and-order/ @island-is/hugsmidjan
/libs/clients/documents/ @island-is/hugsmidjan
/libs/clients/documents-v2/ @island-is/hugsmidjan
/libs/clients/finance/ @island-is/hugsmidjan
Expand Down Expand Up @@ -198,6 +199,7 @@ codemagic.yaml
/libs/portals/admin/air-discount-scheme @island-is/hugsmidjan
/libs/application/templates/official-journal-of-iceland/ @island-is/hugsmidjan
/libs/application/template-api-modules/src/lib/modules/templates/official-journal-of-iceland/ @island-is/hugsmidjan
/libs/clients/judicial-system-sp/ @island-is/hugsmidjan
/libs/application/templates/data-protection-complaint/ @island-is/norda
/libs/application/templates/institution-collaboration/ @island-is/norda @island-is/fuglar
/libs/application/templates/login-service/ @island-is/norda
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/config-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
working-directory: infra
run: node -r esbuild-register src/secrets.ts get-all-required-secrets --env=${{ matrix.env }} >> LOCAL_SECRETS
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.DESCRIBE_SSM_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.DESCRIBE_SSM_AWS_SECRET_ACCESS_KEY }}
Expand All @@ -156,7 +156,7 @@ jobs:
working-directory: infra

- name: Configure AWS Credentials for IDS Prod
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.DESCRIBE_SSM_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.DESCRIBE_SSM_AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -664,7 +664,7 @@ jobs:
run: '[[ ${{ needs.docker-build.result }} != "failure" ]] || exit 1'
- uses: actions/checkout@v3
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
.yarn
/infra/helm/
/.nx/cache
/.nx/workspace-data
/.nx/workspace-data
apps/web/public/assets/pdf.worker.min.mjs
4 changes: 4 additions & 0 deletions apps/api/infra/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
UniversityCareers,
OfficialJournalOfIceland,
OfficialJournalOfIcelandApplication,
JudicialSystemServicePortal,
Frigg,
HealthDirectorateOrganDonation,
HealthDirectorateVaccination,
Expand Down Expand Up @@ -385,6 +386,8 @@ export const serviceSetup = (services: {
ULTRAVIOLET_RADIATION_API_KEY: '/k8s/api/ULTRAVIOLET_RADIATION_API_KEY',
UMBODSMADUR_SKULDARA_COST_OF_LIVING_CALCULATOR_API_URL:
'/k8s/api/UMBODSMADUR_SKULDARA_COST_OF_LIVING_CALCULATOR_API_URL',
VINNUEFTIRLITID_CAMPAIGN_MONITOR_API_KEY:
'/k8s/api/VINNUEFTIRLITID_CAMPAIGN_MONITOR_API_KEY',
})
.xroad(
AdrAndMachine,
Expand Down Expand Up @@ -432,6 +435,7 @@ export const serviceSetup = (services: {
SignatureCollection,
SocialInsuranceAdministration,
OfficialJournalOfIceland,
JudicialSystemServicePortal,
OfficialJournalOfIcelandApplication,
Frigg,
HealthDirectorateOrganDonation,
Expand Down
8 changes: 7 additions & 1 deletion apps/api/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { ElectronicRegistrationsModule } from '@island.is/api/domains/electronic
import {
EmailSignupModule,
ZenterSignupConfig,
CampaignMonitorSignupConfig,
} from '@island.is/api/domains/email-signup'
import { EndorsementSystemModule } from '@island.is/api/domains/endorsement-system'
import { EnergyFundsServiceModule } from '@island.is/api/domains/energy-funds'
Expand Down Expand Up @@ -188,7 +189,9 @@ import {
} from '@island.is/clients/university-careers'
import { HousingBenefitsConfig } from '@island.is/clients/hms-housing-benefits'
import { UserProfileClientConfig } from '@island.is/clients/user-profile'
import { LawAndOrderModule } from '@island.is/api/domains/law-and-order'
import { UltravioletRadiationClientConfig } from '@island.is/clients/ultraviolet-radiation'
import { JudicialSystemSPClientConfig } from '@island.is/clients/judicial-system-sp'
import { CriminalRecordClientConfig } from '@island.is/clients/criminal-record'
import { HealthInsuranceV2ClientConfig } from '@island.is/clients/icelandic-health-insurance/health-insurance'
import { VmstClientConfig } from '@island.is/clients/vmst'
Expand Down Expand Up @@ -328,6 +331,7 @@ const environment = getConfig
AuthAdminModule,
HousingBenefitCalculatorModule,
SignatureCollectionModule,
LawAndOrderModule,
UmbodsmadurSkuldaraModule,
HealthDirectorateModule,
ConfigModule.forRoot({
Expand Down Expand Up @@ -387,6 +391,7 @@ const environment = getConfig
DocumentClientConfig,
DocumentsClientV2Config,
ZenterSignupConfig,
CampaignMonitorSignupConfig,
PaymentScheduleClientConfig,
JudicialAdministrationClientConfig,
CommunicationsConfig,
Expand Down Expand Up @@ -419,11 +424,12 @@ const environment = getConfig
LicenseConfig,
UserProfileClientConfig,
UltravioletRadiationClientConfig,
JudicialSystemSPClientConfig,
FriggClientConfig,
GradeClientConfig,
VmstClientConfig,
HealthInsuranceV2ClientConfig,
CriminalRecordClientConfig,
HealthInsuranceV2ClientConfig,
UmbodsmadurSkuldaraClientConfig,
emailModuleConfig,
],
Expand Down
Loading

0 comments on commit 3fd81cc

Please sign in to comment.