[Improve][Connector-V2][Iceberg] Support for S3 in hadoop catalog # a…

…dd @DisabledOnContainer
apache · Dec 8, 2023 · 1e195be · 1e195be
1 parent d8e1729
commit 1e195be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...ector-v2-e2e/connector-iceberg-hadoop3-e2e/src/test/resources/iceberg/iceberg_source.conf b/...ector-v2-e2e/connector-iceberg-hadoop3-e2e/src/test/resources/iceberg/iceberg_source.conf
@@ -61,6 +61,9 @@ transform {
 }
 
 sink {
+  Console {
+    source_table_name = "iceberg"
+  }
   Assert {
     source_table_name = "iceberg"
     rules = {

diff --git a/...g-s3-e2e/src/test/java/org/apache/seatunnel/e2e/connector/iceberg/s3/IcebergSourceIT.java b/...g-s3-e2e/src/test/java/org/apache/seatunnel/e2e/connector/iceberg/s3/IcebergSourceIT.java
@@ -28,9 +28,10 @@
 import org.apache.seatunnel.connectors.seatunnel.iceberg.config.S3Conf;
 import org.apache.seatunnel.e2e.common.TestResource;
 import org.apache.seatunnel.e2e.common.TestSuiteBase;
+import org.apache.seatunnel.e2e.common.container.EngineType;
 import org.apache.seatunnel.e2e.common.container.TestContainer;
-import org.apache.seatunnel.e2e.common.container.TestContainersFactory;
-import org.apache.seatunnel.e2e.common.junit.TestContainers;
+import org.apache.seatunnel.e2e.common.container.TestContainerId;
+import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
 import org.apache.seatunnel.e2e.common.util.ContainerUtil;
 
 import org.apache.hadoop.conf.Configuration;
@@ -63,7 +64,6 @@
 import io.minio.MakeBucketArgs;
 import io.minio.MinioClient;
 import io.minio.UploadObjectArgs;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
 import java.io.IOException;
@@ -81,12 +81,12 @@
 
 import static org.apache.seatunnel.connectors.seatunnel.iceberg.config.IcebergCatalogType.HADOOP;
 
-@Slf4j
+@DisabledOnContainer(
+        value = {TestContainerId.SPARK_2_4},
+        type = {EngineType.FLINK},
+        disabledReason = "Needs hadoop-aws,aws-java-sdk jar for flink and spark2.4.")
 public class IcebergSourceIT extends TestSuiteBase implements TestResource {
 
-    @TestContainers
-    private TestContainersFactory containersFactory = ContainerUtil::discoverTestSpark3Containers;
-
     private static final String MINIO_DOCKER_IMAGE = "minio/minio";
     private static final String HOST = "minio";
     private static final int MINIO_PORT = 9000;