Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use default validator env var #173

Merged
merged 1 commit into from
May 3, 2024
Merged

Use default validator env var #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ services:
volumes:
- ./data:/opt/inferno/data
depends_on:
- validator_service
- hl7_validator_service
# - validator_service
worker:
build:
context: ./
Expand Down
1 change: 0 additions & 1 deletion lib/us_core_test_kit/generated/v3.1.1/us_core_test_suite.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/us_core_test_kit/generated/v6.1.0/us_core_test_suite.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions lib/us_core_test_kit/generator/suite_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion lib/us_core_test_kit/generator/templates/suite.rb.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading