Use default validator env var (#173)

inferno-framework · May 3, 2024 · 86bd34a · 86bd34a
1 parent 9477217
commit 86bd34a
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 21 deletions.
diff --git a/.env.development b/.env.development
@@ -1,7 +1,3 @@
-V311_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
-V400_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
-V501_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
-V610_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
-V700_BALLOT_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
+FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
 INFERNO_HOST=http://localhost:4567
 REDIS_URL=redis://localhost:6379/0
diff --git a/.env.production b/.env.production
@@ -1,7 +1,3 @@
 REDIS_URL=redis://redis:6379/0
 INFERNO_HOST=http://localhost
-V311_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
-V400_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
-V501_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
-V610_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
-V700_BALLOT_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
+FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,8 @@ services:
     volumes:
       - ./data:/opt/inferno/data
     depends_on:
-      - validator_service
+      - hl7_validator_service
+      # - validator_service
   worker:
     build:
       context: ./

diff --git a/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb
diff --git a/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb
diff --git a/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb
diff --git a/lib/us_core_test_kit/generated/v6.1.0/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v6.1.0/us_core_test_suite.rb
diff --git a/lib/us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite.rb
diff --git a/lib/us_core_test_kit/generator/suite_generator.rb b/lib/us_core_test_kit/generator/suite_generator.rb
@@ -57,10 +57,6 @@ def title
         "US Core #{ig_metadata.ig_version}"
       end
 
-      def validator_env_name
-        "#{ig_metadata.reformatted_version.upcase}_FHIR_RESOURCE_VALIDATOR_URL"
-      end
-
       def ig_identifier
         version = ig_metadata.ig_version[1..] # Remove leading 'v'
         "hl7.fhir.us.core##{version}"

diff --git a/lib/us_core_test_kit/generator/templates/suite.rb.erb b/lib/us_core_test_kit/generator/templates/suite.rb.erb
@@ -53,7 +53,6 @@ module USCoreTestKit
       id :<%= suite_id %>
 
       fhir_resource_validator do
-        url ENV.fetch('<%= validator_env_name %>', 'http://hl7_validator_service:3500')
         igs '<%= ig_identifier %>'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS