root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge pull request #43771 from hezean 

* gh-43771:
  Polish "Add support for empty password in bitnami/postgresql"
  Add support for empty password in bitnami/postgresql

Closes gh-43771
This commit is contained in:
Andy Wilkinson 2025-01-15 11:47:07 +00:00
parent 21161bc42e b601282b57
commit 6c476a2b92
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Phillip Webb * @author Phillip Webb
* @author Scott Frederick * @author Scott Frederick
* @author He Zean
*/ */
class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests { class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {

1
spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@ -37,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Phillip Webb * @author Phillip Webb
* @author Scott Frederick * @author Scott Frederick
* @author He Zean
*/ */
class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests { class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {

5
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironment.java
View File

@ -67,8 +67,9 @@ class PostgresEnvironment {
return null; return null;
} }
String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD")); String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD"));
Assert.state(StringUtils.hasLength(password), "PostgreSQL password must be provided"); boolean allowEmpty = env.containsKey("ALLOW_EMPTY_PASSWORD");
return password; Assert.state(allowEmpty || StringUtils.hasLength(password), "No PostgreSQL password found");
return (password != null) ? password : "";
} }
private boolean isUsingTrustHostAuthMethod(Map<String, String> env) { private boolean isUsingTrustHostAuthMethod(Map<String, String> env) {

8
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironmentTests.java
View File

@ -39,7 +39,7 @@ class PostgresEnvironmentTests {
@Test @Test
void createWhenNoPostgresPasswordThrowsException() { void createWhenNoPostgresPasswordThrowsException() {
assertThatIllegalStateException().isThrownBy(() -> new PostgresEnvironment(Collections.emptyMap())) assertThatIllegalStateException().isThrownBy(() -> new PostgresEnvironment(Collections.emptyMap()))
.withMessage("PostgreSQL password must be provided"); .withMessage("No PostgreSQL password found");
} }
@Test @Test
@ -93,6 +93,12 @@ class PostgresEnvironmentTests {
assertThat(environment.getPassword()).isNull(); assertThat(environment.getPassword()).isNull();
} }
@Test
void getPasswordWhenHasNoPasswordAndAllowEmptyPassword() {
PostgresEnvironment environment = new PostgresEnvironment(Map.of("ALLOW_EMPTY_PASSWORD", "yes"));
assertThat(environment.getPassword()).isEmpty();
}
@Test @Test
void getDatabaseWhenNoPostgresDbOrPostgresUser() { void getDatabaseWhenNoPostgresDbOrPostgresUser() {
PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRES_PASSWORD", "secret")); PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRES_PASSWORD", "secret"));