Harden OpenID retry initialization - #1870
Merged
MikeNeilson merged 2 commits intoAug 7, 2026
Merged
Conversation
Signed-off-by: Charles Graham, SWT <charles.r.graham@usace.army.mil>
krowvin
marked this pull request as ready for review
August 7, 2026 15:21
MikeNeilson
reviewed
Aug 7, 2026
Contributor
There was a problem hiding this comment.
this one is overkill, the rest do seem reasoanble.
Signed-off-by: Charles Graham, SWT <charles.r.graham@usace.army.mil>
krowvin
changed the title
MikeNeilson
approved these changes
Aug 7, 2026
MikeNeilson
pushed a commit
that referenced
this pull request
Aug 7, 2026
## Summary Follow-up hardening for #1859's OpenID discovery retry and local Compose setup. ## Changes and rationale - Treat OpenID as unable to authenticate until its configuration is ready, preventing bearer requests from dereferencing a missing parser during the retry window. - Skip retry scheduling when no well-known URL is configured and stop scheduling after successful initialization, avoiding rejected executor work and unnecessary polling. - Pass `APP_PORT` into the data-api container, keeping its local authentication proxy aligned with the discovery URL and Keycloak when a nondefault port is used. - Add regression coverage for the intentionally disabled no-URL configuration. Per review feedback, this follow-up no longer changes `Authenticator.java`. ## Validation - `./gradlew :cwms-data-api:test --tests '*OpenIDConfigTest' :cwms-data-api:checkstyleMain :cwms-data-api:checkstyleTest` - `docker compose config` with `APP_PORT=9090` - `git diff --check` The focused test and Checkstyle tasks pass. Checkstyle reports the repository's existing warning-level violations. --------- Signed-off-by: Charles Graham, SWT <charles.r.graham@usace.army.mil>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
Follow-up hardening for #1859's OpenID discovery retry and local Compose setup.
Changes and rationale
APP_PORTinto the data-api container, keeping its local authentication proxy aligned with the discovery URL and Keycloak when a nondefault port is used.Per review feedback, this follow-up no longer changes
Authenticator.java.Validation
./gradlew :cwms-data-api:test --tests '*OpenIDConfigTest' :cwms-data-api:checkstyleMain :cwms-data-api:checkstyleTestdocker compose configwithAPP_PORT=9090git diff --checkThe focused test and Checkstyle tasks pass. Checkstyle reports the repository's existing warning-level violations.