Fix environment variable keys for bitnami/postgresql

hezean · hezean · commit 0899e1344a45 · 2025-01-13T19:27:13.000+08:00
Signed-off-by: He Zean &lt;realhezean@gmail.com&gt;
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -39,8 +39,9 @@
 class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 
 	@DockerComposeTest(composeFile = "postgres-compose.yaml", image = TestImage.POSTGRESQL)
-	void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
+	void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) throws ClassNotFoundException {
 		assertConnectionDetails(connectionDetails);
+		checkDatabaseAccess(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "postgres-with-trust-host-auth-method-compose.yaml", image = TestImage.POSTGRESQL)
@@ -53,8 +54,10 @@ void runCreatesConnectionDetailsThatCanAccessDatabaseWhenHostAuthMethodIsTrust(
 	}
 
 	@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
-	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
+	void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails)
+			throws ClassNotFoundException {
 		assertConnectionDetails(connectionDetails);
+		checkDatabaseAccess(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "postgres-application-name-compose.yaml", image = TestImage.POSTGRESQL)
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -43,6 +43,7 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 	@DockerComposeTest(composeFile = "postgres-compose.yaml", image = TestImage.POSTGRESQL)
 	void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
+		checkDatabaseAccess(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "postgres-with-trust-host-auth-method-compose.yaml", image = TestImage.POSTGRESQL)
@@ -59,6 +60,7 @@ void runCreatesConnectionDetailsThatCanAccessDatabaseWhenHostAuthMethodIsTrust(
 	@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)
 	void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
+		checkDatabaseAccess(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "postgres-application-name-compose.yaml", image = TestImage.POSTGRESQL)
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-bitnami-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-bitnami-compose.yaml
@@ -4,6 +4,6 @@ services:
     ports:
       - '5432'
     environment:
-      - 'POSTGRESQL_USER=myuser'
-      - 'POSTGRESQL_DB=mydatabase'
+      - 'POSTGRESQL_USERNAME=myuser'
+      - 'POSTGRESQL_DATABASE=mydatabase'
       - 'POSTGRESQL_PASSWORD=secret'
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironment.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Sidmar Theodoro
+ * @author He Zean
  */
 class PostgresEnvironment {
 
@@ -39,9 +40,9 @@ class PostgresEnvironment {
 	private final String database;
 
 	PostgresEnvironment(Map<String, String> env) {
-		this.username = env.getOrDefault("POSTGRES_USER", env.getOrDefault("POSTGRESQL_USER", "postgres"));
+		this.username = env.getOrDefault("POSTGRES_USER", env.getOrDefault("POSTGRESQL_USERNAME", "postgres"));
 		this.password = extractPassword(env);
-		this.database = env.getOrDefault("POSTGRES_DB", env.getOrDefault("POSTGRESQL_DB", this.username));
+		this.database = env.getOrDefault("POSTGRES_DB", env.getOrDefault("POSTGRESQL_DATABASE", this.username));
 	}
 
 	private String extractPassword(Map<String, String> env) {
diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironmentTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironmentTests.java
@@ -32,6 +32,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Sidmar Theodoro
+ * @author He Zean
  */
 class PostgresEnvironmentTests {
 
@@ -48,7 +49,7 @@ void getUsernameWhenNoPostgresUser() {
 	}
 
 	@Test
-	void getUsernameWhenNoPostgresqlUser() {
+	void getUsernameWhenNoPostgresqlUsername() {
 		PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRESQL_PASSWORD", "secret"));
 		assertThat(environment.getUsername()).isEqualTo("postgres");
 	}
@@ -61,9 +62,9 @@ void getUsernameWhenHasPostgresUser() {
 	}
 
 	@Test
-	void getUsernameWhenHasPostgresqlUser() {
+	void getUsernameWhenHasPostgresqlUsername() {
 		PostgresEnvironment environment = new PostgresEnvironment(
-				Map.of("POSTGRESQL_USER", "me", "POSTGRESQL_PASSWORD", "secret"));
+				Map.of("POSTGRESQL_USERNAME", "me", "POSTGRESQL_PASSWORD", "secret"));
 		assertThat(environment.getUsername()).isEqualTo("me");
 	}
 
@@ -92,7 +93,7 @@ void getDatabaseWhenNoPostgresDbOrPostgresUser() {
 	}
 
 	@Test
-	void getDatabaseWhenNoPostgresqlDbOrPostgresUser() {
+	void getDatabaseWhenNoPostgresqlDatabaseOrPostgresUsername() {
 		PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRESQL_PASSWORD", "secret"));
 		assertThat(environment.getDatabase()).isEqualTo("postgres");
 	}
@@ -105,9 +106,9 @@ void getDatabaseWhenNoPostgresDbAndPostgresUser() {
 	}
 
 	@Test
-	void getDatabaseWhenNoPostgresqlDbAndPostgresUser() {
+	void getDatabaseWhenNoPostgresqlDatabaseAndPostgresqlUsername() {
 		PostgresEnvironment environment = new PostgresEnvironment(
-				Map.of("POSTGRESQL_USER", "me", "POSTGRESQL_PASSWORD", "secret"));
+				Map.of("POSTGRESQL_USERNAME", "me", "POSTGRESQL_PASSWORD", "secret"));
 		assertThat(environment.getDatabase()).isEqualTo("me");
 	}
 
@@ -119,9 +120,9 @@ void getDatabaseWhenHasPostgresDb() {
 	}
 
 	@Test
-	void getDatabaseWhenHasPostgresqlDb() {
+	void getDatabaseWhenHasPostgresqlDatabase() {
 		PostgresEnvironment environment = new PostgresEnvironment(
-				Map.of("POSTGRESQL_DB", "db", "POSTGRESQL_PASSWORD", "secret"));
+				Map.of("POSTGRESQL_DATABASE", "db", "POSTGRESQL_PASSWORD", "secret"));
 		assertThat(environment.getDatabase()).isEqualTo("db");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@`
`39`	`39`	`class PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {`
`40`	`40`
`41`	`41`	`@DockerComposeTest(composeFile = "postgres-compose.yaml", image = TestImage.POSTGRESQL)`
`42`		`- void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {`
	`42`	`+ void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) throws ClassNotFoundException {`
`43`	`43`	`assertConnectionDetails(connectionDetails);`
	`44`	`+ checkDatabaseAccess(connectionDetails);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`@DockerComposeTest(composeFile = "postgres-with-trust-host-auth-method-compose.yaml", image = TestImage.POSTGRESQL)`
`@@ -53,8 +54,10 @@ void runCreatesConnectionDetailsThatCanAccessDatabaseWhenHostAuthMethodIsTrust(`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)`
`56`		`- void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {`
	`57`	`+ void runWithBitnamiImageCreatesConnectionDetails(JdbcConnectionDetails connectionDetails)`
	`58`	`+ throws ClassNotFoundException {`
`57`	`59`	`assertConnectionDetails(connectionDetails);`
	`60`	`+ checkDatabaseAccess(connectionDetails);`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`@DockerComposeTest(composeFile = "postgres-application-name-compose.yaml", image = TestImage.POSTGRESQL)`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ class PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {`
`43`	`43`	`@DockerComposeTest(composeFile = "postgres-compose.yaml", image = TestImage.POSTGRESQL)`
`44`	`44`	`void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {`
`45`	`45`	`assertConnectionDetails(connectionDetails);`
	`46`	`+ checkDatabaseAccess(connectionDetails);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`@DockerComposeTest(composeFile = "postgres-with-trust-host-auth-method-compose.yaml", image = TestImage.POSTGRESQL)`
`@@ -59,6 +60,7 @@ void runCreatesConnectionDetailsThatCanAccessDatabaseWhenHostAuthMethodIsTrust(`
`59`	`60`	`@DockerComposeTest(composeFile = "postgres-bitnami-compose.yaml", image = TestImage.BITNAMI_POSTGRESQL)`
`60`	`61`	`void runWithBitnamiImageCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {`
`61`	`62`	`assertConnectionDetails(connectionDetails);`
	`63`	`+ checkDatabaseAccess(connectionDetails);`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`@DockerComposeTest(composeFile = "postgres-application-name-compose.yaml", image = TestImage.POSTGRESQL)`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`* @author Phillip Webb`
`33`	`33`	`* @author Scott Frederick`
`34`	`34`	`* @author Sidmar Theodoro`
	`35`	`+ * @author He Zean`
`35`	`36`	`*/`
`36`	`37`	`class PostgresEnvironmentTests {`
`37`	`38`
`@@ -48,7 +49,7 @@ void getUsernameWhenNoPostgresUser() {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`@Test`
`51`		`- void getUsernameWhenNoPostgresqlUser() {`
	`52`	`+ void getUsernameWhenNoPostgresqlUsername() {`
`52`	`53`	`PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRESQL_PASSWORD", "secret"));`
`53`	`54`	`assertThat(environment.getUsername()).isEqualTo("postgres");`
`54`	`55`	`}`
`@@ -61,9 +62,9 @@ void getUsernameWhenHasPostgresUser() {`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`@Test`
`64`		`- void getUsernameWhenHasPostgresqlUser() {`
	`65`	`+ void getUsernameWhenHasPostgresqlUsername() {`
`65`	`66`	`PostgresEnvironment environment = new PostgresEnvironment(`
`66`		`- Map.of("POSTGRESQL_USER", "me", "POSTGRESQL_PASSWORD", "secret"));`
	`67`	`+ Map.of("POSTGRESQL_USERNAME", "me", "POSTGRESQL_PASSWORD", "secret"));`
`67`	`68`	`assertThat(environment.getUsername()).isEqualTo("me");`
`68`	`69`	`}`
`69`	`70`
`@@ -92,7 +93,7 @@ void getDatabaseWhenNoPostgresDbOrPostgresUser() {`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`@Test`
`95`		`- void getDatabaseWhenNoPostgresqlDbOrPostgresUser() {`
	`96`	`+ void getDatabaseWhenNoPostgresqlDatabaseOrPostgresUsername() {`
`96`	`97`	`PostgresEnvironment environment = new PostgresEnvironment(Map.of("POSTGRESQL_PASSWORD", "secret"));`
`97`	`98`	`assertThat(environment.getDatabase()).isEqualTo("postgres");`
`98`	`99`	`}`
`@@ -105,9 +106,9 @@ void getDatabaseWhenNoPostgresDbAndPostgresUser() {`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`@Test`
`108`		`- void getDatabaseWhenNoPostgresqlDbAndPostgresUser() {`
	`109`	`+ void getDatabaseWhenNoPostgresqlDatabaseAndPostgresqlUsername() {`
`109`	`110`	`PostgresEnvironment environment = new PostgresEnvironment(`
`110`		`- Map.of("POSTGRESQL_USER", "me", "POSTGRESQL_PASSWORD", "secret"));`
	`111`	`+ Map.of("POSTGRESQL_USERNAME", "me", "POSTGRESQL_PASSWORD", "secret"));`
`111`	`112`	`assertThat(environment.getDatabase()).isEqualTo("me");`
`112`	`113`	`}`
`113`	`114`
`@@ -119,9 +120,9 @@ void getDatabaseWhenHasPostgresDb() {`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`@Test`
`122`		`- void getDatabaseWhenHasPostgresqlDb() {`
	`123`	`+ void getDatabaseWhenHasPostgresqlDatabase() {`
`123`	`124`	`PostgresEnvironment environment = new PostgresEnvironment(`
`124`		`- Map.of("POSTGRESQL_DB", "db", "POSTGRESQL_PASSWORD", "secret"));`
	`125`	`+ Map.of("POSTGRESQL_DATABASE", "db", "POSTGRESQL_PASSWORD", "secret"));`
`125`	`126`	`assertThat(environment.getDatabase()).isEqualTo("db");`
`126`	`127`	`}`
`127`	`128`