Skip to content

Fixed failing test due to bad db password policy #1415

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
vietj merged 1 commit into from
Feb 22, 2024
Merged

Fixed failing test due to bad db password policy #1415

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
9 changes: 7 additions & 2 deletions vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ContainerPgRule extends ExternalResource {

private static final String connectionUri = System.getProperty("connection.uri");
private static final String tlsConnectionUri = System.getProperty("tls.connection.uri");
private static final String tlsForceConnectionUri = System.getProperty("tls.force.connection.uri");

private ServerContainer<?> server;
private PgConnectOptions options;
Expand Down Expand Up @@ -95,7 +96,7 @@ private void initServer(String version) throws Exception {
}

public static boolean isTestingWithExternalDatabase() {
return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri);
return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri) || isSystemPropertyValid(tlsForceConnectionUri);
}

private static boolean isSystemPropertyValid(String systemProperty) {
Expand Down Expand Up @@ -144,7 +145,11 @@ protected void before() throws Throwable {
if (isTestingWithExternalDatabase()) {

if (ssl) {
options = PgConnectOptions.fromUri(tlsConnectionUri);
if (forceSsl) {
options = PgConnectOptions.fromUri(tlsForceConnectionUri);
} else {
options = PgConnectOptions.fromUri(tlsConnectionUri);
}
}
else {
options = PgConnectOptions.fromUri(connectionUri);
Expand Down
2 changes: 1 addition & 1 deletion vertx-pg-client/src/test/resources/tls/pg_hba.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ local replication all trust
host replication all 127.0.0.1/32 trust
host replication all ::1/128 trust

hostssl all all all scram-sha-256
hostssl all all all md5