Merge branch 'master' into engagement/nj_prework

.environment/gitleaks/gitleaks-config.toml

@@ -204,6 +204,7 @@ title = "PRIME ReportStream Gitleaks Configuration"
             'ApiKeyCredential\(\"flexion\"',
             'authType: \"two-legged\"',
             'Authorization-Type: \"username/password\"',
+            'cdctiautomated_sa'
         ]
         paths = [
             '.terraform/modules/',

.github/ISSUE_TEMPLATE/up-receiver-migration-validate-test-data.md

@@ -2,10 +2,11 @@
 name: UP Migrating Receiver - Validate Test Data
 about: This is the fourth step in migrating a STLT to the UP 
 title: "[name of STLT] - UP Migration - Validate Test Data"
-labels: onboarding-ops, receiver
+labels: onboarding-ops, receiver, engineering, needs-refinement
 assignees: ''
 
 ---
+[STLT] = name of STLT
 
 ### User Story:
 As a developer, I want the [STLT] to validate test messages in staging, so that they can receive data in the format they expect.
@@ -27,4 +28,16 @@ As a developer, I want the [STLT] to validate test messages in staging, so that
 
 ### Acceptance Criteria 
 - [ ] Created and sent data using Simple Report
-- [ ] Confirmed with STLT that data passes validation 
+- [ ] Confirmed with STLT that data passes validation
+- [ ] When finished, tag Mikaelah, Chris, and Glenn in a slack post stating:
+> [STLT] "Testing in Staging" is complete and will be moving on to "Monitor in Production"
+>
+> Connection Type: [REST, SFTP, SOAP, etc]
+>
+> Conditions tested: [List of Conditions]
+>
+> Positives set up to receive: [List of Conditions]
+>
+> Negatives set up to receive: [List of Conditions]
+>
+> Format receiving: [HL7 or FHIR]

.github/workflows/build_hub.yml

@@ -80,8 +80,8 @@ jobs:
           ./gradlew :prime-router:primeCLI --args='validate-yaml --type Organizations --file settings/organizations.yml --dir settings/STLTs'
           ./gradlew :prime-router:primeCLI --args='validate-yaml --type FhirToFhirTransform --dir src/main/resources/metadata/fhir_transforms'
           ./gradlew :prime-router:primeCLI --args='validate-yaml --type FhirToHL7Mapping --dir src/main/resources/metadata/hl7_mapping'
-          ./gradlew :prime-router:primeCLI --args='validate-yaml --type HL7ToFhirMappingMessageTemplate --dir metadata/HL7/catchall/hl7/message metadata/HL7/v251-elr/hl7/message'
-          ./gradlew :prime-router:primeCLI --args='validate-yaml --type HL7ToFhirMappingResourceTemplate --dir metadata/HL7 --exclude-dir metadata/HL7/catchall/hl7/message metadata/HL7/v251-elr/hl7/message metadata/HL7/v251-elr/hl7/codesystem metadata/HL7/catchall/hl7/codesystem --exclude-file metadata/HL7/catchall/fhir/resourcemapping.yml metadata/HL7/v251-elr/fhir/resourcemapping.yml metadata/HL7/catchall/hl7/resource/Common.yml metadata/HL7/v251-elr/hl7/resource/Common.yml'
+          ./gradlew :prime-router:primeCLI --args='validate-yaml --type HL7ToFhirMappingMessageTemplate --dir metadata/HL7/catchall/hl7/message'
+          ./gradlew :prime-router:primeCLI --args='validate-yaml --type HL7ToFhirMappingResourceTemplate --dir metadata/HL7 --exclude-dir metadata/HL7/catchall/hl7/message metadata/HL7/catchall/hl7/codesystem --exclude-file metadata/HL7/catchall/fhir/resourcemapping.yml metadata/HL7/catchall/hl7/resource/Common.yml'
 
       - name: Check for Uncommited Schema Docs
         id: check_changes

.gitignore

@@ -23,6 +23,7 @@ hs_err_pid*
 **/build/**
 **/log/**
 **/dependency-reduced-pom.xml
+**/version.json
 
 # Frontend build output
 **/node_modules/**

operations/app/terraform/modules/function_app/locals.tf

@@ -18,6 +18,7 @@ locals {
     "RS_OKTA_authkey"  = var.RS_OKTA_authKey
     "RS_OKTA_ClientId" = var.RS_OKTA_clientId
     "ETOR_TI_baseurl"  = var.etor_ti_base_url
+    "cdctiautomated"   = var.cdctiautomated_sa
     # Manage client secrets via a Key Vault
     "CREDENTIAL_STORAGE_METHOD" = "AZURE"
     "CREDENTIAL_KEY_VAULT_NAME" = var.client_config_key_vault_name

operations/app/terraform/modules/function_app/~inputs.tf

@@ -90,6 +90,9 @@ variable "RS_OKTA_authKey" {}
 variable "RS_OKTA_clientId" {}
 variable "RS_OKTA_scope" {}
 variable "etor_ti_base_url" {}
+variable "cdctiautomated_sa" {
+  default = ""
+}
 
 variable "subnets" {
   description = "A set of all available subnet combinations"

operations/app/terraform/vars/staging/data.tf

@@ -93,4 +93,10 @@ data "azurerm_key_vault_secret" "RS_OKTA_authKey" {
   name         = "functionapp-RS-OKTA-authkey"
   key_vault_id = data.azurerm_key_vault.app_config.id
 
+}
+
+data "azurerm_key_vault_secret" "cdctiautomated_sa" {
+  name         = "functionapp-cdctiautomated"
+  key_vault_id = data.azurerm_key_vault.app_config.id
+
 }

operations/app/terraform/vars/staging/main.tf

@@ -160,6 +160,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
+  cdctiautomated_sa                 = data.azurerm_key_vault_secret.cdctiautomated_sa.value
 }
 
 module "front_door" {

prime-router/build.gradle.kts

@@ -23,7 +23,9 @@ import org.apache.commons.io.FilenameUtils
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jooq.meta.jaxb.ForcedType
+import java.io.ByteArrayOutputStream
 import java.io.FileInputStream
+import java.nio.charset.StandardCharsets
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Properties
@@ -497,9 +499,22 @@ tasks.azureFunctionsPackage {
     finalizedBy("copyAzureScripts")
 }
 
+tasks.register("generateVersionFile") {
+    doLast {
+        val stdout = ByteArrayOutputStream()
+        exec {
+            commandLine("git", "rev-parse", "--short", "HEAD")
+            standardOutput = stdout
+        }
+        val currentCommit = stdout.toString(StandardCharsets.UTF_8).trim()
+        File("./version.json").writeText("{\"commitId\": \"$currentCommit\"}")
+    }
+}
+
 val azureResourcesTmpDir = File(buildDir, "$azureFunctionsDir-resources/$azureAppName")
 val azureResourcesFinalDir = File(buildDir, "$azureFunctionsDir/$azureAppName")
 tasks.register<Copy>("gatherAzureResources") {
+    dependsOn("generateVersionFile")
     from("./")
     into(azureResourcesTmpDir)
     include("metadata/**/*.yml")
@@ -509,6 +524,7 @@ tasks.register<Copy>("gatherAzureResources") {
     include("metadata/**/*.csv")
     include("settings/**/*.yml")
     include("assets/**/*__inline.html")
+    include("version.json")
 }
 
 tasks.register("copyAzureResources") {

prime-router/docs/standard-operating-procedures/adding-conformance-profile.md

@@ -107,7 +107,7 @@ v251. That presents the opportunity for reuse.
 
 1. Review existing data type mappings located in `prime-router/metadata/HL7/datatypes/` for reuse
 2. Add folder to `prime-router/metadata/HL7/` with a name indicating the new conformance profile
-3. Copy folder `fhir` from `prime-router/metadata/HL7/v251-elr` and add to your new mapping folder.
+3. Copy folder `fhir` from `prime-router/metadata/HL7/catchall` and add to your new mapping folder.
 4. Create folder `hl7` in your new mapping folder with the following sub-folders:
     - "message" - **required** - within that, add a yml file named with the HL7 message type (ex ORU_R01, ORM_O01,  
       ADT_A01, etc.)