attempt fix for IT

Author: rahil-c

plugins/spark/v3.5/integration/build.gradle.kts

@@ -62,7 +62,7 @@ dependencies {
   testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
 
   testImplementation("io.delta:delta-spark_${scalaVersion}:3.3.1")
-  testImplementation("org.apache.hudi:hudi-spark-datasource:0.15.0")
+  testImplementation("org.apache.hudi:hudi-spark3.5-bundle_2.12:0.15.0")
 
   testImplementation(platform(libs.jackson.bom))
   testImplementation("com.fasterxml.jackson.core:jackson-annotations")

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkHudiIT.java

@@ -32,6 +32,7 @@
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.RowFactory;
+import org.apache.spark.sql.SparkSession;
 import org.apache.spark.sql.types.DataTypes;
 import org.apache.spark.sql.types.Metadata;
 import org.apache.spark.sql.types.StructField;
@@ -43,6 +44,34 @@
 
 @QuarkusIntegrationTest
 public class SparkHudiIT extends SparkIntegrationBase {
+
+  @Override
+  protected SparkSession.Builder withCatalog(SparkSession.Builder builder, String catalogName) {
+    return builder
+            .config(
+                    "spark.sql.extensions",
+                    "org.apache.spark.sql.hudi.HoodieSparkSessionExtension")
+            .config(
+                    "spark.sql.catalog.spark_catalog", "org.apache.spark.sql.hudi.catalog.HoodieCatalog")
+            .config(
+                    String.format("spark.sql.catalog.%s", catalogName),
+                    "org.apache.polaris.spark.SparkCatalog")
+            .config("spark.sql.warehouse.dir", warehouseDir.toString())
+            .config(String.format("spark.sql.catalog.%s.type", catalogName), "rest")
+            .config(
+                    String.format("spark.sql.catalog.%s.uri", catalogName),
+                    endpoints.catalogApiEndpoint().toString())
+            .config(String.format("spark.sql.catalog.%s.warehouse", catalogName), catalogName)
+            .config(String.format("spark.sql.catalog.%s.scope", catalogName), "PRINCIPAL_ROLE:ALL")
+            .config(
+                    String.format("spark.sql.catalog.%s.header.realm", catalogName), endpoints.realmId())
+            .config(String.format("spark.sql.catalog.%s.token", catalogName), sparkToken)
+            .config(String.format("spark.sql.catalog.%s.s3.access-key-id", catalogName), "fakekey")
+            .config(
+                    String.format("spark.sql.catalog.%s.s3.secret-access-key", catalogName), "fakesecret")
+            .config(String.format("spark.sql.catalog.%s.s3.region", catalogName), "us-west-2");
+  }
+
   private String defaultNs;
   private String tableRootDir;
 

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java

@@ -39,7 +39,7 @@ protected SparkSession.Builder withCatalog(SparkSession.Builder builder, String
     return builder
         .config(
             "spark.sql.extensions",
-            "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,io.delta.sql.DeltaSparkSessionExtension,org.apache.spark.sql.hudi.HoodieSparkSessionExtension")
+            "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,io.delta.sql.DeltaSparkSessionExtension")
         .config(
             "spark.sql.catalog.spark_catalog", "org.apache.spark.sql.delta.catalog.DeltaCatalog")
         .config(