Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn sinkFhirServerUrl off by default but on in e2e #1075

Merged
merged 2 commits into from
May 30, 2024
Merged

Turn sinkFhirServerUrl off by default but on in e2e #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd8c81
turn sinkFhirServerUrl off by default but on in e2e
bashir2 May 29, 2024
de5808d
review comments and a minor date update
bashir2 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cloudbuild.yaml
View file
Open in desktop
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
View file
Open in desktop
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
bashir2 marked this conversation as resolved.
Show resolved Hide resolved
ports:
- '8090:8080'
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker/config/application.yaml
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions pipelines/controller/config/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pipelines/streaming/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Loading