corrected manifest alphanumeric conditions

hl7au · Mar 19, 2024 · 3b9e099 · 3b9e099
1 parent e74aaeb
commit 3b9e099
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git 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
+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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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|