Skip to content

Fix EncryptionIntegrationTests for changes in Boot behavior #1665

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.

Sign up for GitHub

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

Merged
ryanjbaxter merged 1 commit into from
Mar 13, 2026
Merged

Fix EncryptionIntegrationTests for changes in Boot behavior #1665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions .../src/test/java/org/springframework/cloud/context/test/TestConfigDataLocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,28 @@ public List<TestConfigDataResource> resolve(ConfigDataLocationResolverContext co
.bind("createfailsafedelegate", Bindable.of(Boolean.class))
.orElse(Boolean.FALSE);
if (createFailsafeDelegate) {
KeyProperties keyProperties = context.getBinder()
.bindOrCreate(KeyProperties.PREFIX, Bindable.of(KeyProperties.class));
// Due to
// https://github.com/spring-projects/spring-boot/commit/646db448ae938161279783a2d5d0bcaf297e7389
// 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.
if (!TextEncryptorUtils.keysConfigured(keyProperties)) {
assertThat(context.getBootstrapContext().isRegistered(TextEncryptor.class)).isTrue();
context.getBootstrapContext().get(TextEncryptor.class);
return Collections.emptyList();
}
assertThat(context.getBootstrapContext().isRegistered(TextEncryptor.class)).isTrue();
TextEncryptor textEncryptor = context.getBootstrapContext().get(TextEncryptor.class);
assertThat(textEncryptor).isInstanceOf(TextEncryptorUtils.FailsafeTextEncryptor.class);
KeyProperties keyProperties = context.getBinder()
.bindOrCreate(KeyProperties.PREFIX, Bindable.of(KeyProperties.class));
assertThat(TextEncryptorUtils.keysConfigured(keyProperties)).isTrue();
RsaProperties rsaProperties = context.getBinder()
.bindOrCreate(RsaProperties.PREFIX, Bindable.of(RsaProperties.class));
Expand Down