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

Exporter, Teiler, QB, DataSHIELD #164

Merged
merged 216 commits into from
Mar 19, 2024
Merged

Conversation

djuarezgf
Copy link
Member

@djuarezgf djuarezgf commented Mar 13, 2024

New pull request based on old #72. This PR includes the following features:

  • Teiler
  • Exporter
  • Reporter (QB)
  • MTBA (+ Central Authentication)
  • OAuth2 Proxy (Authentication for R-Studio)
  • DataSHIELD (Opal)
  • Central authentication through Keycloak (Authentik still needs to be evaluated within the bridgehead)

A summary of the changes made after the review in PR 72 can be found here: https://wiki.verbis.dkfz.de/pages/viewpage.action?pageId=269910138

@djuarezgf djuarezgf changed the title Feature/datashield Exporter, Teiler, QB, DataSHIELD Mar 13, 2024
Copy link
Contributor

@patrickskowronekdkfz patrickskowronekdkfz left a comment

Choose a reason for hiding this comment

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

Please resolve the 2 todo's and then we car merge it

bridgehead Outdated Show resolved Hide resolved
ccp/modules/datashield-compose.yml Outdated Show resolved Hide resolved
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.

One thing that might cause a problem when bridgeheads update is that mtba now uses secret sync which requires the new /var/cache/bridgehead dir to be present which is only created after a new bridgehead install. I dont think this will be a huge problem as Pierre said mtba was disable everywhere but just in case.

ccp/modules/export-and-qb.curl-templates Show resolved Hide resolved
ccp/modules/teiler-ui-compose.yml Outdated Show resolved Hide resolved
if [ "$ENABLE_DATASHIELD" == true ]; then
# HACK: This only works because exporter-setup.sh and teiler-setup.sh are sourced after datashield-setup.sh
ENABLE_EXPORTER=true
ENABLE_TEILER=true
Copy link
Contributor

Choose a reason for hiding this comment

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

Not hard dependency please remove it

Copy link
Member

Choose a reason for hiding this comment

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

BUT please give a warning log!

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

.gitignore Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

This will conflict, as the bbmri modules for dnpm are removed in main.

Copy link
Member Author

Choose a reason for hiding this comment

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

Should we remove this file?

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed

if [ "$ENABLE_DATASHIELD" == true ]; then
# HACK: This only works because exporter-setup.sh and teiler-setup.sh are sourced after datashield-setup.sh
ENABLE_EXPORTER=true
ENABLE_TEILER=true
Copy link
Member

Choose a reason for hiding this comment

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

BUT please give a warning log!

Copy link
Member

Choose a reason for hiding this comment

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

What is this used for? Having those sites hardoced is not very elegant, esp. when it comes to change, update and restart management

Copy link
Member

Choose a reason for hiding this comment

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

These are used to generate the mappings for beam-connect we might want to host them centrally at some point but for now this is really convenient since when we update them the bks are gonna restart automatically.

Copy link
Member

Choose a reason for hiding this comment

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

OK for now, but needs further details

Copy link
Member Author

Choose a reason for hiding this comment

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

Comment on lines 6 to 7
DEFAULT_LANGUAGE=DE
DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,}
Copy link
Member

Choose a reason for hiding this comment

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

The ENV-Name is quite general. Maybe TEILER_DEFAULT_LANGUAGE* is more appropriate

Copy link
Member Author

Choose a reason for hiding this comment

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

While presently utilized exclusively by the "teiler," it's advisable to provide bridgehead developers with a global variable for default language to ensure consistency whenever internationalization is employed.

Copy link
Member Author

Choose a reason for hiding this comment

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

lib/functions.sh Outdated Show resolved Hide resolved
lib/functions.sh Outdated Show resolved Hide resolved
lib/prepare-system.sh Show resolved Hide resolved
minimal/docker-compose.yml Show resolved Hide resolved
@patrickskowronekdkfz patrickskowronekdkfz merged commit 6da143f into main Mar 19, 2024
@patrickskowronekdkfz patrickskowronekdkfz deleted the feature/datashield branch March 19, 2024 08:56
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.

6 participants