[KYUUBI #6925] Only run Paimon authz tests with Scala 2.12

### Why are the changes needed? Paimon does not seem to support Scala 2.13 ### How was this patch tested? Pass GHA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #6925 from pan3793/authz-paimon-scala212. Closes #6925 865a7dd [Cheng Pan] fix 971d232 [Cheng Pan] Update extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/PaimonCatalogRangerSparkExtensionSuite.scala 499f10a [Cheng Pan] Only run Paimon authz tests with Scala 2.12 Authored-by: Cheng Pan <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
apache · Feb 19, 2025 · 93ac1ee · 93ac1ee
1 parent cc9e11c
commit 93ac1ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/...ubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/util/AuthZUtils.scala b/...ubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/util/AuthZUtils.scala
@@ -92,7 +92,8 @@ private[authz] object AuthZUtils {
 
   lazy val SCALA_RUNTIME_VERSION: SemanticVersion =
     SemanticVersion(scala.util.Properties.versionNumberString)
-  lazy val isScalaV213: Boolean = SCALA_RUNTIME_VERSION >= "2.13"
+  lazy val isScalaV212: Boolean = SCALA_RUNTIME_VERSION === "2.12"
+  lazy val isScalaV213: Boolean = SCALA_RUNTIME_VERSION === "2.13"
 
   def derbyJdbcDriverClass: String = if (isSparkV40OrGreater) {
     // SPARK-46257 (Spark 4.0.0) moves to Derby 10.16

diff --git a/.../org/apache/kyuubi/plugin/spark/authz/ranger/PaimonCatalogRangerSparkExtensionSuite.scala b/.../org/apache/kyuubi/plugin/spark/authz/ranger/PaimonCatalogRangerSparkExtensionSuite.scala
@@ -16,13 +16,12 @@
  */
 package org.apache.kyuubi.plugin.spark.authz.ranger
 
-import scala.util.Properties
-
 import org.scalatest.Outcome
 
 import org.apache.kyuubi.Utils
 import org.apache.kyuubi.plugin.spark.authz.AccessControlException
 import org.apache.kyuubi.plugin.spark.authz.RangerTestUsers._
+import org.apache.kyuubi.plugin.spark.authz.util.AuthZUtils._
 import org.apache.kyuubi.tags.PaimonTest
 import org.apache.kyuubi.util.AssertionUtils._
 
@@ -32,9 +31,8 @@ import org.apache.kyuubi.util.AssertionUtils._
 @PaimonTest
 class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
   override protected val catalogImpl: String = "hive"
-  private def isSupportedVersion = true
+  private def isSupportedVersion = isScalaV212
 
-  val scalaVersion: String = Properties.versionString
   val catalogV2 = "paimon_catalog"
   val namespace1 = "paimon_ns"
   val table1 = "table1"
@@ -51,9 +49,8 @@ class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
         s"spark.sql.catalog.$catalogV2.warehouse",
         Utils.createTempDir(catalogV2).toString)
       super.beforeAll()
+      doAs(admin, sql(s"CREATE DATABASE IF NOT EXISTS $catalogV2.$namespace1"))
     }
-
-    doAs(admin, sql(s"CREATE DATABASE IF NOT EXISTS $catalogV2.$namespace1"))
   }
 
   override def afterAll(): Unit = {
@@ -87,28 +84,20 @@ class PaimonCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
 
   test("[KYUUBI #6541] INSERT/SELECT TABLE") {
     val tName = "t_paimon"
+    withCleanTmpResources(Seq((s"$catalogV2.$namespace1.$tName", "table"))) {
+      doAs(bob, sql(createTableSql(namespace1, tName)))
 
-    /**
-     * paimon-spark run on Scala 2.12.
-     */
-    if (scalaVersion.startsWith("version 2.12")) {
-      withCleanTmpResources(Seq((s"$catalogV2.$namespace1.$tName", "table"))) {
-
-        doAs(bob, sql(createTableSql(namespace1, tName)))
-
-        interceptEndsWith[AccessControlException] {
-          doAs(someone, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_1')"))
-        }(s"does not have [update] privilege on [$namespace1/$tName]")
-        doAs(bob, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_1')"))
-        doAs(bob, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_2')"))
+      interceptEndsWith[AccessControlException] {
+        doAs(someone, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_1')"))
+      }(s"does not have [update] privilege on [$namespace1/$tName]")
+      doAs(bob, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_1')"))
+      doAs(bob, sql(s"INSERT INTO $catalogV2.$namespace1.$tName VALUES (1, 'name_2')"))
 
-        interceptEndsWith[AccessControlException] {
-          doAs(someone, sql(s"SELECT id FROM $catalogV2.$namespace1.$tName").show())
-        }(s"does not have [select] privilege on [$namespace1/$tName/id]")
-        doAs(bob, sql(s"SELECT name FROM $catalogV2.$namespace1.$tName").show())
-      }
+      interceptEndsWith[AccessControlException] {
+        doAs(someone, sql(s"SELECT id FROM $catalogV2.$namespace1.$tName").show())
+      }(s"does not have [select] privilege on [$namespace1/$tName/id]")
+      doAs(bob, sql(s"SELECT name FROM $catalogV2.$namespace1.$tName").show())
     }
-
   }
 
   def createTableSql(namespace: String, table: String): String =