Release 5.4.0 (#511)

* bump version * use default validator env var * use us core release branch * bump core * remove validator service from docker-compose and nginx * use final us core release * use final version * update matrix * update changelog * remove practitioner search tests from short id map
onc-healthit · May 7, 2024 · 38bd49a · 38bd49a
1 parent 4cb3a11
commit 38bd49a
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 50 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,6 @@
 JS_HOST=""
 G10_VALIDATOR_URL=http://validator_service:4567
-G10_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
+FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
 REDIS_URL=redis://redis:6379/0
 
 USE_HL7_RESOURCE_VALIDATOR=true

diff --git a/.env.development b/.env.development
@@ -1,9 +1,5 @@
 G10_VALIDATOR_URL=http://localhost/validatorapi
-G10_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
-V311_VALIDATOR_URL=http://localhost/validatorapi
-V400_VALIDATOR_URL=http://localhost/validatorapi
-V501_VALIDATOR_URL=http://localhost/validatorapi
-V610_VALIDATOR_URL=http://localhost/validatorapi
+FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
 VALIDATOR_URL=http://localhost/validatorapi
 REDIS_URL=redis://localhost:6379/0
 INFERNO_HOST=http://localhost:4567
diff --git a/.env.production b/.env.production
@@ -1,6 +1,5 @@
 REDIS_URL=redis://redis:6379/0
 G10_VALIDATOR_URL=http://validator_service:4567
 VALIDATOR_URL=http://validator_service:4567
-G10_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
 FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
 INFERNO_HOST=http://localhost
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 5.4.0
+* Increase validator version (#509).
+* Remove Practitioner search tests (#510).
+* Fix Must Support primitive extensions not being recognized (#411).
+
 # 5.3.0
 
 * Use HL7 validator wrapper (#488).

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    onc_certification_g10_test_kit (5.3.0)
+    onc_certification_g10_test_kit (5.4.0)
       bloomer (~> 1.0.0)
       colorize (~> 0.8.1)
       inferno_core (~> 0.4.34)
@@ -11,7 +11,7 @@ PATH
       rubyzip (~> 2.3.2)
       smart_app_launch_test_kit (= 0.4.2)
       tls_test_kit (= 0.2.1)
-      us_core_test_kit (= 0.6.5)
+      us_core_test_kit (= 0.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -30,6 +30,7 @@ GEM
     base64 (0.2.0)
     bcp47 (0.3.3)
       i18n
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     bitarray (1.3.1)
     bloomer (1.0.0)
@@ -161,7 +162,7 @@ GEM
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    inferno_core (0.4.34)
+    inferno_core (0.4.35)
       activesupport (~> 6.1.7.5)
       base62-rb (= 0.3.1)
       blueprinter (= 0.25.2)
@@ -200,32 +201,33 @@ GEM
       base64
     kramdown (2.4.0)
       rexml
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0305)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.4.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
     mustermann (1.1.2)
       ruby2_keywords (~> 0.0.1)
     mustermann-contrib (1.1.2)
       hansi (~> 0.2.0)
       mustermann (= 1.1.2)
     ndjson (1.0.0)
     netrc (0.11.0)
-    nio4r (2.7.1)
-    nokogiri (1.16.3)
+    nio4r (2.7.2)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.3-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-darwin)
+    nokogiri (1.16.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -245,7 +247,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (5.6.8)
       nio4r (~> 2.0)
     racc (1.7.3)
@@ -333,7 +335,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
-    us_core_test_kit (0.6.5)
+    us_core_test_kit (0.7.0)
       inferno_core (>= 0.4.2)
       smart_app_launch_test_kit (>= 0.4.0)
       tls_test_kit (~> 0.2.0)

diff --git a/config/nginx.background.conf b/config/nginx.background.conf
@@ -68,20 +68,20 @@ http {
     #   proxy_pass http://fhir_validator_app;
     # }
 
-    location /validatorapi/ {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Port $server_port;
-      proxy_redirect off;
-      proxy_set_header Connection '';
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
-      proxy_buffering off;
-      proxy_cache off;
-
-      proxy_pass http://validator_service:4567/;
-    }
+    # location /validatorapi/ {
+    #   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #   proxy_set_header Host $http_host;
+    #   proxy_set_header X-Forwarded-Proto $scheme;
+    #   proxy_set_header X-Forwarded-Port $server_port;
+    #   proxy_redirect off;
+    #   proxy_set_header Connection '';
+    #   proxy_http_version 1.1;
+    #   chunked_transfer_encoding off;
+    #   proxy_buffering off;
+    #   proxy_cache off;
+
+    #   proxy_pass http://validator_service:4567/;
+    # }
 
 
 # To enable the HL7 Validator Wrapper, both the section below and

diff --git a/docker-compose.background.yml b/docker-compose.background.yml
@@ -1,12 +1,12 @@
 version: '3'
 services:
-  validator_service:
-    image: infernocommunity/fhir-validator-service:v2.3.2
-    environment:
-      - DISABLE_TX= true
-      - DISPLAY_ISSUES_ARE_WARNINGS=true
-    volumes:
-      - ./lib/onc_certification_g10_test_kit/igs:/home/igs
+  # validator_service:
+  #   image: infernocommunity/fhir-validator-service:v2.3.2
+  #   environment:
+  #     - DISABLE_TX= true
+  #     - DISPLAY_ISSUES_ARE_WARNINGS=true
+  #   volumes:
+  #     - ./lib/onc_certification_g10_test_kit/igs:/home/igs
   # fhir_validator_app:
   #   image: infernocommunity/fhir-validator-app
   #   depends_on:

diff --git a/lib/onc_certification_g10_test_kit.rb b/lib/onc_certification_g10_test_kit.rb
@@ -82,8 +82,6 @@ def self.setup_validator(us_core_version_requirement) # rubocop:disable Metrics/
 
       validator_method.call :default, required_suite_options: us_core_version_requirement do
         if Feature.use_hl7_resource_validator?
-          url ENV.fetch('G10_FHIR_RESOURCE_VALIDATOR_URL', 'http://hl7_validator_service:3500')
-
           cli_context do
             txServer nil
             displayWarnings true

diff --git a/lib/onc_certification_g10_test_kit/short_id_map.yml b/lib/onc_certification_g10_test_kit/short_id_map.yml
@@ -1341,8 +1341,6 @@ g10_certification-g10_single_patient_us_core_5_api-us_core_v501_organization-us_
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_organization-us_core_v501_organization_must_support_test: 6.37.03
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner: '6.38'
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner-us_core_v501_practitioner_read_test: 6.38.01
-g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner-us_core_v501_practitioner_name_search_test: 6.38.04
-g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner-us_core_v501_practitioner_identifier_search_test: 6.38.05
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner-us_core_v501_practitioner_validation_test: 6.38.02
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_practitioner-us_core_v501_practitioner_must_support_test: 6.38.03
 g10_certification-g10_single_patient_us_core_5_api-us_core_v501_provenance: '6.39'
@@ -1890,8 +1888,6 @@ g10_certification-g10_single_patient_us_core_6_api-us_core_v610_organization-us_
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_organization-us_core_v610_organization_must_support_test: 10.40.03
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner: '10.41'
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner-us_core_v610_practitioner_read_test: 10.41.01
-g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner-us_core_v610_practitioner_name_search_test: 10.41.04
-g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner-us_core_v610_practitioner_identifier_search_test: 10.41.05
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner-us_core_v610_practitioner_validation_test: 10.41.02
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_practitioner-us_core_v610_practitioner_must_support_test: 10.41.03
 g10_certification-g10_single_patient_us_core_6_api-us_core_v610_provenance: '10.42'

diff --git a/lib/onc_certification_g10_test_kit/version.rb b/lib/onc_certification_g10_test_kit/version.rb
@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.4.0'.freeze
 end
diff --git a/onc_certification_g10_matrix.xlsx b/onc_certification_g10_matrix.xlsx
diff --git a/onc_certification_g10_test_kit.gemspec b/onc_certification_g10_test_kit.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rubyzip', '~> 2.3.2'
   spec.add_runtime_dependency 'smart_app_launch_test_kit', '0.4.2'
   spec.add_runtime_dependency 'tls_test_kit', '0.2.1'
-  spec.add_runtime_dependency 'us_core_test_kit', '0.6.5'
+  spec.add_runtime_dependency 'us_core_test_kit', '0.7.0'
   spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8'
   spec.add_development_dependency 'factory_bot', '~> 6.1'
   spec.add_development_dependency 'rspec', '~> 3.10'