Fix EncryptionIntegrationTests for changes in Boot behavior#1665
Merged
ryanjbaxter merged 1 commit intomainfrom Mar 13, 2026
Merged
Fix EncryptionIntegrationTests for changes in Boot behavior#1665ryanjbaxter merged 1 commit intomainfrom
ryanjbaxter merged 1 commit intomainfrom
Conversation
Due to spring-projects/spring-boot@646db44 in Spring Boo 4.0.3 and beyond the initial call to resolve may not have application-failsafe.properties loaded so EncryptionIntegrationTests.failsafeShouldHaveDelegate will fail when we assert TextEncryptorUtils.keysConfigured(keyProperties) is true. application-failsafe.properties will only be available on subsequent calls to resolve so we return if TextEncryptorUtils.keysConfigured(keyProperties) is false. We need to get TextEncryptor from the context before we return so FailSafeTextEncryptor is created and used in subsequent calls to resolve.
spencergibb
approved these changes
Mar 13, 2026
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
3 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.
Due to spring-projects/spring-boot@646db44 in Spring Boot 4.0.3 and beyond the initial call to resolve may not have application-failsafe.properties loaded so EncryptionIntegrationTests.failsafeShouldHaveDelegate will fail when we assert TextEncryptorUtils.keysConfigured(keyProperties) is true. application-failsafe.properties will only be available on
subsequent calls to resolve so we return if TextEncryptorUtils.keysConfigured(keyProperties) is false. We need to get TextEncryptor from the context before we return so FailSafeTextEncryptor is created and used in subsequent calls to resolve.