Skip to content

Commit

Permalink
Merge branch 'main' into j-s/civil-claimant-assigned-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@unakb
unakb committed Nov 15, 2024
2 parents 5c6680e + 3a99c33 commit 69deee8
Show file tree
Hide file tree
Showing 1,668 changed files with 33,090 additions and 10,114 deletions.
31 changes: 16 additions & 15 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/apps/application-system/ @island-is/norda-applications
/apps/web*/ @island-is/juni @island-is/stefna
/libs/application/ @island-is/norda-applications
/libs/service-portal/ @island-is/hugsmidjan
/libs/portals/my-pages/ @island-is/hugsmidjan
/libs/portals/admin/ @island-is/aranja
/libs/portals/core/ @island-is/aranja @island-is/hugsmidjan
/libs/shared/connected/ @island-is/stefna
Expand All @@ -30,19 +30,20 @@
/apps/icelandic-names-registry*/ @island-is/juni
/apps/web/screens/PetitionView/ @island-is/juni
/libs/cms/ @island-is/juni @island-is/stefna
/libs/clients/cms/ @island-is/juni @island-is/aranja
/libs/residence-history @island-is/juni
/libs/api/domains/endorsement-system @island-is/juni
/libs/api/domains/icelandic-names-registry/ @island-is/juni
/libs/clients/rsk/ @island-is/juni
/libs/clients/zendesk/ @island-is/juni
/libs/icelandic-names-registry/ @island-is/juni
/libs/service-portal/petitions/ @island-is/juni
/libs/service-portal/signature-collection/ @island-is/juni
/libs/service-portal/education/ @island-is/juni @island-is/hugsmidjan
/libs/service-portal/education-career/ @island-is/juni @island-is/hugsmidjan
/libs/service-portal/education-degree/ @island-is/juni @island-is/hugsmidjan
/libs/service-portal/education-license/ @island-is/juni @island-is/hugsmidjan
/libs/service-portal/education-student-assessment/ @island-is/juni @island-is/norda @island-is/hugsmidjan
/libs/portals/my-pages/petitions/ @island-is/juni
/libs/portals/my-pages/signature-collection/ @island-is/juni
/libs/portals/my-pages/education/ @island-is/juni @island-is/hugsmidjan
/libs/portals/my-pages/education-career/ @island-is/juni @island-is/hugsmidjan
/libs/portals/my-pages/education-degree/ @island-is/juni @island-is/hugsmidjan
/libs/portals/my-pages/education-license/ @island-is/juni @island-is/hugsmidjan
/libs/portals/my-pages/education-student-assessment/ @island-is/juni @island-is/norda @island-is/hugsmidjan
/libs/clients/driving-license/ @island-is/juni
/libs/clients/judicial-administration/ @island-is/juni
/libs/application/templates/announcement-of-death/ @island-is/juni
Expand Down Expand Up @@ -104,9 +105,9 @@ libs/clients/rsk/relationships/
/libs/clients/sessions @island-is/aranja
/libs/portals/shared-modules/delegations @island-is/aranja
/libs/portals/admin/ids-admin @island-is/aranja
/libs/service-portal/consent @island-is/aranja
/libs/service-portal/restrictions @island-is/aranja
/libs/service-portal/sessions @island-is/aranja
/libs/portals/my-pages/consent @island-is/aranja
/libs/portals/my-pages/restrictions @island-is/aranja
/libs/portals/my-pages/sessions @island-is/aranja
/apps/native/app/ @island-is/aranja-app
codemagic.yaml @island-is/aranja-app
/apps/web/public/.well-known/ @island-is/aranja-app
Expand Down Expand Up @@ -230,7 +231,7 @@ codemagic.yaml
/libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/ @island-is/norda
/libs/shared/form-fields/ @island-is/norda @island-is/island-ui

/libs/service-portal/applications/ @island-is/norda-applications
/libs/portals/my-pages/applications/ @island-is/norda-applications
/libs/portals/admin/application-system/ @island-is/norda-applications
/libs/api/domains/application/ @island-is/norda-applications
/libs/api/domains/payment/ @island-is/norda-applications
Expand Down Expand Up @@ -386,10 +387,10 @@ codemagic.yaml
/charts/ @island-is/devops
.dockerignore @island-is/devops


# System tests
# Catch-all
# QA
/apps/system-e2e/ @island-is/qa
/libs/testing/e2e @island-is/qa

# Islandis
/apps/system-e2e/src/tests/islandis/admin-portal/ @island-is/aranja
/apps/system-e2e/src/tests/islandis/application-system/ @island-is/norda-applications
Expand Down
102 changes: 98 additions & 4 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,128 @@
version: 2

updates:
# Monorepo npm dependencies
- package-ecosystem: npm
directory: /
schedule:
interval: daily
interval: weekly
time: '02:00'
day: saturday
timezone: Etc/UTC
labels:
- automerge
- dependencies
commit-message:
prefix: chore(deps)
prefix-development: chore(deps-dev)
open-pull-requests-limit: 2
groups:
minor-patch-dependencies:
patterns:
- '*'
update-types:
- minor
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-major']

# Infra npm dependencies
- package-ecosystem: npm
directory: /infra
schedule:
interval: weekly
time: '03:00'
timezone: Etc/UTC
labels:
- automerge
- dependencies
commit-message:
prefix: chore(deps)
prefix-development: chore(deps-infra)
open-pull-requests-limit: 2
groups:
minor-patch-dependencies:
patterns:
- '*'
update-types:
- minor
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-major']

