Skip to content

Replace deprecated FixedHostPortGenericContainer with GenericContainer in TestOIDC #863

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

Closed
Copilot wants to merge 1 commit into from
Closed

Replace deprecated FixedHostPortGenericContainer with GenericContainer in TestOIDC #863

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
11 changes: 5 additions & 6 deletions gateway-ha/src/test/java/io/trino/gateway/ha/security/TestOIDC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.PostgreSQLContainer;
Expand Down Expand Up @@ -91,19 +90,17 @@ void setup()
.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
migrationContainer.start();

FixedHostPortGenericContainer<?> hydraConsent = new FixedHostPortGenericContainer<>("python:3.10.1-alpine")
.withFixedExposedPort(3000, 3000)
GenericContainer<?> hydraConsent = new GenericContainer<>("python:3.10.1-alpine")
.withNetwork(network)
.withNetworkAliases("hydra-consent")
.withExposedPorts(3000)
.withCopyFileToContainer(forClasspathResource("auth/login_and_consent_server.py"), "/")
.withCommand("python", "/login_and_consent_server.py")
.waitingFor(Wait.forHttp("/healthz").forPort(3000).forStatusCode(200));
hydraConsent.setPortBindings(List.of("3000:3000"));
hydraConsent.start();

FixedHostPortGenericContainer<?> hydra = new FixedHostPortGenericContainer<>(HYDRA_IMAGE)
.withFixedExposedPort(4444, 4444)
.withFixedExposedPort(4445, 4445)
GenericContainer<?> hydra = new GenericContainer<>(HYDRA_IMAGE)
.withNetwork(network)
.withNetworkAliases("hydra")
.withEnv("LOG_LEVEL", "debug")
Expand All @@ -124,6 +121,8 @@ void setup()
.withStrategy(Wait.forLogMessage(".*Setting up http server on :4444.*", 1))
.withStrategy(Wait.forLogMessage(".*Setting up http server on :4445.*", 1)))
.withStartupTimeout(java.time.Duration.ofMinutes(3));
hydra.setPortBindings(List.of("4444:4444", "4445:4445"));
hydra.start();

String clientId = "trino_client_id";
String clientSecret = "trino_client_secret";
Expand Down