Make use of key store its own key manager #3606
Merged
Conversation
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
MMcM
force-pushed
the
serializer-key-store-key-manager
branch
from
d8beed8 to
87ba406
Compare
MMcM
force-pushed
the
serializer-key-store-key-manager
branch
from
87ba406 to
651f725
Compare
|
Rebased to parent as of da67b46. |
…is for existing tests.
Add a new test block using it showing reading with different keys, restricted to the current version, as because old versions do not understand the new option.
MMcM
force-pushed
the
serializer-key-store-key-manager
branch
from
651f725 to
93cfbf2
Compare
ScottDugas
requested changes
Sep 24, 2025
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Outdated
Show resolved
Hide resolved
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Show resolved
Hide resolved
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Outdated
Show resolved
Hide resolved
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Outdated
Show resolved
Hide resolved
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Show resolved
Hide resolved
fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/Options.java
Outdated
Show resolved
Hide resolved
| if (keyEntryPassword == null) { | ||
| keyEntryPassword = keyStorePassword; | ||
| } | ||
| final KeyStore.ProtectionParameter keyEntryProtection = new KeyStore.PasswordProtection(keyEntryPassword.toCharArray()); |
There was a problem hiding this comment.
Yeah, probably good to move this closer
There was a problem hiding this comment.
But then something else is too far away, right? Right now, it is constructing the arguments in the order in which they are passed to the constructor.
…ord/provider/common/KeyStoreSerializationKeyManager.java Co-authored-by: Scott Dugas <scott.dugas@gmail.com>
ScottDugas
approved these changes
Sep 25, 2025
...main/java/com/apple/foundationdb/record/provider/common/KeyStoreSerializationKeyManager.java
Show resolved
Hide resolved
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.
Following on from #3522, extend how key store is used by YAML tests to allow for multiple keys in the connection options. Any one of these keys can be read back.
The existing YAML tests continue to work with this new implementation, as the options are known to the old serializer implementation and the earlier PR's implementation of a single key.
A new YAML test shows the use of multiple keys, restricted to the current version, as it involves a new option.