DM-42191: Allow use of Butler client/server #140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dhirving
force-pushed
the
tickets/DM-42191
branch
3 times, most recently
from
af49300
to
3fad1f1
Compare
Upgrade safir to get auth_delegated_token_dependency. FastAPI had to be upgraded as a result. It appears that it no longer automatically coerces single-item form parameters to list[str], so some types had to be updated. (These appear to be intended only as documentation, but are still validated by FastAPI.)
Retrieve delegated access tokens from Gafaelfawr headers, and pass them down to the job dispatch layer. This will be used to pass the access token to the backend for use by the Butler client.
dhirving
force-pushed
the
tickets/DM-42191
branch
8 times, most recently
from
24bf4cb
to
a2b946b
Compare
dhirving
commented
Feb 9, 2024
scripts/install-worker.sh
Outdated
| @@ -25,7 +25,8 @@ set -x | |||
| # alternative (no releases and no tags). | |||
| mkdir /backend | |||
| cd /backend | |||
| git clone --depth 1 https://github.com/lsst-dm/image_cutout_backend.git | |||
| # TODO: This should not reference a ticket branch.. | |||
| git clone --depth 1 -b tickets/DM-42191 https://github.com/lsst-dm/image_cutout_backend.git | |||
There was a problem hiding this comment.
I'll add a tag in image-cutout-backend that we can reference after the changes there get through review.
rra
approved these changes
Feb 12, 2024
Create Butlers using LabeledButlerFactory and provide the Gafaelfawr access token. This allows us to use Butler client/server if the environment is configured to do so.
dhirving
force-pushed
the
tickets/DM-42191
branch
from
a2b946b
to
953ac00
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changed the way Butler is used to support client/server Butler. We now pass a Gafaelfawr delegated token down to the cutouts worker, so that it can be used to authenticate with Butler server.
This required updating safir, which in turn required updating FastAPI. Fixed a slight incompatibility in FastAPI's handling of form data -- it appears to no longer coerce single form values into
list[str]automatically.