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

Tickets DM-44524 - Enable CloudSQL UWS database for SSO TAP service #27

Merged
merged 7 commits into from
May 30, 2024

Conversation

stvoutsin
Copy link
Member

Description:

Enable UWS schema & table initialization through the Java TAP service code. Introduce new class to do the init using https://github.com/lsst-sqre/dal-siav2/blob/master/sia2/src/main/java/org/opencadc/sia2/UWSInitAction.java and extend to add a check to skip process of schema already exists.

On top of above changes, modify "tap-server" to be "tap-service" in the Docker image create scripts. (Although this change doesn't really do anything, since the image is built from the .github workflow and the name is defined there)

Relevant PR:
https://rubinobs.atlassian.net/browse/DM-44524

Detailed notes on approach:
https://github.com/stvoutsin/rub-notes/wiki/DM%E2%80%9044427-%E2%80%90-Enable-CloudSQL-UWS-database-for-SSO-TAP-service

@stvoutsin stvoutsin marked this pull request as draft May 28, 2024 21:04
@stvoutsin
Copy link
Member Author

Set to draft, just want to run another test

@stvoutsin stvoutsin marked this pull request as ready for review May 29, 2024 00:07
@stvoutsin
Copy link
Member Author

Since doing the PR I noticed an issue, which upon further investigation seemed to be related to the version of the cadc-util package being pulled in.

Issue & fix described here:
https://github.com/stvoutsin/rub-notes/wiki/DM%E2%80%9044427-%E2%80%90-Enable-CloudSQL-UWS-database-for-SSO-TAP-service#issue-with-tap-postgres-build

Is that the right approach or should we jump in & fix what looks like a compatibility issue with the Authentication code in this patched version of the tap-postgres library?

Copy link
Member

@rra rra left a comment

Choose a reason for hiding this comment

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

This all looks reasonable to me as a first step.

Is there any way that we can merge this with lsst-tap-service so that we don't have to maintain two forks of the CADC TAP server? (Ideally we would get this down to zero forks and just run a CADC container as-is.)

We also should move all these Docker containers into GitHub Container Registry and stop using Docker Hub (and the old lsstdax account), but that's future work.

tap/build.gradle Outdated
Comment on lines 57 to 59



Copy link
Member

Choose a reason for hiding this comment

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

Minor nit: Stray blank lines added

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, thanks for catching that. Should be fixed now, if build is ok I'll merge in and do a new release.
Re: the merging of the repos: I think that should be the target, I'll set this an initial investigation task for myself to evaluate what would be needed to do so

@stvoutsin stvoutsin merged commit 8e141c8 into master May 30, 2024
1 check passed
@stvoutsin stvoutsin deleted the tickets/DM-44524 branch May 31, 2024 02:57
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