From 3b9e099d4b61aa252a340be326fe56e0f745a703 Mon Sep 17 00:00:00 2001 From: Kyle Pettigrew Date: Wed, 20 Mar 2024 09:20:02 +1000 Subject: [PATCH] corrected manifest alphanumeric conditions --- .env.production | 10 +++++----- config/nginx.background.conf | 2 +- config/nginx.conf | 2 +- docker-compose.background.yml | 4 ++-- docker-compose.production.yml | 2 +- docker-compose.yml | 6 +++--- .../manifests/inferno/validator-service.service.yaml | 2 +- .../generated/v0.3.0-ballot/au_core_test_suite.rb | 2 +- lib/au_core_test_kit/generator/templates/suite.rb.erb | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.env.production b/.env.production index 19b2f1a0..0aa9b96d 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,6 @@ REDIS_URL=redis://redis:6379/0 -V311_VALIDATOR_URL=http://validator_service:4567 -V400_VALIDATOR_URL=http://validator_service:4567 -V501_VALIDATOR_URL=http://validator_service:4567 -V610_VALIDATOR_URL=http://validator_service:4567 -V700_BALLOT_VALIDATOR_URL=http://validator_service:4567 \ No newline at end of file +V311_VALIDATOR_URL=http://validator-service:4567 +V400_VALIDATOR_URL=http://validator-service:4567 +V501_VALIDATOR_URL=http://validator-service:4567 +V610_VALIDATOR_URL=http://validator-service:4567 +V700_BALLOT_VALIDATOR_URL=http://validator-service:4567 \ No newline at end of file diff --git a/config/nginx.background.conf b/config/nginx.background.conf index f8974720..05385334 100644 --- a/config/nginx.background.conf +++ b/config/nginx.background.conf @@ -80,7 +80,7 @@ http { proxy_buffering off; proxy_cache off; - proxy_pass http://validator_service:4567/; + proxy_pass http://validator-service:4567/; } } } diff --git a/config/nginx.conf b/config/nginx.conf index af4b4614..a0a19d99 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -95,7 +95,7 @@ http { proxy_buffering off; proxy_cache off; - proxy_pass http://validator_service:4567/; + proxy_pass http://validator-service:4567/; } } } diff --git a/docker-compose.background.yml b/docker-compose.background.yml index 7b4ce833..a303ffb8 100644 --- a/docker-compose.background.yml +++ b/docker-compose.background.yml @@ -1,6 +1,6 @@ version: '3' services: - validator_service: + validator-service: image: infernocommunity/fhir-validator-service environment: TX_SERVER_URL: http://tx.test.hl7.org.au/fhir @@ -10,7 +10,7 @@ services: fhir_validator_app: image: infernocommunity/fhir-validator-app depends_on: - - validator_service + - validator-service environment: EXTERNAL_VALIDATOR_URL: http://localhost/validatorapi VALIDATOR_BASE_PATH: /validator diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 1b99a924..2a59236f 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,5 +1,5 @@ version: '3' services: - validator_service: + validator-service: environment: TX_SERVER_URL: http://tx.fhir.org diff --git a/docker-compose.yml b/docker-compose.yml index c9376078..934c5873 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: volumes: - ./data:/opt/inferno/data depends_on: - - validator_service + - validator-service worker: build: context: ./ @@ -15,10 +15,10 @@ services: command: bundle exec sidekiq -r ./worker.rb depends_on: - redis - validator_service: + validator-service: extends: file: docker-compose.background.yml - service: validator_service + service: validator-service fhir_validator_app: extends: file: docker-compose.background.yml diff --git a/infra/modules/au_fhir_inferno/manifests/inferno/validator-service.service.yaml b/infra/modules/au_fhir_inferno/manifests/inferno/validator-service.service.yaml index 2d4304ed..c7119776 100644 --- a/infra/modules/au_fhir_inferno/manifests/inferno/validator-service.service.yaml +++ b/infra/modules/au_fhir_inferno/manifests/inferno/validator-service.service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: validator_service + name: validator-service namespace: ${namespace} spec: type: NodePort diff --git a/lib/au_core_test_kit/generated/v0.3.0-ballot/au_core_test_suite.rb b/lib/au_core_test_kit/generated/v0.3.0-ballot/au_core_test_suite.rb index 2c6777f4..ede921bc 100644 --- a/lib/au_core_test_kit/generated/v0.3.0-ballot/au_core_test_suite.rb +++ b/lib/au_core_test_kit/generated/v0.3.0-ballot/au_core_test_suite.rb @@ -60,7 +60,7 @@ def self.metadata end validator do - url ENV.fetch('V030_BALLOT_VALIDATOR_URL', 'http://validator_service:4567') + url ENV.fetch('V030_BALLOT_VALIDATOR_URL', 'http://validator-service:4567') message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS exclude_message do |message| diff --git a/lib/au_core_test_kit/generator/templates/suite.rb.erb b/lib/au_core_test_kit/generator/templates/suite.rb.erb index 828e17fd..2da94bcc 100644 --- a/lib/au_core_test_kit/generator/templates/suite.rb.erb +++ b/lib/au_core_test_kit/generator/templates/suite.rb.erb @@ -40,7 +40,7 @@ module AUCoreTestKit end validator do - url ENV.fetch('<%= validator_env_name %>', 'http://validator_service:4567') + url ENV.fetch('<%= validator_env_name %>', 'http://validator-service:4567') message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS exclude_message do |message|