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

Re-merge of PR #150: Support accepting multiple public keys #156

Merged
merged 7 commits into from
Sep 18, 2024

Conversation

rtyley
Copy link
Member

@rtyley rtyley commented Sep 18, 2024

As mentioned in #150 (comment), the merging of PR #150 went wrong - because PR #150 was sitting on top of PR #155, and that PR had been merged to main only seconds earlier at 12:50pm, when I merged PR #150 moments later, it was merged into the now-redundant fix-creation-of-superfluous-PanDomainAuthSettingsRefresher-instances branch of #155, rather than main. I didn't see this, and kicked off a release, so v6.0.0 doesn't contain #150, which I was intending it to.

This new PR is purely for re-merging that branch, this time into main - our branch rulesets means it has to be another PR!

rtyley and others added 7 commits September 12, 2024 17:47
If the `acceptedPublicKeys` val is evaluated eagerly within the
`Verification` trait then the `activePublicKey` and `alsoAccepted` vals
won't have been initialised yet from the class which extends the trait.

This was leading to `acceptedPublicKeys` evaluating to 'null' at
runtime.

The added test was failing with the pre-existing code with a very
similar message to the one observed in CODE, so we have some
confidence that it's testing for this case effectively.

See: https://docs.scala-lang.org/tutorials/FAQ/initialization-order.html

Co-authored-by: Roberto Tyley <52038+rtyley@users.noreply.github.com>
I'm trying to find out why `PublicSettings` in s3-uploader (guardian/s3-upload#58)
didn't log that the panda settings had changed - maybe the refresh schedule did not start, or
possibly the interval was no good (rounded to nothing)?
…ic-keys

Support accepting multiple public keys
…her-instances'

See #150 (comment)
...this merge is _actually_ merging #150
into main branch.
@rtyley rtyley requested a review from a team as a code owner September 18, 2024 09:12
@rtyley rtyley requested review from bryophyta and removed request for a team September 18, 2024 09:12
@rtyley rtyley merged commit 7e4103f into main Sep 18, 2024
4 checks passed
@rtyley rtyley deleted the pr-150-remerge branch September 18, 2024 09:20
@rtyley rtyley removed the request for review from bryophyta September 18, 2024 09:21
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