fix

cloudbuild.yaml

@@ -123,11 +123,6 @@ steps:
   env:
     - PIPELINE_CONFIG=/workspace/docker/config
     - DWH_ROOT=/workspace/e2e-tests/controller-spark/dwh
-    # - FHIRDATA_SINKFHIRSERVERURL=
-    # - FHIRDATA_NUMTHREADS=-1
-    # - FHIRDATA_SINKDBCONFIGPATH=config/hapi-postgres-config_local_views.json
-    # - FHIRDATA_CREATEHIVERESOURCETABLES=true
-    # - FHIRDATA_CREATEPARQUETDWH=true
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '-d' ]
 
@@ -150,7 +145,7 @@ steps:
 
 # Resetting Sink FHIR server
 - name: 'docker/compose'
-  id: 'Turn down HAPI Source and Sink FHIR Servers for FHIR server to FHIR server sync'
+  id: 'Turn down HAPI Sink FHIR Server for FHIR server to FHIR server sync'
   args: [ '-f', './docker/sink-compose.yml', 'down' ,'-v']
 
 - name: 'docker/compose'
@@ -163,11 +158,6 @@ steps:
   env:
     - PIPELINE_CONFIG=/workspace/docker/config_fhir_sink
     - DWH_ROOT=/workspace/e2e-tests/controller-spark/dwh
-    # - FHIRDATA_SINKFHIRSERVERURL="http://sink-server:8080/fhir"
-    # - FHIRDATA_NUMTHREADS=1
-    # - FHIRDATA_SINKDBCONFIGPATH=""
-    # - FHIRDATA_CREATEHIVERESOURCETABLES=false
-    # - FHIRDATA_CREATEPARQUETDWH=false
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '--no-deps' , '-d' ,'pipeline-controller' ]
 

docker/compose-controller-spark-sql-single.yaml

@@ -62,12 +62,7 @@ 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
-      # - FHIRDATA_NUMTHREADS=$FHIRDATA_NUMTHREADS
-      # - FHIRDATA_SINKDBCONFIGPATH=$FHIRDATA_SINKDBCONFIGPATH
-      # - FHIRDATA_CREATEHIVERESOURCETABLES=$FHIRDATA_CREATEHIVERESOURCETABLES
-      # - FHIRDATA_CREATEPARQUETDWH=$FHIRDATA_CREATEPARQUETDWH
+
     ports:
       - '8090:8080'
     networks:
@@ -92,12 +87,6 @@ services:
       - '4041:4040'
     volumes:
       - ${DWH_ROOT}:/dwh
-      # NON-EMBEDDED METASTORE CONFIG:
-      # If you want to persist the Metastore data, e.g., table and view
-      # definitions, you can use an external database by adjusting hive-site.xml
-      #- ./hive-site_example.xml:/opt/bitnami/spark/conf/hive-site.xml
-      # Note to use an external DB, you need to provide its driver jar too:
-      #- ./postgresql-42.6.0.jar:/opt/bitnami/spark/jars/postgresql-42.6.0.jar
       - spark_vol_single:/opt/bitnami/spark
     networks:
       - cloudbuild

docker/sink-compose.yml

@@ -14,19 +14,6 @@
 
 version: '2.4'
 services:
-  sink-db:
-    image: postgres
-    container_name: sink-fhir-db
-    restart: always
-    ports:
-      - "5433:5432"
-    environment:
-      POSTGRES_DB: 'hapi'
-      POSTGRES_USER: 'admin'
-      POSTGRES_PASSWORD: 'admin'
-    volumes:
-      - sink-fhir-db:/var/lib/postgresql/data
-
   sink-server:
     image: "hapiproject/hapi:latest"
     container_name: sink-server
@@ -36,12 +23,6 @@ services:
       - hapi.fhir.enforce_referential_integrity_on_delete=false
       - hapi.fhir.enforce_referential_integrity_on_write=false
       - hapi.fhir.client_id_strategy=ANY
-      - spring.datasource.url=jdbc:postgresql://sink-db:5432/hapi
-      - spring.datasource.username=admin
-      - spring.datasource.password=admin
-      - spring.datasource.driverClassName=org.postgresql.Driver
-      - spring.jpa.properties.hibernate.dialect=ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect
-      - hapi.fhir.bulk_export_enabled=true
     restart: unless-stopped
     ports:
       - 8098:8080
@@ -50,7 +31,7 @@ services:
 
 volumes:
   hapi-data:
-  sink-fhir-db:
+
 
 networks:
   default: