Skip to content

fix(redis): set spring.data.redis.username from bound credentials #458

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
kvmw merged 1 commit into from
Aug 13, 2026
Merged

fix(redis): set spring.data.redis.username from bound credentials #458

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/RedisCfEnvProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public void process(CfCredentials cfCredentials, Map<String, Object> properties)

if (uri == null) {
properties.put(PREFIX + ".host", cfCredentials.getHost());
properties.put(PREFIX + ".username", cfCredentials.getUsername());
properties.put(PREFIX + ".password", cfCredentials.getPassword());

Optional<String> tlsPort = Optional.ofNullable(cfCredentials.getString("tls_port"));
Expand All @@ -66,6 +67,7 @@ public void process(CfCredentials cfCredentials, Map<String, Object> properties)
UriInfo uriInfo = new UriInfo(uri);
properties.put(PREFIX + ".host", uriInfo.getHost());
properties.put(PREFIX + ".port", uriInfo.getPort());
properties.put(PREFIX + ".username", uriInfo.getUsername());
properties.put(PREFIX + ".password", uriInfo.getPassword());
if (uriInfo.getScheme().equals("rediss")) {
properties.put(PREFIX + ".ssl.enabled", Boolean.TRUE);
Expand Down
11 changes: 11 additions & 0 deletions java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/RedisCfEnvProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class RedisCfEnvProcessorTests extends AbstractCfEnvTests {
public static void commonAssertions(Environment environment, String SPRING_DATA_REDIS) {
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".host")).isEqualTo(hostname);
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".port")).isEqualTo(String.valueOf(port));
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".username")).isEqualTo(username);
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".password")).isEqualTo(password);
}

Expand All @@ -56,6 +57,7 @@ public void testRedisBootPropertiesWithTLSEnabledInCredentials() {

assertThat(environment.getProperty(SPRING_DATA_REDIS + ".host")).isEqualTo(hostname);
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".port")).isEqualTo(String.valueOf(TLS_PORT));
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".username")).isEqualTo(username);
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".password")).isEqualTo(password);
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".ssl.enabled")).isEqualTo("true");
}
Expand All @@ -79,6 +81,7 @@ public void testNoCredentials() {

assertThat(environment.getProperty(SPRING_DATA_REDIS + ".host")).isNull();
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".port")).isNull();
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".username")).isNull();
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".password")).isNull();
assertThat(environment.getProperty(SPRING_DATA_REDIS + ".ssl")).isNull();
}
Expand All @@ -93,6 +96,7 @@ private RedisFilePayloadBuilder payloadBuilder(String filename) {
return new RedisFilePayloadBuilder(filename)
.withServiceName("redis-1")
.withHostname(hostname)
.withUsername(username)
.withPassword(password)
.withPort(port)
.withName("redis-db");
Expand All @@ -104,6 +108,7 @@ private class RedisFilePayloadBuilder {
private String hostname;
private Integer port;
private Integer tlsPort;
private String username;
private String password;
private String name;

Expand All @@ -126,6 +131,11 @@ RedisFilePayloadBuilder withPort(int port) {
return this;
}

RedisFilePayloadBuilder withUsername(String username) {
this.username = username;
return this;
}

RedisFilePayloadBuilder withPassword(String password) {
this.password = password;
return this;
Expand All @@ -144,6 +154,7 @@ RedisFilePayloadBuilder withName(String name) {
String payload() {
return payload.replace("$serviceName", serviceName)
.replace("$hostname", hostname)
.replace("$username", username)
.replace("$port", String.valueOf(port))
.replace("$password", password)
.replace("$tls_port", String.valueOf(tlsPort))
Expand Down
2 changes: 1 addition & 1 deletion java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/RedisTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void redisServiceCreation() {
assertThat(cfServices).allMatch(cfService -> cfService.getLabel().equals("rediscloud"));
assertThat(cfServices).allMatch(
cfService -> cfService.getCredentials().getUriInfo("redis").getUriString()
.equals("redis://10.20.30.40:1234"));
.equals("redis://" + username + ":" + password + "@10.20.30.40:1234"));

}

Expand Down
1 change: 1 addition & 0 deletions ...v-boot/src/test/resources/io/pivotal/cfenv/spring/boot/test-redis-info-with-tls-port.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"credentials": {
"hostname": "$hostname",
"port": "$port",
"username": "$username",
"password": "$password",
"tls_port": "$tls_port"
}
Expand Down
1 change: 1 addition & 0 deletions java-cfenv-boot/src/test/resources/io/pivotal/cfenv/spring/boot/test-redis-info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"credentials": {
"hostname": "$hostname",
"port": "$port",
"username": "$username",
"password": "$password"
}
}
Loading