Add support for Postgres trust host auth method with Docker Compose #41511
Conversation
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
spring-projects-issues
added
the
status: waiting-for-triage
wilkinsona
changed the title
wilkinsona
changed the title
wilkinsona
requested changes
Jul 16, 2024
There was a problem hiding this comment.
Thanks for the PR, @theodorosidmar. I've left a few comments for your consideration.
| String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD")); | ||
| Assert.state(StringUtils.hasLength(password), "PostgreSQL password must be provided"); | ||
| return password; | ||
| } | ||
|
|
||
| private Boolean hasTrustAuthMethod(Map<String, String> env) { | ||
| String postgresAuthMethod = env.getOrDefault("POSTGRES_HOST_AUTH_METHOD", "password"); |
There was a problem hiding this comment.
I don't think a default is needed here so this could just use get.
| String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD")); | ||
| Assert.state(StringUtils.hasLength(password), "PostgreSQL password must be provided"); | ||
| return password; | ||
| } | ||
|
|
||
| private Boolean hasTrustAuthMethod(Map<String, String> env) { | ||
| String postgresAuthMethod = env.getOrDefault("POSTGRES_HOST_AUTH_METHOD", "password"); | ||
| return Objects.equals(postgresAuthMethod, "trust"); |
There was a problem hiding this comment.
We don't really use Objects.equals. This could be return "trust".equals(postgresAuthMethod); instead.
| @@ -78,6 +78,12 @@ void getPasswordWhenHasPostgresqlPassword() { | |||
| assertThat(environment.getPassword()).isEqualTo("secret"); | |||
| } | |||
|
|
|||
| @Test | |||
| void getPasswordWhenHasTrustAuthMethod() { | |||
There was a problem hiding this comment.
getPasswordWhenHasTrustHostAuthMethod()
| String password = env.getOrDefault("POSTGRES_PASSWORD", env.get("POSTGRESQL_PASSWORD")); | ||
| Assert.state(StringUtils.hasLength(password), "PostgreSQL password must be provided"); | ||
| return password; | ||
| } | ||
|
|
||
| private Boolean hasTrustAuthMethod(Map<String, String> env) { | ||
| String postgresAuthMethod = env.getOrDefault("POSTGRES_HOST_AUTH_METHOD", "password"); |
There was a problem hiding this comment.
For consistency, I'd rename postgresAuthMethod to hostAuthMethod.
snicoll
added
the
status: waiting-for-feedback
theodorosidmar
force-pushed
the
docker-compose-postgres-auth-method
branch
from
a0000fd to
8e9a482
Compare
|
Awesome. Thank you for the review. Here you go: 8e9a482 |
spring-projects-issues
added
status: feedback-provided
wilkinsona
added
type: enhancement
wilkinsona
approved these changes
Jul 16, 2024
wilkinsona
pushed a commit
that referenced
this pull request
Jul 16, 2024
wilkinsona
added a commit
that referenced
this pull request
Jul 16, 2024
|
Thanks very much, @theodorosidmar, and congratulations on making your first contribution to Spring Boot. |
|
I should be thanking you. Thank you for your attention. Glad to contribute. |
|
@wilkinsona can this PR be backported to 3.3.x? |
|
I'm afraid not. We don't backport enhancements to maintenance branches. |
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #41509