Skip to content

Commit c5644a2

Browse files
pataripatari
authored
Merge pull request #1431 from Tampere/suomi.fi-messages-rest-prod
Enable suomi.fi-messages rest (prod)
2 parents 0738eb4 + 494b6d3 commit c5644a2

11 files changed

+5
-19
lines changed

‎infra/deploy/evaka-service.tf‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ module "app_service" {
8181

8282
# SfiEnv
8383
EVAKA_INTEGRATION_SFI_KEY_STORE_PASSWORD = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/message-service/keystore/password" : null
84-
EVAKA_INTEGRATION_SFI_REST_USERNAME = var.evaka_integration_sfi_enabled && var.evaka_integeration_sfi_rest_enabled ? "${local.param_prefix}/service/sfi/username" : null
84+
EVAKA_INTEGRATION_SFI_REST_USERNAME = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/username" : null
8585

8686
# SfiPrintingEnv
8787
EVAKA_INTEGRATION_SFI_PRINTING_BILLING_ID = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/printing/id" : null
@@ -228,9 +228,9 @@ module "app_service" {
228228
EVAKA_INTEGRATION_SFI_SERVICE_IDENTIFIER = var.evaka_integration_sfi_enabled ? var.sfi_msg_service_identifier : null
229229
EVAKA_INTEGRATION_SFI_CERTIFICATE_COMMON_NAME = var.evaka_integration_sfi_enabled ? var.sfi_msg_certificate_cn : null
230230
EVAKA_INTEGRATION_SFI_PRINTING_ENABLED = var.evaka_integration_sfi_enabled ? var.sfi_msg_enable_printing : null
231-
EVAKA_INTEGRATION_SFI_REST_ENABLED = var.evaka_integration_sfi_enabled && var.evaka_integeration_sfi_rest_enabled ? true : null
232-
EVAKA_INTEGRATION_SFI_REST_ADDRESS = var.evaka_integration_sfi_enabled && var.evaka_integeration_sfi_rest_enabled ? var.environment == "prod" ? "https://api.messages.suomi.fi" : "https://api.messages-qa.suomi.fi" : null
233-
EVAKA_INTEGRATION_SFI_REST_PASSWORD_SSM_NAME = var.evaka_integration_sfi_enabled && var.evaka_integeration_sfi_rest_enabled ? "${local.param_prefix}/service/sfi/password" : null
231+
EVAKA_INTEGRATION_SFI_REST_ENABLED = var.evaka_integration_sfi_enabled ? true : null
232+
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
233+
EVAKA_INTEGRATION_SFI_REST_PASSWORD_SSM_NAME = var.evaka_integration_sfi_enabled ? "${local.param_prefix}/service/sfi/password" : null
234234

235235
# SfiPrintingEnv
236236
EVAKA_INTEGRATION_SFI_PRINTING_FORCE_PRINT_FOR_ELECTRONIC_USER = var.evaka_integration_sfi_enabled ? var.sfi_msg_force_print_for_electronic_user : null
@@ -400,11 +400,6 @@ variable "evaka_integration_sfi_enabled" {
400400
type = bool
401401
}
402402

403-
variable "evaka_integeration_sfi_rest_enabled" {
404-
type = bool
405-
default = false
406-
}
407-
408403
variable "tampere_summertime_absence_free_month" {
409404
type = string
410405
default = null

‎infra/deploy/variables/hameenkyro-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0132947-3/hameenkyr
4444
dvv_mutp_update_enabled = false
4545
send_pending_decision_reminder_emails_enabled = true
4646
evaka_integration_sfi_enabled = true
47-
evaka_integeration_sfi_rest_enabled = true
4847

4948
evaka_job_inactive_employees_role_reset_enabled = false
5049
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/kangasala-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/1923299-5/kangasala
3737
dvv_mutp_update_enabled = false
3838
send_pending_decision_reminder_emails_enabled = true
3939
evaka_integration_sfi_enabled = true
40-
evaka_integeration_sfi_rest_enabled = true
4140

4241
evaka_job_inactive_employees_role_reset_enabled = false
4342
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/lempaala-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0150783-1/lempaalae
3737
dvv_mutp_update_enabled = false
3838
send_pending_decision_reminder_emails_enabled = true
3939
evaka_integration_sfi_enabled = true
40-
evaka_integeration_sfi_rest_enabled = true
4140

4241
evaka_job_inactive_employees_role_reset_enabled = false
4342
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/nokia-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0205717-4/nokiaevak
3737
dvv_mutp_update_enabled = false
3838
send_pending_decision_reminder_emails_enabled = true
3939
evaka_integration_sfi_enabled = true
40-
evaka_integeration_sfi_rest_enabled = true
4140

4241
evaka_job_inactive_employees_role_reset_enabled = false
4342
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/orivesi-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0151789-6/orivesiev
3737
dvv_mutp_update_enabled = false
3838
send_pending_decision_reminder_emails_enabled = true
3939
evaka_integration_sfi_enabled = true
40-
evaka_integeration_sfi_rest_enabled = true
4140

4241
evaka_job_inactive_employees_role_reset_enabled = false
4342
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/pirkkala-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0152084-1/pirkkalae
3737
dvv_mutp_update_enabled = false
3838
send_pending_decision_reminder_emails_enabled = true
3939
evaka_integration_sfi_enabled = true
40-
evaka_integeration_sfi_rest_enabled = true
4140

4241
evaka_job_inactive_employees_role_reset_enabled = false
4342
evaka_job_send_missing_reservation_reminders_enabled = true

‎infra/deploy/variables/tampere-dev-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0211675-2/treVaka"
4848
dvv_mutp_update_enabled = false
4949
send_pending_decision_reminder_emails_enabled = true
5050
evaka_integration_sfi_enabled = true
51-
evaka_integeration_sfi_rest_enabled = true
5251

5352
evaka_job_freeze_voucher_value_reports_cron = "0 30 23 L * ?"
5453
evaka_job_inactive_employees_role_reset_enabled = false

‎infra/deploy/variables/tampere-test-apps.tfvars‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ email_subject_postfix = "staging"
5151
dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0211675-2/treVaka"
5252
dvv_mutp_update_enabled = false
5353
send_pending_decision_reminder_emails_enabled = true
54-
evaka_integration_sfi_enabled = true
54+
evaka_integration_sfi_enabled = false
5555

5656
evaka_job_freeze_voucher_value_reports_cron = "0 30 23 L * ?"
5757
evaka_job_inactive_employees_role_reset_enabled = false

‎infra/deploy/variables/vesilahti-test-apps.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dvv_modifications_service_xroadclientid = "FI-TEST/MUN/0157711-9/vesilahti
4444
dvv_mutp_update_enabled = false
4545
send_pending_decision_reminder_emails_enabled = true
4646
evaka_integration_sfi_enabled = true
47-
evaka_integeration_sfi_rest_enabled = true
4847

4948
evaka_job_inactive_employees_role_reset_enabled = false
5049
evaka_job_send_missing_reservation_reminders_enabled = true

0 commit comments

Comments
 (0)