diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java index 0849b3fec051..4d9d3775ff48 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java @@ -40,7 +40,7 @@ import static io.trino.tests.product.launcher.cli.Commands.runCommand; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; import static io.trino.tests.product.launcher.env.EnvironmentListener.getStandardListeners; import static java.util.Objects.requireNonNull; import static picocli.CommandLine.Mixin; @@ -109,7 +109,7 @@ public static class Execution implements Callable { private final EnvironmentFactory environmentFactory; - private final boolean withoutPrestoMaster; + private final boolean withoutTrinoMaster; private final boolean background; private final String environment; private final EnvironmentConfig environmentConfig; @@ -122,7 +122,7 @@ public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig enviro { this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null"); this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null"); - this.withoutPrestoMaster = options.withoutPrestoMaster; + this.withoutTrinoMaster = options.withoutTrinoMaster; this.background = environmentUpOptions.background; this.environment = environmentUpOptions.environment; this.outputMode = requireNonNull(options.output, "options.output is null"); @@ -139,8 +139,8 @@ public Integer call() .setLogsBaseDir(environmentLogPath) .removeContainer(TESTS); - if (withoutPrestoMaster) { - builder.removeContainers(container -> isPrestoContainer(container.getLogicalName())); + if (withoutTrinoMaster) { + builder.removeContainers(container -> isTrinoContainer(container.getLogicalName())); } log.info("Creating environment '%s' with configuration %s and options %s", environment, environmentConfig, extraOptions); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java index 76a5316ab8de..54bdbde17d37 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java @@ -69,9 +69,9 @@ import static io.trino.tests.product.launcher.env.DockerContainer.ensurePathExists; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; import static io.trino.tests.product.launcher.env.Environments.pruneEnvironment; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.lang.String.format; import static java.time.Duration.ofMinutes; import static java.util.Objects.requireNonNull; @@ -431,7 +431,7 @@ public Builder addConnector(String connectorName, MountableFile configFile) { requireNonNull(connectorName, "connectorName is null"); requireNonNull(configFile, "configFile is null"); - return addConnector(connectorName, configFile, CONTAINER_PRESTO_ETC + "/catalog/" + connectorName + ".properties"); + return addConnector(connectorName, configFile, CONTAINER_TRINO_ETC + "/catalog/" + connectorName + ".properties"); } public Builder addConnector(String connectorName, MountableFile configFile, String containerPath) @@ -439,7 +439,7 @@ public Builder addConnector(String connectorName, MountableFile configFile, Stri requireNonNull(configFile, "configFile is null"); requireNonNull(containerPath, "containerPath is null"); configureContainers(container -> { - if (isPrestoContainer(container.getLogicalName())) { + if (isTrinoContainer(container.getLogicalName())) { container.withCopyFileToContainer(configFile, containerPath); } }); @@ -458,7 +458,7 @@ public Builder addPasswordAuthenticator(String name, MountableFile configFile) { requireNonNull(name, "name is null"); requireNonNull(configFile, "configFile is null"); - return addPasswordAuthenticator(name, configFile, CONTAINER_PRESTO_ETC + "/password-authenticator.properties"); + return addPasswordAuthenticator(name, configFile, CONTAINER_TRINO_ETC + "/password-authenticator.properties"); } public Builder addPasswordAuthenticator(String name, MountableFile configFile, String containerPath) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java index a1b45c577563..3eccff16e5a8 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java @@ -29,9 +29,9 @@ public final class EnvironmentContainers private static final SecureRandom random = new SecureRandom(); private static final int RANDOM_SUFFIX_LENGTH = 5; - public static final String PRESTO = "presto"; - public static final String COORDINATOR = PRESTO + "-master"; - public static final String WORKER = PRESTO + "-worker"; + public static final String TRINO = "presto"; + public static final String COORDINATOR = TRINO + "-master"; + public static final String WORKER = TRINO + "-worker"; public static final String WORKER_NTH = WORKER + "-"; public static final String HADOOP = "hadoop-master"; public static final String TESTS = "tests"; @@ -44,9 +44,9 @@ public static String worker(int number) return WORKER_NTH + number; } - public static boolean isPrestoContainer(String name) + public static boolean isTrinoContainer(String name) { - return name.startsWith(PRESTO); + return name.startsWith(TRINO); } /** diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java index b8dd3e78e5cc..f9aa2b680578 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java @@ -40,7 +40,7 @@ public final class EnvironmentOptions public File serverPackage; @Option(names = "--without-trino", description = "Do not start " + COORDINATOR) - public boolean withoutPrestoMaster; + public boolean withoutTrinoMaster; public boolean bindPorts = true; int bindPortsBase; diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java index 86a3af52a46b..af504ba88afe 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java @@ -28,7 +28,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_CONF_ROOT; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_HEALTH_D; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.containers.wait.strategy.Wait.forHealthcheck; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -37,11 +37,11 @@ public final class Hadoop implements EnvironmentExtender { public static final String CONTAINER_HADOOP_INIT_D = "/etc/hadoop-init.d/"; - public static final String CONTAINER_PRESTO_HIVE_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/hive.properties"; - public static final String CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/hive_with_external_writes.properties"; - public static final String CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS = CONTAINER_PRESTO_ETC + "/catalog/hive_timestamp_nanos.properties"; - public static final String CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER = CONTAINER_PRESTO_ETC + "/catalog/hive_with_run_view_as_invoker.properties"; - public static final String CONTAINER_PRESTO_ICEBERG_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/iceberg.properties"; + public static final String CONTAINER_TRINO_HIVE_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/hive.properties"; + public static final String CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/hive_with_external_writes.properties"; + public static final String CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS = CONTAINER_TRINO_ETC + "/catalog/hive_timestamp_nanos.properties"; + public static final String CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER = CONTAINER_TRINO_ETC + "/catalog/hive_with_run_view_as_invoker.properties"; + public static final String CONTAINER_TRINO_ICEBERG_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/iceberg.properties"; private final DockerFiles dockerFiles; private final PortBinder portBinder; @@ -66,11 +66,11 @@ public void extendEnvironment(Environment.Builder builder) { builder.addContainer(createHadoopContainer(dockerFiles, portBinder, hadoopBaseImage + ":" + hadoopImagesVersion, HADOOP)); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER); - builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER); + builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); } @SuppressWarnings("resource") diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java index 4684648f8381..c797f935f867 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java @@ -27,7 +27,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -69,7 +69,7 @@ public void extendEnvironment(Environment.Builder builder) portBinder.exposePort(container, 7778); container .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster")) - .withCopyFileToContainer(forHostPath(configDir.getPath("config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(configDir.getPath("config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("create_kerberos_credential_cache_files.sh")), "/docker/presto-init.d/create_kerberos_credentials.sh"); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java index 566e583cad91..75b9fe311986 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java @@ -24,9 +24,9 @@ import org.testcontainers.containers.wait.strategy.WaitAllStrategy; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -104,14 +104,14 @@ public void extendEnvironment(Environment.Builder builder) builder.containerDependsOn(hydra.getLogicalName(), databaseContainer.getLogicalName()); builder.configureContainers(dockerContainer -> { - if (isPrestoContainer(dockerContainer.getLogicalName())) { + if (isTrinoContainer(dockerContainer.getLogicalName())) { dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("cert/trino.pem")), - CONTAINER_PRESTO_ETC + "/trino.pem") + CONTAINER_TRINO_ETC + "/trino.pem") .withCopyFileToContainer( forHostPath(configDir.getPath("cert/hydra.pem")), - CONTAINER_PRESTO_ETC + "/hydra.pem"); + CONTAINER_TRINO_ETC + "/hydra.pem"); } }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java index 80763dc2fa2c..74cf3f7eb9af 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java @@ -27,8 +27,8 @@ import java.time.Duration; import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -63,8 +63,8 @@ public void extendEnvironment(Environment.Builder builder) MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties")); builder.configureContainers(container -> { - if (isPrestoContainer(container.getLogicalName())) { - container.withCopyFileToContainer(logConfigFile, CONTAINER_PRESTO_ETC + "/log.properties"); + if (isTrinoContainer(container.getLogicalName())) { + container.withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_ETC + "/log.properties"); } }); } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java index 775fffb2dd3e..6caab7261f87 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java @@ -67,10 +67,10 @@ public final class Standard public static final String CONTAINER_HEALTH_D = "/etc/health.d/"; public static final String CONTAINER_CONF_ROOT = "/docker/presto-product-tests/"; - public static final String CONTAINER_PRESTO_ETC = CONTAINER_CONF_ROOT + "conf/presto/etc"; - public static final String CONTAINER_PRESTO_JVM_CONFIG = CONTAINER_PRESTO_ETC + "/jvm.config"; - public static final String CONTAINER_PRESTO_ACCESS_CONTROL_PROPERTIES = CONTAINER_PRESTO_ETC + "/access-control.properties"; - public static final String CONTAINER_PRESTO_CONFIG_PROPERTIES = CONTAINER_PRESTO_ETC + "/config.properties"; + public static final String CONTAINER_TRINO_ETC = CONTAINER_CONF_ROOT + "conf/presto/etc"; + public static final String CONTAINER_TRINO_JVM_CONFIG = CONTAINER_TRINO_ETC + "/jvm.config"; + public static final String CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES = CONTAINER_TRINO_ETC + "/access-control.properties"; + public static final String CONTAINER_TRINO_CONFIG_PROPERTIES = CONTAINER_TRINO_ETC + "/config.properties"; /** * @deprecated please use {@link EnvironmentContainers#configureTempto} instead. */ @@ -105,7 +105,7 @@ public Standard( @Override public void extendEnvironment(Environment.Builder builder) { - builder.addContainers(createPrestoMaster(), createTestsContainer()); + builder.addContainers(createTrinoMaster(), createTestsContainer()); // default catalogs copied from /docker/presto-product-tests builder.addConnector("blackhole"); builder.addConnector("jmx"); @@ -114,12 +114,12 @@ public void extendEnvironment(Environment.Builder builder) } @SuppressWarnings("resource") - private DockerContainer createPrestoMaster() + private DockerContainer createTrinoMaster() { DockerContainer container = - createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, COORDINATOR) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/access-control.properties")), CONTAINER_PRESTO_ACCESS_CONTROL_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES); + createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, COORDINATOR) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/access-control.properties")), CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES); portBinder.exposePort(container, 8080); // Trino default port return container; @@ -138,13 +138,13 @@ private DockerContainer createTestsContainer() } @SuppressWarnings("resource") - public static DockerContainer createPrestoContainer(DockerFiles dockerFiles, File serverPackage, SupportedTrinoJdk jdkVersion, boolean debug, String dockerImageName, String logicalName) + public static DockerContainer createTrinoContainer(DockerFiles dockerFiles, File serverPackage, SupportedTrinoJdk jdkVersion, boolean debug, String dockerImageName, String logicalName) { DockerContainer container = new DockerContainer(dockerImageName, logicalName) .withNetworkAliases(logicalName + ".docker.cluster") .withExposedLogPaths("/var/trino/var/log", "/var/log/container-health.log") .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests") - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/presto/etc/jvm.config")), CONTAINER_PRESTO_JVM_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/presto/etc/jvm.config")), CONTAINER_TRINO_JVM_CONFIG) .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("health-checks/trino-health-check.sh")), CONTAINER_HEALTH_D + "trino-health-check.sh") // the server package is hundreds MB and file system bind is much more efficient .withFileSystemBind(serverPackage.getPath(), "/docker/presto-server.tar.gz", READ_ONLY) @@ -154,7 +154,7 @@ public static DockerContainer createPrestoContainer(DockerFiles dockerFiles, Fil .waitingForAll(forLogMessage(".*======== SERVER STARTED ========.*", 1), forHealthcheck()) .withStartupTimeout(Duration.ofMinutes(5)); if (debug) { - enablePrestoJavaDebugger(container); + enableTrinoJavaDebugger(container); } else { container.withHealthCheck(dockerFiles.getDockerFilesHostPath("health-checks/health.sh")); @@ -162,7 +162,7 @@ public static DockerContainer createPrestoContainer(DockerFiles dockerFiles, Fil return container; } - private static void enablePrestoJavaDebugger(DockerContainer dockerContainer) + private static void enableTrinoJavaDebugger(DockerContainer dockerContainer) { String logicalName = dockerContainer.getLogicalName(); @@ -181,10 +181,10 @@ else if (logicalName.startsWith(WORKER_NTH)) { throw new IllegalStateException("Cannot enable Java debugger for: " + logicalName); } - enablePrestoJavaDebugger(dockerContainer, logicalName, debugPort); + enableTrinoJavaDebugger(dockerContainer, logicalName, debugPort); } - private static void enablePrestoJavaDebugger(DockerContainer container, String containerName, int debugPort) + private static void enableTrinoJavaDebugger(DockerContainer container, String containerName, int debugPort) { log.info("Enabling Java debugger for container: '%s' on port %d", containerName, debugPort); @@ -198,7 +198,7 @@ private static void enablePrestoJavaDebugger(DockerContainer container, String c "#!/bin/bash\n" + "printf '%%s\\n' '%s' >> '%s'\n", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:" + debugPort, - CONTAINER_PRESTO_JVM_CONFIG), + CONTAINER_TRINO_JVM_CONFIG), UTF_8); container.withCopyFileToContainer(forHostPath(script), "/docker/presto-init.d/enable-java-debugger.sh"); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java index 6c52f6c90fa0..ac9c4133c0a5 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java @@ -30,8 +30,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.createPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.createTrinoContainer; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -75,14 +75,14 @@ public List getDependencies() public void extendEnvironment(Environment.Builder builder) { builder.configureContainer(COORDINATOR, container -> container - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-master-config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES)); + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-master-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)); builder.addContainers(createTrinoWorker()); } @SuppressWarnings("resource") private DockerContainer createTrinoWorker() { - return createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, WORKER) - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES); + return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, WORKER) + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java index ce0e00b66143..2cf8bb18eda6 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigEnvBased.java @@ -24,7 +24,7 @@ import java.util.Optional; import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.PRESTO; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.TRINO; import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D; import static java.lang.System.getenv; import static java.util.Objects.requireNonNull; @@ -93,12 +93,12 @@ public List getExcludedTests() public void extendEnvironment(Environment.Builder builder) { builder.configureContainers(container -> { - if (container.getLogicalName().startsWith(PRESTO)) { - String prestoInitScript = getenv("HADOOP_PRESTO_INIT_SCRIPT"); + if (container.getLogicalName().startsWith(TRINO)) { + String trinoInitScript = getenv("HADOOP_PRESTO_INIT_SCRIPT"); - if (!Strings.isNullOrEmpty(prestoInitScript)) { + if (!Strings.isNullOrEmpty(trinoInitScript)) { container.withCopyFileToContainer( - forHostPath(dockerFiles.getDockerFilesHostPath(prestoInitScript)), + forHostPath(dockerFiles.getDockerFilesHostPath(trinoInitScript)), "/docker/presto-init.d/presto-init.sh"); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java index 3806f2854342..a4bc22f30bed 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/configs/ConfigHdp3.java @@ -18,7 +18,7 @@ import javax.inject.Inject; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.PRESTO; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.TRINO; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -48,7 +48,7 @@ public String getHadoopBaseImage() public void extendEnvironment(Environment.Builder builder) { builder.configureContainers(container -> { - if (container.getLogicalName().startsWith(PRESTO)) { + if (container.getLogicalName().startsWith(TRINO)) { container.withCopyFileToContainer(forHostPath( // HDP3's handling of timestamps is incompatible with previous versions of Hive (see https://issues.apache.org/jira/browse/HIVE-21002); // in order for Trino to deal with the differences, we must set catalog properties for Parquet and RCFile diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java index fff7fc56ef7a..bc24b70c6554 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java @@ -29,8 +29,8 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.LDAP; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -63,7 +63,7 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer.withCopyFileToContainer( forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-ldap/config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES); + CONTAINER_TRINO_CONFIG_PROPERTIES); portBinder.exposePort(dockerContainer, 8443); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java index 26d48be4e95c..4b1585bc5de7 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java @@ -22,7 +22,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -62,7 +62,7 @@ public void extendEnvironment(Environment.Builder builder) builder.addConnector( "delta-lake", forHostPath(configDir.getPath("delta.properties")), - CONTAINER_PRESTO_ETC + "/catalog/delta.properties"); + CONTAINER_TRINO_ETC + "/catalog/delta.properties"); builder.configureContainer(TESTS, container -> exportAWSCredentials(container) .withEnv("S3_BUCKET", s3Bucket) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java index ddfb73e49f47..13d9543b145a 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinode.java @@ -25,13 +25,13 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_ICEBERG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_JVM_CONFIG; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_ICEBERG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_JVM_CONFIG; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -39,7 +39,7 @@ public final class EnvMultinode extends EnvironmentProvider { - public static final String CONTAINER_PRESTO_HIVE_ACCESS_CONTROL = CONTAINER_PRESTO_ETC + "/catalog/hive.properties"; + public static final String CONTAINER_TRINO_HIVE_ACCESS_CONTROL = CONTAINER_TRINO_ETC + "/catalog/hive.properties"; private final DockerFiles dockerFiles; private final DockerFiles.ResourceProvider configDir; @@ -56,14 +56,14 @@ public EnvMultinode(DockerFiles dockerFiles, StandardMultinode standardMultinode public void extendEnvironment(Environment.Builder builder) { builder.configureContainer(COORDINATOR, container -> container - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-master-jvm.config")), CONTAINER_PRESTO_JVM_CONFIG)); + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-master-jvm.config")), CONTAINER_TRINO_JVM_CONFIG)); builder.configureContainer(WORKER, container -> container - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-jvm.config")), CONTAINER_PRESTO_JVM_CONFIG) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES)); + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-jvm.config")), CONTAINER_TRINO_JVM_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES)); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java index 2a51b917cb36..390d819175fd 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAllConnectors.java @@ -24,8 +24,8 @@ import java.util.List; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static org.testcontainers.utility.MountableFile.forHostPath; @TestsEnvironment @@ -82,13 +82,13 @@ public void extendEnvironment(Environment.Builder builder) connector, forHostPath(configDir.getPath(connector + ".properties")))); builder.configureContainers(container -> { - if (isPrestoContainer(container.getLogicalName())) { + if (isTrinoContainer(container.getLogicalName())) { container.withCopyFileToContainer( forHostPath(configDir.getPath("google-sheets-auth.json")), - CONTAINER_PRESTO_ETC + "/catalog/google-sheets-auth.json"); + CONTAINER_TRINO_ETC + "/catalog/google-sheets-auth.json"); container.withCopyFileToContainer( forHostPath(configDir.getPath("prometheus-bearer.txt")), - CONTAINER_PRESTO_ETC + "/catalog/prometheus-bearer.txt"); + CONTAINER_TRINO_ETC + "/catalog/prometheus-bearer.txt"); } }); } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java index 5e98dd7be7b7..053bc9261fbd 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java @@ -39,8 +39,8 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.nio.file.attribute.PosixFilePermissions.fromString; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -83,7 +83,7 @@ public void extendEnvironment(Environment.Builder builder) throw new UncheckedIOException(e); } - String containerGcpCredentialsFile = CONTAINER_PRESTO_ETC + "gcp-credentials.json"; + String containerGcpCredentialsFile = CONTAINER_TRINO_ETC + "gcp-credentials.json"; builder.configureContainer(HADOOP, container -> { container.setDockerImageName("ghcr.io/trinodb/testing/hdp3.1-hive:" + hadoopImageVersion); container.withCopyFileToContainer( @@ -112,9 +112,9 @@ public void extendEnvironment(Environment.Builder builder) .withEnv("GCP_STORAGE_BUCKET", gcpStorageBucket) .withEnv("GCP_TEST_DIRECTORY", gcsTestDirectory)); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES); - builder.addConnector("delta", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/delta.properties")), CONTAINER_PRESTO_ETC + "/catalog/delta.properties"); - builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/iceberg.properties")), CONTAINER_PRESTO_ETC + "/catalog/iceberg.properties"); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES); + builder.addConnector("delta", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/delta.properties")), CONTAINER_TRINO_ETC + "/catalog/delta.properties"); + builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/iceberg.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg.properties"); configureTempto(builder, dockerFiles.getDockerFilesHostDirectory("conf/environment/multinode-gcs/")); } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java index cca0231817d1..1de46192ebc8 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java @@ -32,11 +32,11 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.worker; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_JVM_CONFIG; -import static io.trino.tests.product.launcher.env.common.Standard.createPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_JVM_CONFIG; +import static io.trino.tests.product.launcher.env.common.Standard.createTrinoContainer; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -44,7 +44,7 @@ public final class EnvMultinodeHiveCaching extends EnvironmentProvider { - public static final String CONTAINER_PRESTO_HIVE_NON_CACHED_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/hivenoncached.properties"; + public static final String CONTAINER_TRINO_HIVE_NON_CACHED_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/hivenoncached.properties"; private final DockerFiles dockerFiles; private final DockerFiles.ResourceProvider configDir; @@ -77,24 +77,24 @@ public EnvMultinodeHiveCaching( public void extendEnvironment(Environment.Builder builder) { builder.configureContainer(COORDINATOR, container -> container - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-master-jvm.config")), CONTAINER_PRESTO_JVM_CONFIG) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-master-config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-master-jvm.config")), CONTAINER_TRINO_JVM_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-master-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) .withTmpFs(ImmutableMap.of("/tmp/cache", "rw"))); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_NON_CACHED_PROPERTIES); - builder.addConnector("hive", forHostPath(configDir.getPath("multinode-cached/hive-coordinator.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_NON_CACHED_PROPERTIES); + builder.addConnector("hive", forHostPath(configDir.getPath("multinode-cached/hive-coordinator.properties")), CONTAINER_TRINO_HIVE_PROPERTIES); - createPrestoWorker(builder, 0); - createPrestoWorker(builder, 1); + createTrinoWorker(builder, 0); + createTrinoWorker(builder, 1); } @SuppressWarnings("resource") - private void createPrestoWorker(Environment.Builder builder, int workerNumber) + private void createTrinoWorker(Environment.Builder builder, int workerNumber) { - builder.addContainer(createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, worker(workerNumber)) - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-worker-jvm.config")), CONTAINER_PRESTO_JVM_CONFIG) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-worker-config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_NON_CACHED_PROPERTIES) - .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-cached/hive-worker.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) + builder.addContainer(createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, worker(workerNumber)) + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-worker-jvm.config")), CONTAINER_TRINO_JVM_CONFIG) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_NON_CACHED_PROPERTIES) + .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-cached/hive-worker.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) .withTmpFs(ImmutableMap.of("/tmp/cache", "rw"))); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java index f5e351d26555..a3f3e8079185 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafka.java @@ -29,7 +29,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -62,9 +62,9 @@ private void addCatalogs(DockerContainer container) container .withCopyFileToContainer( forHostPath(configDir.getPath("kafka_schema_registry.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka_schema_registry.properties") + CONTAINER_TRINO_ETC + "/catalog/kafka_schema_registry.properties") .withCopyFileToContainer( forHostPath(configDir.getPath("kafka.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka.properties"); + CONTAINER_TRINO_ETC + "/catalog/kafka.properties"); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java index a04c3666d8b4..b21883f160ec 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSaslPlaintext.java @@ -29,7 +29,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -58,7 +58,7 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(TESTS, container -> container .withCopyFileToContainer( forHostPath(configDir.getPath("kafka-configuration.properties")), - CONTAINER_PRESTO_ETC + "/kafka-configuration.properties")); + CONTAINER_TRINO_ETC + "/kafka-configuration.properties")); } private void addCatalogs(DockerContainer container) @@ -66,12 +66,12 @@ private void addCatalogs(DockerContainer container) container .withCopyFileToContainer( forHostPath(configDir.getPath("kafka_schema_registry.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka_schema_registry.properties") + CONTAINER_TRINO_ETC + "/catalog/kafka_schema_registry.properties") .withCopyFileToContainer( forHostPath(configDir.getPath("kafka.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka.properties") + CONTAINER_TRINO_ETC + "/catalog/kafka.properties") .withCopyFileToContainer( forHostPath(configDir.getPath("kafka-configuration.properties")), - CONTAINER_PRESTO_ETC + "/kafka-configuration.properties"); + CONTAINER_TRINO_ETC + "/kafka-configuration.properties"); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java index bc9578e0b06b..b76bc021d6a1 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKafkaSsl.java @@ -29,7 +29,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.WORKER; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -66,12 +66,12 @@ private void addCatalogs(DockerContainer container) container .withCopyFileToContainer( forHostPath(configDir.getPath("kafka_schema_registry.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka_schema_registry.properties") + CONTAINER_TRINO_ETC + "/catalog/kafka_schema_registry.properties") .withCopyFileToContainer( forHostPath(configDir.getPath("kafka.properties")), - CONTAINER_PRESTO_ETC + "/catalog/kafka.properties") + CONTAINER_TRINO_ETC + "/catalog/kafka.properties") .withCopyFileToContainer( forHostPath(configDir.getPath("secrets")), - CONTAINER_PRESTO_ETC + "/catalog/secrets"); + CONTAINER_TRINO_ETC + "/catalog/secrets"); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java index b2ab67670c90..6a1410830038 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeKerberosKudu.java @@ -29,7 +29,7 @@ import java.util.List; import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; import static io.trino.tests.product.launcher.env.common.Kerberos.DEFAULT_WAIT_STRATEGY; import static io.trino.tests.product.launcher.env.common.Kerberos.KERBEROS; import static java.lang.String.format; @@ -86,7 +86,7 @@ public void extendEnvironment(Environment.Builder builder) }); builder.configureContainers(container -> { - if (isPrestoContainer(container.getLogicalName())) { + if (isTrinoContainer(container.getLogicalName())) { builder.addConnector("kudu", forHostPath(configDir.getPath("kudu.properties"))); container.withFileSystemBind(kerberosCredentialsDirectory.toString(), "/kerberos", READ_ONLY); addKrb5(container); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java index 1726cda7bdf4..007ab0ed87c0 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeMinioDataLake.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static org.testcontainers.utility.MountableFile.forHostPath; /** @@ -49,7 +49,7 @@ public void extendEnvironment(Environment.Builder builder) builder.addConnector( "delta-lake", forHostPath(configDir.getPath("delta.properties")), - CONTAINER_PRESTO_ETC + "/catalog/delta.properties"); + CONTAINER_TRINO_ETC + "/catalog/delta.properties"); builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg.properties"))); builder.addConnector("memory", forHostPath(configDir.getPath("memory.properties"))); } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java index e8163f76a708..cba2b351d0a7 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodePhoenix5.java @@ -30,8 +30,8 @@ import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -66,9 +66,9 @@ public void extendEnvironment(Environment.Builder builder) builder.addContainer(phoenix); builder.configureContainers(container -> { - if (isPrestoContainer(container.getLogicalName())) { - container.withCopyFileToContainer(forHostPath(configDir.getPath("hbase-site.xml")), CONTAINER_PRESTO_ETC + "/hbase-site.xml"); - container.withCopyFileToContainer(forHostPath(configDir.getPath("phoenix.properties")), CONTAINER_PRESTO_ETC + "/catalog/phoenix.properties"); + if (isTrinoContainer(container.getLogicalName())) { + container.withCopyFileToContainer(forHostPath(configDir.getPath("hbase-site.xml")), CONTAINER_TRINO_ETC + "/hbase-site.xml"); + container.withCopyFileToContainer(forHostPath(configDir.getPath("phoenix.properties")), CONTAINER_TRINO_ETC + "/catalog/phoenix.properties"); } }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java index 4956851e3886..0aafac56882c 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java @@ -34,11 +34,11 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.worker; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_ICEBERG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_ICEBERG_PROPERTIES; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG; -import static io.trino.tests.product.launcher.env.common.Standard.createPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.createTrinoContainer; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -81,23 +81,23 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(COORDINATOR, container -> { container .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster")) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-master.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-master.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES); portBinder.exposePort(container, 7778); }); - builder.addContainers(createPrestoWorker(worker(1)), createPrestoWorker(worker(2))); + builder.addContainers(createTrinoWorker(worker(1)), createTrinoWorker(worker(2))); builder.configureContainer(TESTS, container -> { container.withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/tempto/tempto-configuration-for-docker-tls.yaml")), CONTAINER_TEMPTO_PROFILE_CONFIG); }); } - private DockerContainer createPrestoWorker(String workerName) + private DockerContainer createTrinoWorker(String workerName) { - return createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, workerName) + return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, workerName) .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster")) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-worker.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java index 7137d604ac1d..123ae95109b2 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberos.java @@ -34,10 +34,10 @@ import static com.google.common.base.Verify.verify; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.worker; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_ICEBERG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.createPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_ICEBERG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.createTrinoContainer; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -47,7 +47,7 @@ public final class EnvMultinodeTlsKerberos { private final DockerFiles dockerFiles; - private final String prestoDockerImageName; + private final String trinoDockerImageName; private final SupportedTrinoJdk jdkVersion; private final File serverPackage; private final boolean debug; @@ -66,7 +66,7 @@ public EnvMultinodeTlsKerberos( this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null"); String hadoopBaseImage = config.getHadoopBaseImage(); String hadoopImagesVersion = config.getHadoopImagesVersion(); - this.prestoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion; + this.trinoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion; this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null"); this.serverPackage = requireNonNull(serverPackage, "serverPackage is null"); this.debug = debug; @@ -77,23 +77,23 @@ public EnvMultinodeTlsKerberos( public void extendEnvironment(Environment.Builder builder) { builder.configureContainer(COORDINATOR, container -> { - verify(Objects.equals(container.getDockerImageName(), prestoDockerImageName), "Expected image '%s', but is '%s'", prestoDockerImageName, container.getDockerImageName()); + verify(Objects.equals(container.getDockerImageName(), trinoDockerImageName), "Expected image '%s', but is '%s'", trinoDockerImageName, container.getDockerImageName()); container - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-master.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-master.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); }); - builder.addContainers(createPrestoWorker(worker(1)), createPrestoWorker(worker(2))); + builder.addContainers(createTrinoWorker(worker(1)), createTrinoWorker(worker(2))); } @SuppressWarnings("resource") - private DockerContainer createPrestoWorker(String workerName) + private DockerContainer createTrinoWorker(String workerName) { - return createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, prestoDockerImageName, workerName) + return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, trinoDockerImageName, workerName) .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster")) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java index b266a4b58534..ab0364267b25 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTlsKerberosDelegation.java @@ -35,10 +35,10 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; import static io.trino.tests.product.launcher.env.EnvironmentContainers.worker; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_HIVE_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_PRESTO_ICEBERG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.createPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_HIVE_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_TRINO_ICEBERG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.createTrinoContainer; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -49,7 +49,7 @@ public final class EnvMultinodeTlsKerberosDelegation private final DockerFiles dockerFiles; private final DockerFiles.ResourceProvider configDir; - private final String prestoDockerImageName; + private final String trinoDockerImageName; private final SupportedTrinoJdk jdkVersion; private final File serverPackage; private final boolean debug; @@ -69,7 +69,7 @@ public EnvMultinodeTlsKerberosDelegation( this.dockerFiles = requireNonNull(dockerFiles, "dockerFiles is null"); String hadoopBaseImage = config.getHadoopBaseImage(); String hadoopImagesVersion = config.getHadoopImagesVersion(); - this.prestoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion; + this.trinoDockerImageName = hadoopBaseImage + "-kerberized:" + hadoopImagesVersion; this.jdkVersion = requireNonNull(jdkVersion, "jdkVersion is null"); this.serverPackage = requireNonNull(serverPackage, "serverPackage is null"); this.debug = debug; @@ -80,24 +80,24 @@ public EnvMultinodeTlsKerberosDelegation( public void extendEnvironment(Environment.Builder builder) { builder.configureContainer(COORDINATOR, container -> { - verify(Objects.equals(container.getDockerImageName(), prestoDockerImageName), "Expected image '%s', but is '%s'", prestoDockerImageName, container.getDockerImageName()); + verify(Objects.equals(container.getDockerImageName(), trinoDockerImageName), "Expected image '%s', but is '%s'", trinoDockerImageName, container.getDockerImageName()); container - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-master.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-master.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES); }); - builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES); - builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES); + builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); - builder.addContainers(createPrestoWorker(worker(1)), createPrestoWorker(worker(2))); + builder.addContainers(createTrinoWorker(worker(1)), createTrinoWorker(worker(2))); configureTempto(builder, configDir); } @SuppressWarnings("resource") - private DockerContainer createPrestoWorker(String workerName) + private DockerContainer createTrinoWorker(String workerName) { - return createPrestoContainer(dockerFiles, serverPackage, jdkVersion, debug, prestoDockerImageName, workerName) + return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, trinoDockerImageName, workerName) .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster")) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES) - .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES); + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES) + .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls-kerberos/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCassandra.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCassandra.java index 53be0d525a23..808e4db943a4 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCassandra.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCassandra.java @@ -28,7 +28,7 @@ import java.time.Duration; import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -39,7 +39,7 @@ public final class EnvSinglenodeCassandra private final DockerFiles dockerFiles; private final PortBinder portBinder; - public static final String CONTAINER_PRESTO_CASSANDRA_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/cassandra.properties"; + public static final String CONTAINER_TRINO_CASSANDRA_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/cassandra.properties"; public static final int CASSANDRA_PORT = 9042; @Inject diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java index 167fd8ff75ee..32da388a6732 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeKerberizedHdfs.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static org.testcontainers.utility.MountableFile.forHostPath; @TestsEnvironment @@ -45,6 +45,6 @@ public void extendEnvironment(Environment.Builder builder) builder.addConnector( "delta-lake", forHostPath(configDir.getPath("delta.properties")), - CONTAINER_PRESTO_ETC + "/catalog/delta.properties"); + CONTAINER_TRINO_ETC + "/catalog/delta.properties"); } } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java index 56e2d61bdb3a..c15a443ae1f5 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java @@ -41,8 +41,8 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; import static io.trino.tests.product.launcher.env.common.Minio.MINIO_CONTAINER_NAME; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -97,7 +97,7 @@ public void extendEnvironment(Environment.Builder builder) builder.addConnector( "delta-lake", forHostPath(configDir.getPath("delta.properties")), - CONTAINER_PRESTO_ETC + "/catalog/delta.properties"); + CONTAINER_TRINO_ETC + "/catalog/delta.properties"); builder.configureContainer(TESTS, dockerContainer -> { dockerContainer.withEnv("S3_BUCKET", s3Bucket) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java index 938433a366d9..984e9d9e1400 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeKerberosHdfsImpersonationWithDataProtection.java @@ -26,7 +26,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static org.testcontainers.utility.MountableFile.forHostPath; @TestsEnvironment @@ -54,7 +54,7 @@ public void extendEnvironment(Environment.Builder builder) builder.configureContainer(COORDINATOR, container -> { container - .withCopyFileToContainer(forHostPath(configDir.getPath("hive-data-protection-site.xml")), CONTAINER_PRESTO_ETC + "/hive-data-protection-site.xml"); + .withCopyFileToContainer(forHostPath(configDir.getPath("hive-data-protection-site.xml")), CONTAINER_TRINO_ETC + "/hive-data-protection-site.xml"); }); builder.addConnector("hive", forHostPath(configDir.getPath("hive.properties"))); } diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java index 2e083647dfbc..d9b48880d84e 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapAndFile.java @@ -27,8 +27,8 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static org.testcontainers.utility.MountableFile.forHostPath; @TestsEnvironment @@ -49,15 +49,15 @@ public void extendEnvironment(Environment.Builder builder) builder.addPasswordAuthenticator( "file", forHostPath(configDir.getPath("file-authenticator.properties")), - CONTAINER_PRESTO_ETC + "/file-authenticator.properties"); + CONTAINER_TRINO_ETC + "/file-authenticator.properties"); builder.configureContainer(COORDINATOR, dockerContainer -> { dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES) + CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("password.db")), - CONTAINER_PRESTO_ETC + "/password.db"); + CONTAINER_TRINO_ETC + "/password.db"); }); configureTempto(builder, configDir); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java index d8bcf4163aec..0d20572ad6bc 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -58,10 +58,10 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES) + CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_PRESTO_ETC + "/log.properties"); + CONTAINER_TRINO_ETC + "/log.properties"); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java index 3bd499c47fb6..4ceb613ee716 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpProxy.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -58,10 +58,10 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES) + CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_PRESTO_ETC + "/log.properties"); + CONTAINER_TRINO_ETC + "/log.properties"); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java index 1e62bbec520c..63f72030382f 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2HttpsProxy.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -58,13 +58,13 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES) + CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("cert/truststore.jks")), - CONTAINER_PRESTO_ETC + "/cert/truststore.jks") + CONTAINER_TRINO_ETC + "/cert/truststore.jks") .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_PRESTO_ETC + "/log.properties"); + CONTAINER_TRINO_ETC + "/log.properties"); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java index 30d3b882fde6..020095be4b5c 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOauth2Refresh.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -58,10 +58,10 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES) + CONTAINER_TRINO_CONFIG_PROPERTIES) .withCopyFileToContainer( forHostPath(configDir.getPath("log.properties")), - CONTAINER_PRESTO_ETC + "/log.properties"); + CONTAINER_TRINO_ETC + "/log.properties"); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java index 8eaffe33cb10..491467644419 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidc.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -56,7 +56,7 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES); + CONTAINER_TRINO_CONFIG_PROPERTIES); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java index 76c12f136291..44fc59a53b20 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeOidcRefresh.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; @@ -56,7 +56,7 @@ public void extendEnvironment(Environment.Builder builder) dockerContainer .withCopyFileToContainer( forHostPath(configDir.getPath("config.properties")), - CONTAINER_PRESTO_CONFIG_PROPERTIES); + CONTAINER_TRINO_CONFIG_PROPERTIES); binder.exposePort(dockerContainer, 7778); }); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java index 45f070436166..824b2ac3df94 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoKerberosHives.java @@ -41,7 +41,7 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; import static io.trino.tests.product.launcher.env.common.Hadoop.CONTAINER_HADOOP_INIT_D; import static io.trino.tests.product.launcher.env.common.Hadoop.createHadoopContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static java.util.UUID.randomUUID; import static org.testcontainers.containers.BindMode.READ_WRITE; @@ -49,7 +49,7 @@ /** * Two pseudo-distributed, kerberized Hadoop installations running on side-by-side, - * each within single container, with single-node, kerberized Presto. + * each within single container, with single-node, kerberized Trino. */ @TestsEnvironment public final class EnvTwoKerberosHives @@ -97,10 +97,10 @@ public void extendEnvironment(Environment.Builder builder) .withFileSystemBind(keytabsHostDirectory, "/etc/trino/conf", READ_WRITE) .withCopyFileToContainer(forHostPath(configDir.getPath("presto-krb5.conf")), "/etc/krb5.conf"); }); - builder.addConnector("hive", forHostPath(configDir.getPath("hive1.properties")), CONTAINER_PRESTO_ETC + "/catalog/hive1.properties"); - builder.addConnector("hive", forHostPath(configDir.getPath("hive2.properties")), CONTAINER_PRESTO_ETC + "/catalog/hive2.properties"); - builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg1.properties")), CONTAINER_PRESTO_ETC + "/catalog/iceberg1.properties"); - builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg2.properties")), CONTAINER_PRESTO_ETC + "/catalog/iceberg2.properties"); + builder.addConnector("hive", forHostPath(configDir.getPath("hive1.properties")), CONTAINER_TRINO_ETC + "/catalog/hive1.properties"); + builder.addConnector("hive", forHostPath(configDir.getPath("hive2.properties")), CONTAINER_TRINO_ETC + "/catalog/hive2.properties"); + builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg1.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg1.properties"); + builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg2.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg2.properties"); builder.configureContainer(HADOOP, container -> { container.setDockerImageName(hadoopBaseImage + "-kerberized:" + hadoopImagesVersion); diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java index 3c409afd919f..5fc4c22085e8 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvTwoMixedHives.java @@ -29,14 +29,14 @@ import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP; import static io.trino.tests.product.launcher.env.common.Hadoop.createHadoopContainer; -import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.utility.MountableFile.forHostPath; /** * Two pseudo-distributed Hadoop installations running on side-by-side, * each within single container (one kerberized and one not), with single-node, - * kerberized Presto. + * kerberized Trino. */ @TestsEnvironment public final class EnvTwoMixedHives @@ -68,10 +68,10 @@ public EnvTwoMixedHives( @Override public void extendEnvironment(Environment.Builder builder) { - builder.addConnector("hive", forHostPath(configDir.getPath("hive1.properties")), CONTAINER_PRESTO_ETC + "/catalog/hive1.properties"); - builder.addConnector("hive", forHostPath(configDir.getPath("hive2.properties")), CONTAINER_PRESTO_ETC + "/catalog/hive2.properties"); - builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg1.properties")), CONTAINER_PRESTO_ETC + "/catalog/iceberg1.properties"); - builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg2.properties")), CONTAINER_PRESTO_ETC + "/catalog/iceberg2.properties"); + builder.addConnector("hive", forHostPath(configDir.getPath("hive1.properties")), CONTAINER_TRINO_ETC + "/catalog/hive1.properties"); + builder.addConnector("hive", forHostPath(configDir.getPath("hive2.properties")), CONTAINER_TRINO_ETC + "/catalog/hive2.properties"); + builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg1.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg1.properties"); + builder.addConnector("iceberg", forHostPath(configDir.getPath("iceberg2.properties")), CONTAINER_TRINO_ETC + "/catalog/iceberg2.properties"); builder.addContainer(createHadoopMaster2()); }