Turn sinkFhirServerUrl off by default but on in e2e (#1075)

google · May 30, 2024 · 2290aa3 · 2290aa3
1 parent c1dd688
commit 2290aa3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -132,6 +132,7 @@ steps:
   env:
     - PIPELINE_CONFIG=/workspace/docker/config
     - DWH_ROOT=/workspace/e2e-tests/controller-spark/dwh
+    - FHIRDATA_SINKFHIRSERVERURL=http://sink-server:8080/fhir
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '-d' ]
 

diff --git a/docker/compose-controller-spark-sql-single.yaml b/docker/compose-controller-spark-sql-single.yaml
@@ -62,6 +62,8 @@ services:
       - ${DWH_ROOT}:/dwh
     environment:
       - JAVA_OPTS=$JAVA_OPTS
+      # This is to turn this on in e2e but leave it off in the default config.
+      - FHIRDATA_SINKFHIRSERVERURL=$FHIRDATA_SINKFHIRSERVERURL
     ports:
       - '8090:8080'
     networks:

diff --git a/docker/config/application.yaml b/docker/config/application.yaml
@@ -43,7 +43,7 @@ fhirdata:
   rowGroupSizeForParquetFiles: 33554432   # 32mb
   viewDefinitionsDir: "config/views"
   sinkDbConfigPath: "config/hapi-postgres-config_local_views.json"
-  sinkFhirServerUrl: "http://sink-server:8080/fhir"
+  #sinkFhirServerUrl: "http://sink-server:8080/fhir"
   #sinkUserName: "hapi"
   #sinkPassword: "hapi123"
   recursiveDepth: 1

diff --git a/pipelines/controller/config/application.yaml b/pipelines/controller/config/application.yaml
@@ -167,8 +167,9 @@ fhirdata:
   # empty string disables this feature.
   sinkDbConfigPath: "config/hapi-postgres-config_local_views.json"
 
-  # The base URL of the sink FHIR  server .if not set ,only a parquet DWH is created
-  sinkFhirServerUrl: "http://172.17.0.1:8098/fhir"
+  # The base URL of the sink FHIR server. If not set, the feature for sending
+  # resources to a sink FHIR server is disabled.
+  #sinkFhirServerUrl: "http://172.17.0.1:8098/fhir"
   # The following user-name/password should be set if the sink FHIR server supports Basic Auth.
   #sinkUserName: "hapi"
   #sinkPassword: "hapi123"

diff --git a/pipelines/streaming/pom.xml b/pipelines/streaming/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2020-2023 Google LLC
+    Copyright 2020-2024 Google LLC
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.