Use official Polaris Catalog docker image

Author: ebyhr

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java

@@ -235,7 +235,11 @@ public static void main(String[] args)
                 throws Exception
         {
             Path warehouseLocation = Files.createTempDirectory(null);
-            warehouseLocation.toFile().deleteOnExit();
+            File warehouseDir = warehouseLocation.toFile();
+            warehouseDir.deleteOnExit();
+            warehouseDir.setReadable(true, false);
+            warehouseDir.setWritable(true, false);
+            warehouseDir.setExecutable(true, false);
 
             @SuppressWarnings("resource")
             TestingPolarisCatalog polarisCatalog = new TestingPolarisCatalog(warehouseLocation.toString());

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergPolarisCatalogConnectorSmokeTest.java

@@ -18,6 +18,7 @@
 import io.trino.plugin.iceberg.IcebergConfig;
 import io.trino.plugin.iceberg.IcebergConnector;
 import io.trino.plugin.iceberg.IcebergQueryRunner;
+import io.trino.plugin.iceberg.SchemaInitializer;
 import io.trino.plugin.iceberg.catalog.TrinoCatalog;
 import io.trino.plugin.iceberg.catalog.TrinoCatalogFactory;
 import io.trino.spi.connector.SchemaTableName;
@@ -29,10 +30,12 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.parallel.Isolated;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.io.MoreFiles.deleteRecursively;
@@ -75,6 +78,11 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         warehouseLocation = Files.createTempDirectory(null);
+        File warehouseDir = warehouseLocation.toFile();
+        warehouseDir.mkdirs();
+        warehouseDir.setReadable(true, false);
+        warehouseDir.setWritable(true, false);
+        warehouseDir.setExecutable(true, false);
         polarisCatalog = closeAfterClass(new TestingPolarisCatalog(warehouseLocation.toString()));
 
         return IcebergQueryRunner.builder()
@@ -90,7 +98,12 @@ protected QueryRunner createQueryRunner()
                 .addIcebergProperty("iceberg.rest-catalog.security", "OAUTH2")
                 .addIcebergProperty("iceberg.rest-catalog.oauth2.credential", TestingPolarisCatalog.CREDENTIAL)
                 .addIcebergProperty("iceberg.rest-catalog.oauth2.scope", "PRINCIPAL_ROLE:ALL")
-                .setInitialTables(REQUIRED_TPCH_TABLES)
+                .setSchemaInitializer(
+                        SchemaInitializer.builder()
+                                .withSchemaName("tpch")
+                                .withClonedTpchTables(REQUIRED_TPCH_TABLES)
+                                .withSchemaProperties(Map.of("file", "'file://" + warehouseLocation))
+                                .build())
                 .build();
     }
 

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestingPolarisCatalog.java

@@ -29,13 +29,27 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkState;
 import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
 import static io.airlift.http.client.StatusResponseHandler.createStatusResponseHandler;
 import static io.airlift.http.client.StringResponseHandler.createStringResponseHandler;
-import static io.trino.testing.TestingProperties.getDockerImagesVersion;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.setPosixFilePermissions;
+import static java.nio.file.attribute.PosixFilePermission.GROUP_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.GROUP_READ;
+import static java.nio.file.attribute.PosixFilePermission.GROUP_WRITE;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_READ;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_WRITE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 import static java.util.Objects.requireNonNull;
 
 public final class TestingPolarisCatalog
@@ -55,9 +69,25 @@ public final class TestingPolarisCatalog
     public TestingPolarisCatalog(String warehouseLocation)
     {
         this.warehouseLocation = requireNonNull(warehouseLocation, "warehouseLocation is null");
+        Path warehousePath = Paths.get(warehouseLocation);
+        try {
+            Set<PosixFilePermission> permissions = EnumSet.of(
+                    OWNER_READ,
+                    OWNER_WRITE,
+                    OWNER_EXECUTE,
+                    GROUP_READ,
+                    GROUP_WRITE,
+                    GROUP_EXECUTE,
+                    OTHERS_READ,
+                    OTHERS_WRITE,
+                    OTHERS_EXECUTE);
+            setPosixFilePermissions(warehousePath, permissions);
+        }
+        catch (Exception e) {
+            throw new RuntimeException("Failed to setup warehouse directory", e);
+        }
 
-        // TODO: Use the official docker image once Polaris community provides it
-        polarisCatalog = new GenericContainer<>("ghcr.io/trinodb/testing/polaris-catalog:" + getDockerImagesVersion());
+        polarisCatalog = new GenericContainer<>("apache/polaris:1.0.0-incubating");
         polarisCatalog.addExposedPort(POLARIS_PORT);
         polarisCatalog.withFileSystemBind(warehouseLocation, warehouseLocation, BindMode.READ_WRITE);
         polarisCatalog.waitingFor(new LogMessageWaitStrategy().withRegEx(".*Apache Polaris Server.* started.*"));