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.

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

set environment variables needed for the focus blaze-and-sql endpoint to work when fhir2sql is enabled #246

Merged
merged 10 commits into from
Dec 11, 2024

Conversation

davidmscholz
Copy link
Contributor

No description provided.

Copy link
Member

@Threated Threated left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might want to change the title of this PR to something more generic as this is not the only change from this PR

Comment on lines 104 to 110
ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would appreciate if this could make it into main with this PR. But we can move it to the next merge. It would add the PPI and it should not break anything.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like it to be in a different PR for transparency reasons. However, we could merge them at the same-ish time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

agreed, move to different PR

lablans
lablans previously requested changes Nov 8, 2024
focus:
environment:
EXPORTER_URL: "http://exporter:8092"
AUTH_HEADER: "${EXPORTER_API_KEY}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this set correctly? It says "header" in the key but the value only has an API key. focus docs state that there should be "ApiKey " in front

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djuarezgf and I have agreed on the ApiKey type of the authentication some year ago. Is there a reason to have a different type?

Copy link
Member

@lablans lablans Nov 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not asking for a different auth type. The focus docs say there should be "ApiKey " in front but here that's not the case. Either focus docs or this PR are faulty.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked into Focus' code: The Exporter uses a different header field (x-api-key) , so it is generally handled differently. This could be something to align in A) Explorter b) our other components using API-Keys. At the very least, this could and should be mentioned in Focus docs to be clear.

Copy link
Member

@enola-dkfz enola-dkfz Nov 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djuarezgf, @TKussel, and I had a discussion about it* because it's not the most proper way to do it. We agreed to use that header because it was urgent and didn't require changes in Exporter.

ETA: * in December last year

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@enola-dkfz thanks for jogging my memory. David chose the header recommended by OpenAPI, we chose the header recommended by the RFC and used throughout our components. Could you or @davidmscholz add a brief sentence to the focus documentation, that if the endpoint is exporter the semantics of the auth_header option changes?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's complicated, because when the target app is Exporter, the endpoint type is actually Blaze (or Blaze and SQL). As you said, Focus has outgrown its architecture.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adressing that in samply/focus#185

Comment on lines 104 to 110
ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ccp-patient-project-identificator:
image: samply/ccp-patient-project-identificator
container_name: bridgehead-ccp-patient-project-identificator
environment:
MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
SITE_NAME: ${SITE_NAME}

agreed, move to different PR

@TKussel TKussel requested a review from lablans December 11, 2024 09:51
@TKussel TKussel dismissed lablans’s stale review December 11, 2024 09:52

The changes are done in focus

@TKussel TKussel self-requested a review December 11, 2024 09:52
@TKussel TKussel merged commit df1ec21 into main Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants