Skip to content

Always render the port in the HttpWaitStrategy probe URI #12098

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

Open
bunnysayzz wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

Always render the port in the HttpWaitStrategy probe URI #12098

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
14 changes: 8 additions & 6 deletions core/src/main/java/org/testcontainers/containers/wait/strategy/HttpWaitStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,14 @@ private URI buildLivenessUri(int livenessCheckPort) {
final String scheme = (tlsEnabled ? "https" : "http") + "://";
final String host = waitStrategyTarget.getHost();

final String portSuffix;
if ((tlsEnabled && 443 == livenessCheckPort) || (!tlsEnabled && 80 == livenessCheckPort)) {
portSuffix = "";
} else {
portSuffix = ":" + livenessCheckPort;
}
// Always render the port explicitly. Dropping the default port
// (80/443) is only valid when host:<port> really is the mapped
// service, which cannot be assumed here (custom WaitStrategyTarget
// implementations, proxied environments, ...). An explicit port is
// also what the "un-map the port for logging" path above relies on:
// URI.getPort() returns -1 when the port is elided, which breaks the
// exposed-port lookup.
final String portSuffix = ":" + livenessCheckPort;

return URI.create(scheme + host + portSuffix + path);
}
Expand Down
Loading