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

Bump cadc dependency versions & switch to using cadc-tomcat image #28

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

stvoutsin
Copy link
Member

@stvoutsin stvoutsin commented Jun 5, 2024

Description:

This PR bumps up the versions of the cadc dependencies to newer releases. The versions are derived from trying a Gradle build with an open-ended max release version, and using what I got from that which seems to get the latest stable version of each library. I also modified the Dockerfile to use a cadc-tomcat base image instead of the default tomcat. This was a result of a combination of trial & error, reading between the lines and trying to understand what has been done in the dal-siav2 app, as well as how the opencadc repo seems to work. More specifically, I think the cadc-tap image does a few things behind the scenes, like mounting /config to /usr/share/tomcat/config and some other things, and generally seems to be the approach I've seen from some other apps in the opencadc org.

How was this tested:
Manually ran through some standard TAP workflows on idfdev:

  • /async query
  • /sync query
  • /tables
  • /capabilities & /availability

There were some related changes that need to be applied to phalanx so that the right params are passed in, so this was tested these changes on a phalanx branch & pointing to an image of tap-postgres from my own Dockerhub repo.

Other considerations:
I don't know if all those dependencies are needed, I got those from checking what was in the libs of the tomcat app once built with gradle.
This version will not work with the version of phalanx as it is in the most recent version on main: 3e88df64a1bfb59f84d2a58a9cc0f4e8f91ecb0c
Specifically, the main aspect that breaks is the Authentication layer, which requires moving from Authenticator to an IdentityManager, as well as defining and passing in new cadc-registry.properties & catalina.properties files which among other things includes a mapping for the authentication we are using, i.e.:

ivo://ivoa.net/sso#OpenID = {{ .Values.global.baseUrl }}/auth/cadc

@stvoutsin stvoutsin merged commit 00817d0 into master Jun 7, 2024
1 check passed
@stvoutsin stvoutsin deleted the tickets/DM-44607 branch June 7, 2024 22:33
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.

2 participants