use new inferno-resource-validator docker image, remove custom docker…

…file
onc-healthit · Mar 7, 2024 · 6364702 · 6364702
1 parent 07fec59
commit 6364702
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 48 deletions.
diff --git a/Dockerfile.fhir_resource_validator b/Dockerfile.fhir_resource_validator
diff --git a/docker-compose.background.yml b/docker-compose.background.yml
@@ -29,12 +29,7 @@ services:
       - ./data/redis:/data
     command: redis-server --appendonly yes
   # hl7_validator_service:
-  #   image: markiantorno/validator-wrapper
-  #   # If running on the MITRE network, comment out the "image" line above
-  #   # and uncomment the "build" section below
-  #   # build:
-  #   #   context: .
-  #   #   dockerfile: Dockerfile.fhir_resource_validator
+  #   image: infernocommunity/inferno-resource-validator
   #   volumes:
   #     - ./lib/onc_certification_g10_test_kit/igs:/home/igs
   #     # To let the service share your local FHIR package cache,

diff --git a/lib/onc_certification_g10_test_kit.rb b/lib/onc_certification_g10_test_kit.rb
@@ -69,7 +69,8 @@ class G10CertificationSuite < Inferno::TestSuite
       /\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/,
       /\A\S+: \S+: The Coding provided \(\S*\) was not found in the value set/,
       /\A\S+: \S+: A definition for CodeSystem '.*' could not be found, so the code cannot be validated/,
-      /\A\S+: \S+: URL value '.*' does not resolve/
+      /\A\S+: \S+: URL value '.*' does not resolve/,
+      /\A\S+: \S+: .*\[No server available\]/  # Catch-all for certain errors when TX server is disabled
     ].freeze
 
     def self.setup_validator(us_core_version_requirement) # rubocop:disable Metrics/CyclomaticComplexity

diff --git a/lib/onc_certification_g10_test_kit/configuration_checker.rb b/lib/onc_certification_g10_test_kit/configuration_checker.rb
@@ -3,7 +3,7 @@
 module ONCCertificationG10TestKit
   class ConfigurationChecker
     EXPECTED_VALIDATOR_VERSION = '2.3.2'.freeze
-    EXPECTED_HL7_VALIDATOR_VERSION = '"6.2.16-SNAPSHOT"'.freeze
+    EXPECTED_HL7_VALIDATOR_VERSION = '"6.3.0"'.freeze
 
     def configuration_messages
       validator_version_message + terminology_messages + version_message