Merge branch 'main' into story/1396/4XX-error-alerts

CDCgov · Oct 23, 2024 · d5b6119 · d5b6119
2 parents 13175bb + 134e405
commit d5b6119
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.pr_agent.toml b/.pr_agent.toml
@@ -18,7 +18,7 @@ pr_actions = ["opened", "reopened", "ready_for_review", "review_requested"]
 # general options
 num_code_suggestions=3 # Number of code suggestions provided by the 'review' tool. Default is 0, meaning no code suggestions will be provided by the `review` tool.
 inline_code_comments = true # If set to true, the tool will publish the code suggestions as comments on the code diff. Default is false. Note that you need to set `num_code_suggestions`>0 to get code suggestions
-ask_and_reflect=false
+ask_and_reflect=true
 persistent_comment=false
 #automatic_review=true
 extra_instructions = "" # Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".

diff --git a/e2e/build.gradle b/e2e/build.gradle
@@ -19,10 +19,10 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.0'
 
     //fhir
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.4'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.4'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.4'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.4.4'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.5'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.5'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.5'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.4.5'
     implementation 'org.fhir:ucum:1.0.8'
 
     testImplementation 'org.apache.groovy:groovy:4.0.23'

diff --git a/operations/template/alert.tf b/operations/template/alert.tf
@@ -31,7 +31,7 @@ resource "azurerm_monitor_action_group" "notify_slack_email" {
 resource "azurerm_monitor_activity_log_alert" "azure_service_health_alert" {
   count               = local.non_pr_environment ? 1 : 0
   name                = "cdcti-${var.environment}-azure-status-alert"
-  location            = data.azurerm_resource_group.group.location
+  location            = "global"
   resource_group_name = data.azurerm_resource_group.group.name
   scopes              = ["/subscriptions/${data.azurerm_client_config.current.subscription_id}"]
 

diff --git a/shared/build.gradle b/shared/build.gradle
@@ -28,10 +28,10 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0'
 
     // hapi fhir
-    api 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.4'
-    api 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.4'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.4'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.4.4'
+    api 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.5'
+    api 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.5'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.5'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.4.5'
     api 'org.fhir:ucum:1.0.8'
 
     // hapi hl7