Flexion/jgilmore/16196-add-environment-variable-for-default encoding (#16235)

GilmoreA6 · web-flow · commit f283cf39dc20 · 2024-10-15T22:34:18.000Z
* update terraform to include JAVA_OPTS env variable

* update function_app terrfgorm files with JAVA_OPTS env variable

* add integration test for HL7 to FHIR for ORU

* update integration test file name

* update hl7 to fhir integration test
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" {
diff --git a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oru_20241015-001.fhir b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oru_20241015-001.fhir
diff --git a/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oru_20241015-001.hl7 b/prime-router/src/testIntegration/resources/datatests/HL7_to_FHIR/sample_oru_20241015-001.hl7
diff --git a/prime-router/src/testIntegration/resources/datatests/translation-test-config.csv b/prime-router/src/testIntegration/resources/datatests/translation-test-config.csv

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ variable "etor_ti_base_url" {}`
`93`	`93`	`variable "cdctiautomated_sa" {`
`94`	`94`	`default = ""`
`95`	`95`	`}`
	`96`	`+variable "JAVA_OPTS" {}`
`96`	`97`
`97`	`98`	`variable "subnets" {`
`98`	`99`	`description = "A set of all available subnet combinations"`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ locals {`
`17`	`17`	`RS_okta_redirect_url = "https://prime-data-hub-XXXXXXX.azurefd.net/download"`
`18`	`18`	`RS_OKTA_scope = "reportstream_dev"`
`19`	`19`	`etor_ti_base_url = "https://cdcti-stg-api.azurewebsites.net"`
	`20`	`+ JAVA_OPTS = "-Dfile.encoding=UTF-8"`
`20`	`21`	`}`
`21`	`22`	`key_vault = {`
`22`	`23`	`app_config_kv_name = "pdh${local.init.environment}-appconfig${local.init.random_id}"`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ module "function_app" {`
`183`	`183`	`RS_OKTA_clientId = data.azurerm_key_vault_secret.RS_OKTA_clientId.value`
`184`	`184`	`RS_OKTA_authKey = data.azurerm_key_vault_secret.RS_OKTA_authKey.value`
`185`	`185`	`etor_ti_base_url = local.init.etor_ti_base_url`
	`186`	`+ JAVA_OPTS = local.init.JAVA_OPTS`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`module "front_door" {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ locals {`
`16`	`16`	`storage_queue_name = ["process"]`
`17`	`17`	`sftp_container_module = false`
`18`	`18`	`etor_ti_base_url = "https://cdcti-prd-api.azurewebsites.net"`
`19`		`-`
	`19`	`+ JAVA_OPTS = "-Dfile.encoding=UTF-8"`
`20`	`20`	`}`
`21`	`21`	`key_vault = {`
`22`	`22`	`app_config_kv_name = "pdh${local.init.environment}-appconfig"`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ module "function_app" {`
`161`	`161`	`RS_OKTA_clientId = data.azurerm_key_vault_secret.RS_OKTA_clientId.value`
`162`	`162`	`RS_OKTA_authKey = data.azurerm_key_vault_secret.RS_OKTA_authKey.value`
`163`	`163`	`etor_ti_base_url = local.init.etor_ti_base_url`
	`164`	`+ JAVA_OPTS = local.init.JAVA_OPTS`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`module "front_door" {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ locals {`
`16`	`16`	`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"]`
`17`	`17`	`sftp_container_module = true`
`18`	`18`	`etor_ti_base_url = "https://cdcti-stg-api.azurewebsites.net"`
	`19`	`+ JAVA_OPTS = "-Dfile.encoding=UTF-8"`
`19`	`20`	`}`
`20`	`21`	`key_vault = {`
`21`	`22`	`app_config_kv_name = "pdh${local.init.environment}-appconfig"`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ module "function_app" {`
`164`	`164`	`RS_OKTA_clientId = data.azurerm_key_vault_secret.RS_OKTA_clientId.value`
`165`	`165`	`RS_OKTA_authKey = data.azurerm_key_vault_secret.RS_OKTA_authKey.value`
`166`	`166`	`etor_ti_base_url = local.init.etor_ti_base_url`
	`167`	`+ JAVA_OPTS = local.init.JAVA_OPTS`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`module "front_door" {`