Merge branch 'main' into use-inject-for-non-singleton-class

CDCgov · Dec 2, 2024 · c46e4e1 · c46e4e1
2 parents 4adaa27 + 364c460
commit c46e4e1
Showing 14 changed files with 38 additions and 27 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -33,10 +33,7 @@
                 "org.apache.httpcomponents.client5:httpclient5-fluent"
             ],
             "allowedVersions": "!/^5\\.3$/"
-        },
-        {
-            "matchPackageNames": ["com.azure:azure-identity"],
-            "allowedVersions": "!/^1\\.14\\.[0-1]$/"
-        }],
+        }
+    ],
     "pinDigests": false
 }
diff --git a/README.md b/README.md
@@ -157,12 +157,12 @@ the swarm parameters for the test and the local url where the app is running
 
 #### Attached JVM Config for IntelliJ
 
-The project comes with an attached remote jvm configuration for debuging the container.
+The project comes with an attached remote jvm configuration for debugging the container.
 If you check your remote JVM settings, under `Run/Edit Configurations`,
 you will see the `Debug TI`. If you want to add a new remote JVM configuration, follow the steps below,
-under "**Docker Container Debugging Using Java Debug Wire Protocal**"
+under "**Docker Container Debugging Using Java Debug Wire Protocol**"
 
-#### Docker Container Debugging Using Java Debug Wire Protocal (JDWP)
+#### Docker Container Debugging Using Java Debug Wire Protocol (JDWP)
 
 Go into the `Dockerfile` file and change `CMD ["java", "-jar", "app.jar"]` to `CMD ["java", "-agentlib:jdwp=transport=dt_socket,address=*:6006,server=y,suspend=n", "-jar", "app.jar"]`
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation 'com.openpojo:openpojo:0.9.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.3'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.4'
 }
 
 jacocoTestCoverageVerification {

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.25.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'org.cyclonedx.bom' version '1.10.0'
-    id 'org.sonarqube' version '6.0.0.5145'
+    id 'org.sonarqube' version '6.0.1.5171'
 }
 
 dependencies {

diff --git a/e2e/build.gradle b/e2e/build.gradle
@@ -15,8 +15,8 @@ dependencies {
     implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.4.1'
 
     //jackson
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
 
     //fhir
     implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.6.0'

diff --git a/etor/build.gradle b/etor/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation 'com.openpojo:openpojo:0.9.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.3'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.4'
 }
 
 jacocoTestCoverageVerification {

diff --git a/operations/environments/dev/main.tf b/operations/environments/dev/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.11.0"
+      version = "4.12.0"
     }
   }
 

diff --git a/operations/environments/internal/main.tf b/operations/environments/internal/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.11.0"
+      version = "4.12.0"
     }
   }
 

diff --git a/operations/environments/pr/main.tf b/operations/environments/pr/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.11.0"
+      version = "4.12.0"
     }
   }
 

diff --git a/operations/environments/prd/main.tf b/operations/environments/prd/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.11.0"
+      version = "4.12.0"
     }
   }
 

diff --git a/operations/environments/stg/main.tf b/operations/environments/stg/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.11.0"
+      version = "4.12.0"
     }
   }
 

diff --git a/rs-e2e/build.gradle b/rs-e2e/build.gradle
@@ -14,8 +14,8 @@ dependencies {
     testImplementation testFixtures(project(':shared'))
 
     //jackson
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
 
     // azure
     implementation 'com.azure:azure-storage-blob:12.29.0'
@@ -36,4 +36,9 @@ tasks.named('test') {
 task automatedTest(type: Test) {
     useJUnitPlatform()
     include '**/AutomatedTest.*'
+
+    testLogging {
+        showStackTraces true
+        exceptionFormat 'full'
+    }
 }
diff --git a/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/AutomatedTest.groovy b/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/AutomatedTest.groovy
@@ -19,6 +19,7 @@ class AutomatedTest extends Specification  {
     AssertionRuleEngine engine
     HapiHL7FileMatcher fileMatcher
     Logger mockLogger = Mock(Logger)
+    List<String> loggedErrorsAndWarnings = []
 
     def setup() {
         engine = AssertionRuleEngine.getInstance()
@@ -35,6 +36,13 @@ class AutomatedTest extends Specification  {
         TestApplicationContext.register(LocalFileFetcher, LocalFileFetcher.getInstance())
         TestApplicationContext.injectRegisteredImplementations()
 
+        mockLogger.logWarning(_ as String, _ as Object) >> { String msg, Object args ->
+            loggedErrorsAndWarnings << msg
+        }
+        mockLogger.logError(_ as String, _ as Exception) >> { String msg, Exception e ->
+            loggedErrorsAndWarnings << msg
+        }
+
         FileFetcher azureFileFetcher = AzureBlobFileFetcher.getInstance()
         azureFiles = azureFileFetcher.fetchFiles()
 
@@ -65,7 +73,8 @@ class AutomatedTest extends Specification  {
 
         then:
         rulesToEvaluate.collect { it.name }.isEmpty() //Check whether all the rules in the assertions file have been run
-        0 * mockLogger.logError(_ as String, _ as Exception)
-        0 * mockLogger.logWarning(_ as String)
+        if (!loggedErrorsAndWarnings.isEmpty()) {
+            throw new AssertionError("Unexpected errors and/or warnings were logged:\n- ${loggedErrorsAndWarnings.join('\n- ')}")
+        }
     }
 }
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -22,10 +22,10 @@ dependencies {
     implementation 'net.logstash.logback:logstash-logback-encoder:8.0'
 
     //jackson
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'
 
     // hapi fhir
     api 'ca.uhn.hapi.fhir:hapi-fhir-base:7.6.0'
@@ -55,7 +55,7 @@ dependencies {
     testFixturesImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testFixturesImplementation 'com.openpojo:openpojo:0.9.1'
-    testFixturesImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.3'
+    testFixturesImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.4'
 
     // dotenv-java
     implementation 'io.github.cdimascio:dotenv-java:3.0.2'