# GitHub Actions
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
interval: weekly
day: saturday
time: '04:00'
timezone: Etc/UTC
labels:
- automerge
- dependencies
commit-message:
prefix: chore(ci)
open-pull-requests-limit: 2
groups:
minor-patch-dependencies:
patterns:
- '*'
update-types:
- minor
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-major']

# GitHub Actions npm dependencies
- package-ecosystem: npm
directory: /.github/actions/
schedule:
interval: daily
interval: weekly
day: saturday
time: '05:00'
timezone: Etc/UTC
labels:
- automerge
- dependencies
commit-message:
prefix: chore(ci-deps)
open-pull-requests-limit: 2
groups:
minor-patch-dependencies:
patterns:
- '*'
update-types:
- minor
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-major']

# CI Scripts dependencies
- package-ecosystem: npm
directory: /scripts/ci/cache
schedule:
interval: daily
interval: weekly
day: saturday
time: '06:00'
timezone: Etc/UTC
labels:
- automerge
- dependencies
commit-message:
prefix: chore(ci-deps)
open-pull-requests-limit: 2
groups:
minor-patch-dependencies:
patterns:
- '*'
update-types:
- minor
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-major']
16 changes: 16 additions & 0 deletions .github/workflows/push.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ jobs:
uses: docker/setup-qemu-action@v3
with:
image: '${{ env.DOCKER_BASE_IMAGE_REGISTRY }}/eks-distro-build-tooling/binfmt-misc:qemu-v6.1.0'
- name: Check if cached buildx image exists
id: cache-check
run: |
if ! docker pull ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1 ; then
docker pull docker.io/moby/buildkit:buildx-stable-1
docker tag docker.io/moby/buildkit:buildx-stable-1 ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1
docker push ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1
fi
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down Expand Up @@ -555,6 +563,14 @@ jobs:
uses: docker/setup-qemu-action@v3
with:
image: '${{ env.DOCKER_BASE_IMAGE_REGISTRY }}/eks-distro-build-tooling/binfmt-misc:qemu-v6.1.0'
- name: Check if cached buildx image exists
id: cache-check
run: |
if ! docker pull ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1 ; then
docker pull docker.io/moby/buildkit:buildx-stable-1
docker tag docker.io/moby/buildkit:buildx-stable-1 ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1
docker push ${{vars.AWS_ECR_REPO_BASE}}/moby/buildkit:buildx-stable-1
fi
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,8 @@ apps/**/index.html

.nx/
.zed/

# E2E outputs
test-results/
playwright-report/
tmp-sessions/
7 changes: 7 additions & 0 deletions apps/api/infra/api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import {
Vehicles,
VehicleServiceFjsV1,
VehiclesMileage,
WorkAccidents,
WorkMachines,
} from '../../../infra/src/dsl/xroad'

Expand Down Expand Up @@ -277,6 +278,11 @@ export const serviceSetup = (services: {
UNIVERSITY_GATEWAY_API_URL: ref(
(h) => `http://${h.svc(services.universityGatewayApi)}`,
),
WATSON_ASSISTANT_CHAT_FEEDBACK_DB_NAME: {
dev: 'island-is-assistant-feedback',
staging: 'island-is-assistant-feedback',
prod: 'island-is-assistant-feedback',
},
})

.secrets({
Expand Down Expand Up @@ -440,6 +446,7 @@ export const serviceSetup = (services: {
Frigg,
HealthDirectorateOrganDonation,
HealthDirectorateVaccination,
WorkAccidents,
)
.files({ filename: 'islyklar.p12', env: 'ISLYKILL_CERT' })
.ingress({
Expand Down
2 changes: 2 additions & 0 deletions apps/api/src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ import { CmsTranslationsModule } from '@island.is/cms-translations'
import { FileStorageConfig } from '@island.is/file-storage'
import { AuditModule } from '@island.is/nest/audit'
import { DocumentsClientV2Config } from '@island.is/clients/documents-v2'
import { WorkAccidentClientConfig } from '@island.is/clients/work-accident-ver'

import {
ConfigModule,
Expand Down Expand Up @@ -432,6 +433,7 @@ const environment = getConfig
CriminalRecordClientConfig,
HealthInsuranceV2ClientConfig,
UmbodsmadurSkuldaraClientConfig,
WorkAccidentClientConfig,
ZendeskServiceConfig,
emailModuleConfig,
],
Expand Down
10 changes: 6 additions & 4 deletions apps/application-system/api/infra/application-system-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
Frigg,
HealthDirectorateVaccination,
HealthDirectorateOrganDonation,
WorkAccidents,
NationalRegistryB2C,
} from '../../../../infra/src/dsl/xroad'

Expand Down Expand Up @@ -300,6 +301,7 @@ export const serviceSetup = (services: {
Frigg,
HealthDirectorateVaccination,
HealthDirectorateOrganDonation,
WorkAccidents,
)
.secrets({
NOVA_URL: '/k8s/application-system-api/NOVA_URL',
Expand Down Expand Up @@ -344,11 +346,11 @@ export const serviceSetup = (services: {
})
.db()
.migrations()
.liveness('/liveness')
.readiness('/liveness')
.liveness({ path: '/liveness', initialDelaySeconds: 20 })
.readiness({ path: '/liveness', initialDelaySeconds: 20 })
.resources({
limits: { cpu: '400m', memory: '1024Mi' },
requests: { cpu: '75m', memory: '512Mi' },
limits: { cpu: '600m', memory: '1024Mi' },
requests: { cpu: '200m', memory: '512Mi' },
})
.replicaCount({
default: 2,
Expand Down
Loading

0 comments on commit 69deee8

Please sign in to comment.