From 88e92b9dabd9dad1c82e385cc2dd932446ef2cff Mon Sep 17 00:00:00 2001
From: James Gilmore <109554461+GilmoreA6@users.noreply.github.com>
Date: Tue, 15 Oct 2024 09:45:35 -0700
Subject: [PATCH] 
 Flexion/jgilmore/16196-add-environment-variable-for-default-encoding (#16234)

* update terraform to include JAVA_OPTS env variable

* update function_app terrfgorm files with JAVA_OPTS env variable
---
 operations/app/terraform/modules/function_app/locals.tf  | 1 +
 operations/app/terraform/modules/function_app/~inputs.tf | 1 +
 operations/app/terraform/vars/demo/locals.tf             | 1 +
 operations/app/terraform/vars/demo/main.tf               | 1 +
 operations/app/terraform/vars/prod/locals.tf             | 2 +-
 operations/app/terraform/vars/prod/main.tf               | 1 +
 operations/app/terraform/vars/staging/locals.tf          | 1 +
 operations/app/terraform/vars/staging/main.tf            | 1 +
 operations/app/terraform/vars/test/locals.tf             | 1 +
 operations/app/terraform/vars/test/main.tf               | 1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/operations/app/terraform/modules/function_app/locals.tf b/operations/app/terraform/modules/function_app/locals.tf
index 15daeed6e3f..c94c8ceaca7 100644
--- a/operations/app/terraform/modules/function_app/locals.tf
+++ b/operations/app/terraform/modules/function_app/locals.tf
@@ -19,6 +19,7 @@ locals {
     "RS_OKTA_ClientId" = var.RS_OKTA_clientId
     "ETOR_TI_baseurl"  = var.etor_ti_base_url
     "cdctiautomated"   = var.cdctiautomated_sa
+    "JAVA_OPTS"        = var.JAVA_OPTS
     # Manage client secrets via a Key Vault
     "CREDENTIAL_STORAGE_METHOD" = "AZURE"
     "CREDENTIAL_KEY_VAULT_NAME" = var.client_config_key_vault_name
diff --git a/operations/app/terraform/modules/function_app/~inputs.tf b/operations/app/terraform/modules/function_app/~inputs.tf
index 5b20d635fb5..2504367d17e 100644
--- a/operations/app/terraform/modules/function_app/~inputs.tf
+++ b/operations/app/terraform/modules/function_app/~inputs.tf
@@ -93,6 +93,7 @@ variable "etor_ti_base_url" {}
 variable "cdctiautomated_sa" {
   default = ""
 }
+variable "JAVA_OPTS" {}
 
 variable "subnets" {
   description = "A set of all available subnet combinations"
diff --git a/operations/app/terraform/vars/demo/locals.tf b/operations/app/terraform/vars/demo/locals.tf
index f5268b611a6..52e3441efa8 100644
--- a/operations/app/terraform/vars/demo/locals.tf
+++ b/operations/app/terraform/vars/demo/locals.tf
@@ -17,6 +17,7 @@ locals {
     RS_okta_redirect_url  = "https://prime-data-hub-XXXXXXX.azurefd.net/download"
     RS_OKTA_scope         = "reportstream_dev"
     etor_ti_base_url      = "https://cdcti-stg-api.azurewebsites.net"
+    JAVA_OPTS             = "-Dfile.encoding=UTF-8"
   }
   key_vault = {
     app_config_kv_name    = "pdh${local.init.environment}-appconfig${local.init.random_id}"
diff --git a/operations/app/terraform/vars/demo/main.tf b/operations/app/terraform/vars/demo/main.tf
index 6f4b51614e8..4894ed6fbb5 100644
--- a/operations/app/terraform/vars/demo/main.tf
+++ b/operations/app/terraform/vars/demo/main.tf
@@ -183,6 +183,7 @@ module "function_app" {
   RS_OKTA_clientId                  = data.azurerm_key_vault_secret.RS_OKTA_clientId.value
   RS_OKTA_authKey                   = data.azurerm_key_vault_secret.RS_OKTA_authKey.value
   etor_ti_base_url                  = local.init.etor_ti_base_url
+  JAVA_OPTS                         = local.init.JAVA_OPTS
 }
 
 module "front_door" {
diff --git a/operations/app/terraform/vars/prod/locals.tf b/operations/app/terraform/vars/prod/locals.tf
index f1e2a953eb8..a64ee7953a8 100644
--- a/operations/app/terraform/vars/prod/locals.tf
+++ b/operations/app/terraform/vars/prod/locals.tf
@@ -16,7 +16,7 @@ locals {
     storage_queue_name    = ["process"]
     sftp_container_module = false
     etor_ti_base_url      = "https://cdcti-prd-api.azurewebsites.net"
-
+    JAVA_OPTS             = "-Dfile.encoding=UTF-8"
   }
   key_vault = {
     app_config_kv_name    = "pdh${local.init.environment}-appconfig"
diff --git a/operations/app/terraform/vars/prod/main.tf b/operations/app/terraform/vars/prod/main.tf
index 6085b0a5afc..e9637d28fd9 100644
--- a/operations/app/terraform/vars/prod/main.tf
+++ b/operations/app/terraform/vars/prod/main.tf
@@ -161,6 +161,7 @@ module "function_app" {
   RS_OKTA_clientId                  = data.azurerm_key_vault_secret.RS_OKTA_clientId.value
   RS_OKTA_authKey                   = data.azurerm_key_vault_secret.RS_OKTA_authKey.value
   etor_ti_base_url                  = local.init.etor_ti_base_url
+  JAVA_OPTS                         = local.init.JAVA_OPTS
 }
 
 module "front_door" {
diff --git a/operations/app/terraform/vars/staging/locals.tf b/operations/app/terraform/vars/staging/locals.tf
index b194df91ba2..47066309e34 100644
--- a/operations/app/terraform/vars/staging/locals.tf
+++ b/operations/app/terraform/vars/staging/locals.tf
@@ -16,6 +16,7 @@ locals {
     storage_queue_name    = ["process", "batch", "batch-poison", "elr-fhir-convert", "process-poison", "send", "send-poison", "elr-fhir-convert", "elr-fhir-convert-poison", "elr-fhir-route", "elr-fhir-translate", "elr-fhir-translate-poison", "process-elr"]
     sftp_container_module = true
     etor_ti_base_url      = "https://cdcti-stg-api.azurewebsites.net"
+    JAVA_OPTS             = "-Dfile.encoding=UTF-8"
   }
   key_vault = {
     app_config_kv_name    = "pdh${local.init.environment}-appconfig"
diff --git a/operations/app/terraform/vars/staging/main.tf b/operations/app/terraform/vars/staging/main.tf
index 2ba317c6fc0..2f83e671976 100644
--- a/operations/app/terraform/vars/staging/main.tf
+++ b/operations/app/terraform/vars/staging/main.tf
@@ -161,6 +161,7 @@ module "function_app" {
   RS_OKTA_authKey                   = data.azurerm_key_vault_secret.RS_OKTA_authKey.value
   etor_ti_base_url                  = local.init.etor_ti_base_url
   cdctiautomated_sa                 = data.azurerm_key_vault_secret.cdctiautomated_sa.value
+  JAVA_OPTS                         = local.init.JAVA_OPTS
 }
 
 module "front_door" {
diff --git a/operations/app/terraform/vars/test/locals.tf b/operations/app/terraform/vars/test/locals.tf
index 2ad7f5012eb..b229fad36f0 100644
--- a/operations/app/terraform/vars/test/locals.tf
+++ b/operations/app/terraform/vars/test/locals.tf
@@ -16,6 +16,7 @@ locals {
     storage_queue_name    = ["process"]
     sftp_container_module = true
     etor_ti_base_url      = "https://cdcti-stg-api.azurewebsites.net"
+    JAVA_OPTS             = "-Dfile.encoding=UTF-8"
   }
   key_vault = {
     app_config_kv_name    = "pdh${local.init.environment}-app-config"
diff --git a/operations/app/terraform/vars/test/main.tf b/operations/app/terraform/vars/test/main.tf
index 9ebefd9a7f1..5a3a0162a0c 100644
--- a/operations/app/terraform/vars/test/main.tf
+++ b/operations/app/terraform/vars/test/main.tf
@@ -164,6 +164,7 @@ module "function_app" {
   RS_OKTA_clientId                  = data.azurerm_key_vault_secret.RS_OKTA_clientId.value
   RS_OKTA_authKey                   = data.azurerm_key_vault_secret.RS_OKTA_authKey.value
   etor_ti_base_url                  = local.init.etor_ti_base_url
+  JAVA_OPTS                         = local.init.JAVA_OPTS
 }
 
 module "front_door" {