From 2290aa38c9211662eb04a9f51923afaac729e20f Mon Sep 17 00:00:00 2001
From: Bashir Sadjad <bashir@google.com>
Date: Thu, 30 May 2024 14:13:38 -0400
Subject: [PATCH] Turn sinkFhirServerUrl off by default but on in e2e (#1075)

---
 cloudbuild.yaml                                 | 1 +
 docker/compose-controller-spark-sql-single.yaml | 2 ++
 docker/config/application.yaml                  | 2 +-
 pipelines/controller/config/application.yaml    | 5 +++--
 pipelines/streaming/pom.xml                     | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 67c2e5079..174176fbe 100644
--- 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
index 83896375e..503468e7e 100644
--- 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
index 83295dc7c..8922464cf 100644
--- 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
index 81c63eae9..3122c1b8e 100644
--- 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
index 1371e8f2e..b894c832e 100644
--- 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.