Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.airlift.units.DataSize;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.io.IOException;
Expand All @@ -39,7 +40,7 @@ public class OpenTracingCollector

public OpenTracingCollector()
{
container = new GenericContainer<>("jaegertracing/all-in-one:latest");
container = new GenericContainer<>(DockerImageName.parse("jaegertracing/all-in-one:latest"));
container.setPortBindings(List.of("%1$s:%1$s".formatted(COLLECTOR_PORT), "%1$s:%1$s".formatted(HTTP_PORT)));
container.addEnv("COLLECTOR_OTLP_ENABLED", "true");
container.addEnv("SPAN_STORAGE_TYPE", "badger"); // KV that stores spans to the disk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.util.List;

Expand All @@ -35,11 +36,11 @@ public static void main(String[] args)
Logging.initialize();
Logger log = Logger.get(TrinoGatewayRunner.class);

TrinoContainer trino1 = new TrinoContainer("trinodb/trino:466");
TrinoContainer trino1 = new TrinoContainer(DockerImageName.parse("trinodb/trino:466"));
trino1.setPortBindings(List.of("8081:8080"));
trino1.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino1.start();
TrinoContainer trino2 = new TrinoContainer("trinodb/trino:466");
TrinoContainer trino2 = new TrinoContainer(DockerImageName.parse("trinodb/trino:466"));
trino2.setPortBindings(List.of("8082:8080"));
trino2.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino2.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -84,10 +85,10 @@ final class TestGatewayHaMultipleBackend
void setup()
throws Exception
{
adhocTrino = new TrinoContainer("trinodb/trino");
adhocTrino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
adhocTrino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
adhocTrino.start();
scheduledTrino = new TrinoContainer("trinodb/trino");
scheduledTrino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
scheduledTrino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
scheduledTrino.start();
postgresql.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.util.List;
Expand All @@ -49,7 +50,7 @@ final class TestGatewayHaSingleBackend
void setup()
throws Exception
{
trino = new TrinoContainer("trinodb/trino");
trino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
trino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino.start();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.junit.jupiter.api.TestInstance;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;

Expand All @@ -45,7 +46,7 @@ final class TestGatewayHaWithRoutingRulesSingleBackend
void setup()
throws Exception
{
trino = new TrinoContainer("trinodb/trino");
trino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
trino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino.start();
postgresql.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;

Expand All @@ -47,7 +48,7 @@ final class TestNoXForwarded
void setup()
throws Exception
{
trino = new TrinoContainer("trinodb/trino");
trino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
trino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino.start();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.util.Map;
import java.util.function.Function;
Expand All @@ -48,7 +49,7 @@ final class TestClusterStatsMonitor
void setUp()
{
// TODO https://github.com/trinodb/trino-gateway/issues/773 Update Trino version
trino = new TrinoContainer("trinodb/trino:476");
trino = new TrinoContainer(DockerImageName.parse("trinodb/trino:476"));
trino.withCopyFileToContainer(forClasspathResource("trino-config-with-rmi.properties"), "/etc/trino/config.properties");
trino.withCopyFileToContainer(forClasspathResource("jvm-with-rmi.config"), "/etc/trino/jvm.config");
trino.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@

import org.jdbi.v3.core.Handle;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.utility.DockerImageName;

final class TestDatabaseMigrationsMySql
extends BaseTestDatabaseMigrations
{
public TestDatabaseMigrationsMySql()
{
super(new MySQLContainer<>("mysql:8.0.36"), "test");
super(new MySQLContainer<>(DockerImageName.parse("mysql:8.0.36")), "test");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
package io.trino.gateway.ha.router;

import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.utility.DockerImageName;

public class TestExternalUrlQueryHistoryMySql
extends BaseExternalUrlQueryHistoryTest
{
public TestExternalUrlQueryHistoryMySql()
{
super(new MySQLContainer<>("mysql:8.0.36"));
super(new MySQLContainer<>(DockerImageName.parse("mysql:8.0.36")));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@

import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.utility.DockerImageName;

public class TestQueryHistoryManagerMySql
extends BaseTestQueryHistoryManager
{
@Override
protected final JdbcDatabaseContainer<?> startContainer()
{
JdbcDatabaseContainer<?> container = new MySQLContainer<>("mysql:8.0.36");
JdbcDatabaseContainer<?> container = new MySQLContainer<>(DockerImageName.parse("mysql:8.0.36"));
container.start();
return container;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.junit.jupiter.api.TestInstance;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.TrinoContainer;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.util.List;
Expand All @@ -52,7 +53,7 @@ final class TestRoutingAPI
void setup()
throws Exception
{
trino = new TrinoContainer("trinodb/trino");
trino = new TrinoContainer(DockerImageName.parse("trinodb/trino"));
trino.withCopyFileToContainer(forClasspathResource("trino-config.properties"), "/etc/trino/config.properties");
trino.start();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import java.time.Instant;
import java.util.Base64;
import java.util.Date;
import java.util.Optional;

import static com.auth0.jwt.algorithms.Algorithm.HMAC256;
Expand Down Expand Up @@ -71,7 +70,7 @@ void testUserFromJwtToken()
String token = JWT.create()
.withIssuer("gateway")
.withClaim(claimUserName, claimUserValue)
.withExpiresAt(Date.from(expiryTime))
.withExpiresAt(expiryTime)
.sign(algorithm);

HttpServletRequest mockRequest = new QueryRequestMock()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
import org.testcontainers.utility.DockerImageName;

import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
Expand Down Expand Up @@ -84,14 +85,14 @@ void setup()
.withDatabaseName("hydra");
databaseContainer.start();

GenericContainer migrationContainer = new GenericContainer(HYDRA_IMAGE)
GenericContainer migrationContainer = new GenericContainer(DockerImageName.parse(HYDRA_IMAGE))
.withNetwork(network)
.withCommand("migrate", "sql", "--yes", DSN)
.dependsOn(databaseContainer)
.withStartupCheckStrategy(new OneShotStartupCheckStrategy());
migrationContainer.start();

FixedHostPortGenericContainer<?> hydraConsent = new FixedHostPortGenericContainer<>("python:3.10.1-alpine")
FixedHostPortGenericContainer<?> hydraConsent = new FixedHostPortGenericContainer<>(DockerImageName.parse("python:3.10.1-alpine"))
.withFixedExposedPort(3000, 3000)
.withNetwork(network)
.withNetworkAliases("hydra-consent")
Expand All @@ -101,7 +102,7 @@ void setup()
.waitingFor(Wait.forHttp("/healthz").forPort(3000).forStatusCode(200));
hydraConsent.start();

FixedHostPortGenericContainer<?> hydra = new FixedHostPortGenericContainer<>(HYDRA_IMAGE)
FixedHostPortGenericContainer<?> hydra = new FixedHostPortGenericContainer<>(DockerImageName.parse(HYDRA_IMAGE))
.withFixedExposedPort(4444, 4444)
.withFixedExposedPort(4445, 4445)
.withNetwork(network)
Expand Down Expand Up @@ -130,7 +131,7 @@ void setup()
String tokenEndpointAuthMethod = "client_secret_basic";
String audience = "trino_client_id";
String callbackUrl = format("https://localhost:%s/oidc/callback", ROUTER_PORT);
GenericContainer clientCreatingContainer = new GenericContainer(HYDRA_IMAGE)
GenericContainer clientCreatingContainer = new GenericContainer(DockerImageName.parse(HYDRA_IMAGE))
.withNetwork(network)
.dependsOn(hydra)
.withCommand("clients", "create",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
import org.testcontainers.utility.DockerImageName;

import java.time.Duration;

Expand All @@ -27,7 +28,7 @@ private TestcontainersUtils() {}
public static PostgreSQLContainer<?> createPostgreSqlContainer()
{
//noinspection resource
return new PostgreSQLContainer<>("postgres:17")
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17"))
.waitingFor(new WaitAllStrategy()
.withStrategy(Wait.forListeningPort())
.withStrategy(new LogMessageWaitStrategy()
Expand Down
Loading