Skip to content

Commit

Permalink
turn sinkFhirServerUrl off by default but on in e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
bashir2 committed May 29, 2024
1 parent c1dd688 commit bf5d56e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]

Expand Down
2 changes: 2 additions & 0 deletions docker/compose-controller-spark-sql-single.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/config/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pipelines/controller/config/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ 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
# 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"
Expand Down

0 comments on commit bf5d56e

Please sign in to comment.