From a495ec84d7996cc043fba4a66365cbb5aa74c509 Mon Sep 17 00:00:00 2001 From: Dylan Hall Date: Fri, 3 May 2024 12:21:13 -0400 Subject: [PATCH] Standardize validator env var (#25) * Standardize validator environment variable * reset inadvertent change --- .env | 1 - .env.development | 2 +- .env.production | 2 +- .env.test | 2 +- lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb | 2 -- lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb | 2 -- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 4bf2629..3310b13 100644 --- a/.env +++ b/.env @@ -1,5 +1,4 @@ JS_HOST="" -BULK_DATA_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500 REDIS_URL=redis://redis:6379/0 # Full path to a custom JWKS json file, will use lib/bulk_data_test_kit/bulk_data_jwks.json if left blank diff --git a/.env.development b/.env.development index b4b6a61..ff74c7c 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ -BULK_DATA_FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi +FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi REDIS_URL=redis://localhost:6379/0 INFERNO_HOST=http://localhost:4567 \ No newline at end of file diff --git a/.env.production b/.env.production index 31acf39..6dc9b39 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ REDIS_URL=redis://redis:6379/0 -BULK_DATA_FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500 +FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500 INFERNO_HOST=http://localhost \ No newline at end of file diff --git a/.env.test b/.env.test index 74968ce..1545bfc 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +1,2 @@ -BULK_DATA_VALIDATOR_URL=https://example.com/validatorapi +FHIR_RESOURCE_VALIDATOR_URL=https://example.com/validatorapi ASYNC_JOBS=false diff --git a/lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb b/lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb index e7b9b4d..d6ec5cd 100644 --- a/lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb +++ b/lib/bulk_data_test_kit/v1.0.1/bulk_data_test_suite.rb @@ -33,8 +33,6 @@ class BulkDataTestSuite < Inferno::TestSuite VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze fhir_resource_validator do - url ENV.fetch('BULK_DATA_FHIR_RESOURCE_VALIDATOR_URL', 'http://hl7_validator_service:3500') - message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS $num_messages = 0 diff --git a/lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb b/lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb index f6a6f27..76586f7 100644 --- a/lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb +++ b/lib/bulk_data_test_kit/v2.0.0/bulk_data_test_suite.rb @@ -33,8 +33,6 @@ class BulkDataTestSuite < Inferno::TestSuite VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze fhir_resource_validator do - url ENV.fetch('BULK_DATA_FHIR_RESOURCE_VALIDATOR_URL', 'http://hl7_validator_service:3500') - message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS $num_messages = 0