Merge pull request #1441 from Tampere/dependabot/submodules/evaka-7f7…

…5642 Bump evaka from `1d197c4` to `7f75642`
Tampere · Feb 21, 2025 · b0ff4de · b0ff4de
2 parents 593fd0a + 2661116
commit b0ff4de
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 150 deletions.
diff --git a/evaka b/evaka
diff --git a/infra/deploy/evaka-service.tf b/infra/deploy/evaka-service.tf
@@ -79,8 +79,7 @@ module "app_service" {
     EVAKA_INTEGRATION_VTJ_XROAD_ADDRESS = "${local.param_prefix}/service/vtj/address"
 
     # SfiEnv
-    EVAKA_INTEGRATION_SFI_KEY_STORE_PASSWORD = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/message-service/keystore/password" : null
-    EVAKA_INTEGRATION_SFI_REST_USERNAME      = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/username" : null
+    EVAKA_INTEGRATION_SFI_REST_USERNAME = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/username" : null
 
     # SfiPrintingEnv
     EVAKA_INTEGRATION_SFI_PRINTING_BILLING_ID       = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/printing/id" : null
@@ -219,17 +218,10 @@ module "app_service" {
     EVAKA_INTEGRATION_VTJ_XROAD_SERVICE_SERVICE_VERSION = "v1"
 
     # SfiEnv
-    EVAKA_INTEGRATION_SFI_ADDRESS                 = var.evaka_integration_sfi_enabled ? var.sfi_msg_service_address : null
-    EVAKA_INTEGRATION_SFI_TRUST_STORE_LOCATION    = var.evaka_integration_sfi_enabled ? "file:///opt/java/openjdk/lib/security/cacerts" : null
-    EVAKA_INTEGRATION_SFI_KEY_STORE_LOCATION      = var.evaka_integration_sfi_enabled ? "file:///home/ubuntu/s3/keystore.p12" : null
-    EVAKA_INTEGRATION_SFI_SIGNING_KEY_ALIAS       = var.evaka_integration_sfi_enabled ? var.sfi_msg_keystore_alias : null
-    EVAKA_INTEGRATION_SFI_AUTHORITY_IDENTIFIER    = var.evaka_integration_sfi_enabled ? var.sfi_msg_authority_identifier : null
-    EVAKA_INTEGRATION_SFI_SERVICE_IDENTIFIER      = var.evaka_integration_sfi_enabled ? var.sfi_msg_service_identifier : null
-    EVAKA_INTEGRATION_SFI_CERTIFICATE_COMMON_NAME = var.evaka_integration_sfi_enabled ? var.sfi_msg_certificate_cn : null
-    EVAKA_INTEGRATION_SFI_PRINTING_ENABLED        = var.evaka_integration_sfi_enabled ? var.sfi_msg_enable_printing : null
-    EVAKA_INTEGRATION_SFI_REST_ENABLED            = var.evaka_integration_sfi_enabled ? true : null
-    EVAKA_INTEGRATION_SFI_REST_ADDRESS            = var.evaka_integration_sfi_enabled ? var.environment == "prod" ? "https://api.messages.suomi.fi" : "https://api.messages-qa.suomi.fi" : null
-    EVAKA_INTEGRATION_SFI_REST_PASSWORD_SSM_NAME  = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/password" : null
+    EVAKA_INTEGRATION_SFI_SERVICE_IDENTIFIER     = var.evaka_integration_sfi_enabled ? var.sfi_msg_service_identifier : null
+    EVAKA_INTEGRATION_SFI_PRINTING_ENABLED       = var.evaka_integration_sfi_enabled ? var.sfi_msg_enable_printing : null
+    EVAKA_INTEGRATION_SFI_REST_ADDRESS           = var.evaka_integration_sfi_enabled ? var.environment == "prod" ? "https://api.messages.suomi.fi" : "https://api.messages-qa.suomi.fi" : null
+    EVAKA_INTEGRATION_SFI_REST_PASSWORD_SSM_NAME = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/password" : null
 
     # SfiPrintingEnv
     EVAKA_INTEGRATION_SFI_PRINTING_FORCE_PRINT_FOR_ELECTRONIC_USER = var.evaka_integration_sfi_enabled ? var.sfi_msg_force_print_for_electronic_user : null
@@ -561,22 +553,10 @@ variable "evaka_job_send_outdated_income_notifications_enabled" {
   default = false
 }
 
-variable "sfi_msg_service_address" {
-  type = string
-}
-
-variable "sfi_msg_authority_identifier" {
-  type = string
-}
-
 variable "sfi_msg_service_identifier" {
   type = string
 }
 
-variable "sfi_msg_certificate_cn" {
-  type = string
-}
-
 variable "sfi_msg_enable_printing" {
   type = bool
 }
@@ -590,11 +570,6 @@ variable "sfi_msg_printing_provider" {
   type = string
 }
 
-variable "sfi_msg_keystore_alias" {
-  type    = string
-  default = "signing-key"
-}
-
 variable "jamix_orders_enabled" {
   type    = bool
   default = false

diff --git a/infra/deploy/variables/hameenkyro-prod-apps.tfvars b/infra/deploy/variables/hameenkyro-prod-apps.tfvars
@@ -67,11 +67,8 @@ evaka_integration_koski_municipality_caller_id = "hameenkyroevaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "hameenkyro_ws_evaka"
-sfi_msg_service_identifier   = "hameenkyro_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Hämeenkyrö"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "hameenkyro_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: HameenkyroProperties
diff --git a/infra/deploy/variables/hameenkyro-test-apps.tfvars b/infra/deploy/variables/hameenkyro-test-apps.tfvars
@@ -50,11 +50,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "hameenkyro_ws_evaka"
-sfi_msg_service_identifier   = "hameenkyro_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Hämeenkyrö"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "hameenkyro_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: HameenkyroProperties
diff --git a/infra/deploy/variables/kangasala-prod-apps.tfvars b/infra/deploy/variables/kangasala-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "kangasalaevaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "kangasala_ws_evaka"
-sfi_msg_service_identifier   = "kangasala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Kangasala"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "kangasala_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/kangasala-test-apps.tfvars b/infra/deploy/variables/kangasala-test-apps.tfvars
@@ -43,12 +43,9 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "kangasala_ws_evaka"
-sfi_msg_service_identifier   = "kangasala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Kangasala"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "kangasala_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/lempaala-prod-apps.tfvars b/infra/deploy/variables/lempaala-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "lempaalaevaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "lempaala_ws_evaka"
-sfi_msg_service_identifier   = "lempaala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Lempäälä"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "lempaala_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/lempaala-test-apps.tfvars b/infra/deploy/variables/lempaala-test-apps.tfvars
@@ -43,11 +43,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "lempaala_ws_evaka"
-sfi_msg_service_identifier   = "lempaala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Lempäälä"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "lempaala_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: LempaalaProperties
diff --git a/infra/deploy/variables/nokia-prod-apps.tfvars b/infra/deploy/variables/nokia-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "nokiaevaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "nokia_ws_evaka"
-sfi_msg_service_identifier   = "nokia_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Nokia"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "nokia_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/nokia-test-apps.tfvars b/infra/deploy/variables/nokia-test-apps.tfvars
@@ -43,11 +43,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "nokia_ws_evaka"
-sfi_msg_service_identifier   = "nokia_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Nokia"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "nokia_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: NokiaProperties
diff --git a/infra/deploy/variables/orivesi-prod-apps.tfvars b/infra/deploy/variables/orivesi-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "orivesievaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "orivesi_ws_evaka"
-sfi_msg_service_identifier   = "orivesi_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Orivesi"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "orivesi_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/orivesi-test-apps.tfvars b/infra/deploy/variables/orivesi-test-apps.tfvars
@@ -43,11 +43,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "orivesi_ws_evaka"
-sfi_msg_service_identifier   = "orivesi_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Orivesi"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "orivesi_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: OrivesiProperties
diff --git a/infra/deploy/variables/pirkkala-prod-apps.tfvars b/infra/deploy/variables/pirkkala-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "pirkkalaevaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "pirkkala_ws_evaka"
-sfi_msg_service_identifier   = "pirkkala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Pirkkala"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "pirkkala_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/pirkkala-test-apps.tfvars b/infra/deploy/variables/pirkkala-test-apps.tfvars
@@ -43,11 +43,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "pirkkala_ws_evaka"
-sfi_msg_service_identifier   = "pirkkala_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Pirkkala"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "pirkkala_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: PirkkalaProperties
diff --git a/infra/deploy/variables/tampere-dev-apps.tfvars b/infra/deploy/variables/tampere-dev-apps.tfvars
@@ -60,13 +60,9 @@ koski_integration_api_url                      = "https://koski.testiopintopolku
 evaka_integration_koski_municipality_caller_id = "tampereevaka"
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "tampere_ws_evaka"
-sfi_msg_service_identifier   = "tampere_ws_evaka"
-sfi_msg_certificate_cn       = "Viestit"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
-sfi_msg_keystore_alias       = "viestit"
+sfi_msg_service_identifier = "tampere_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: TampereProperties
 tampere_job_export_units_acl_enabled = true

diff --git a/infra/deploy/variables/tampere-prod-apps.tfvars b/infra/deploy/variables/tampere-prod-apps.tfvars
@@ -67,12 +67,9 @@ varda_integration_enabled   = true
 evaka_job_varda_update_cron = "0 0 5 * * 1,2,3,4,5"
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "tampere_ws_evaka"
-sfi_msg_service_identifier   = "tampere_ws_evaka"
-sfi_msg_certificate_cn       = "Viestit"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "tampere_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: TampereProperties
 tampere_job_export_units_acl_enabled = true

diff --git a/infra/deploy/variables/tampere-test-apps.tfvars b/infra/deploy/variables/tampere-test-apps.tfvars
@@ -59,12 +59,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "tampere_ws_evaka"
-sfi_msg_service_identifier   = "tampere_ws_evaka"
-sfi_msg_certificate_cn       = "Viestit"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
-sfi_msg_keystore_alias       = "viestit"
+sfi_msg_service_identifier = "tampere_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: TampereProperties
diff --git a/infra/deploy/variables/vesilahti-prod-apps.tfvars b/infra/deploy/variables/vesilahti-prod-apps.tfvars
@@ -67,11 +67,8 @@ evaka_integration_koski_municipality_caller_id = "vesilahtievaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "vesilahti_ws_evaka"
-sfi_msg_service_identifier   = "vesilahti_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Vesilahti"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "vesilahti_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: VesilahtiProperties
diff --git a/infra/deploy/variables/vesilahti-test-apps.tfvars b/infra/deploy/variables/vesilahti-test-apps.tfvars
@@ -50,11 +50,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "vesilahti_ws_evaka"
-sfi_msg_service_identifier   = "vesilahti_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Vesilahti"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "vesilahti_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: VesilahtiProperties
diff --git a/infra/deploy/variables/ylojarvi-prod-apps.tfvars b/infra/deploy/variables/ylojarvi-prod-apps.tfvars
@@ -60,12 +60,9 @@ evaka_integration_koski_municipality_caller_id = "ylojarvievaka"
 varda_integration_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://pr0.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterface"
-sfi_msg_authority_identifier = "ylojarvi_ws_evaka"
-sfi_msg_service_identifier   = "ylojarvi_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Ylöjärvi"
-sfi_msg_enable_printing      = true
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "ylojarvi_ws_evaka"
+sfi_msg_enable_printing    = true
+sfi_msg_printing_provider  = "Posti"
 
 # service: jamix
 jamix_orders_enabled = true

diff --git a/infra/deploy/variables/ylojarvi-test-apps.tfvars b/infra/deploy/variables/ylojarvi-test-apps.tfvars
@@ -43,11 +43,8 @@ evaka_job_send_missing_reservation_reminders_enabled = true
 evaka_job_send_outdated_income_notifications_enabled = true
 
 # service: sfi message
-sfi_msg_service_address      = "https://qat.integraatiopalvelu.fi/Asiointitili/ViranomaispalvelutWSInterfaceNonSigned"
-sfi_msg_authority_identifier = "ylojarvi_ws_evaka"
-sfi_msg_service_identifier   = "ylojarvi_ws_evaka"
-sfi_msg_certificate_cn       = "eVaka Ylöjärvi"
-sfi_msg_enable_printing      = false
-sfi_msg_printing_provider    = "Posti"
+sfi_msg_service_identifier = "ylojarvi_ws_evaka"
+sfi_msg_enable_printing    = false
+sfi_msg_printing_provider  = "Posti"
 
 # service: YlojarviProperties
diff --git a/service/Dockerfile b/service/Dockerfile
@@ -10,14 +10,12 @@ COPY --from=core ./service/build.gradle.kts ./service/gradle.properties ./servic
 COPY --from=core ./service/vtjclient/build.gradle.kts ./service/vtjclient/build.gradle.kts
 COPY --from=core ./service/service-lib/*.kts ./service/service-lib/
 COPY --from=core ./service/evaka-bom/*.kts ./service/evaka-bom/
-COPY --from=core ./service/sficlient/*.kts ./service/sficlient/
 WORKDIR /service
 COPY ./gradle/ ./gradle/
 COPY ./gradlew ./build.gradle.kts ./gradle.properties ./settings.gradle.kts ./settings-dependabot-ignore.gradle.kts ./
 RUN ./gradlew resolveDependencies service:copyDownloadOnlyDeps
-COPY --from=core ./service/sficlient/ ../evaka/service/sficlient/
 COPY --from=core ./service/vtjclient/ ../evaka/service/vtjclient/
-RUN ./gradlew :service:sficlient:wsdl2java :service:vtjclient:wsdl2java
+RUN ./gradlew :service:vtjclient:wsdl2java
 COPY --from=core . ../evaka
 COPY . ./
 RUN ./gradlew --offline assemble \
+1 −9		service/Dockerfile
+0 −1		service/build.gradle.kts
+0 −107		service/certificates/integraatiopalvelu.sh
+0 −30		service/certificates/pr0.integraatiopalvelu.fi_2024/Intermediate.pem
+0 −25		service/certificates/pr0.integraatiopalvelu.fi_2024/Root.pem
+0 −47		service/certificates/pr0.integraatiopalvelu.fi_2024/ServerCertificate.pem
+0 −30		service/certificates/pr0.integraatiopalvelu.fi_entrust_2023/Intermediate.pem
+0 −25		service/certificates/pr0.integraatiopalvelu.fi_entrust_2023/Root.pem
+0 −48		service/certificates/pr0.integraatiopalvelu.fi_entrust_2023/ServerCertificate.pem
+0 −30		service/certificates/qat.integraatiopalvelu.fi_2024/Intermediate.pem
+0 −25		service/certificates/qat.integraatiopalvelu.fi_2024/Root.pem
+0 −47		service/certificates/qat.integraatiopalvelu.fi_2024/ServerCertificate.pem
+0 −30		service/certificates/qat.integraatiopalvelu.fi_entrust_2023/Intermediate.pem
+0 −25		service/certificates/qat.integraatiopalvelu.fi_entrust_2023/Root.pem
+0 −48		service/certificates/qat.integraatiopalvelu.fi_entrust_2023/ServerCertificate.pem
+0 −1		service/evaka-bom/build.gradle.kts
+0 −11		service/sficlient/README.md
+0 −52		service/sficlient/build.gradle.kts
+0 −107		service/sficlient/src/main/resources/wsdl/Viranomaispalvelut.wsdl
+0 −333		service/sficlient/src/main/resources/wsdl/Viranomaispalvelut.xsd
+0 −372		service/src/integrationTest/kotlin/fi/espoo/evaka/sficlient/SoapStackIntegrationTest.kt
+0 −9		service/src/integrationTest/kotlin/fi/espoo/evaka/sficlient/rest/SfiMessagesRestClientIntegrationTest.kt
+0 −62		service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt
+23 −8		service/src/main/kotlin/fi/espoo/evaka/reports/SextetReport.kt
+0 −365		service/src/main/kotlin/fi/espoo/evaka/sficlient/SfiMessagesSoapClient.kt
+6 −12		service/src/main/kotlin/fi/espoo/evaka/shared/config/SfiConfig.kt