[KYUUBI #6666] Upgrade spark ranger plugin to 2.5.0

apache · Sep 19, 2024 · fcc57f1 · fcc57f1
1 parent 7198c72
commit fcc57f1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 228 deletions.
diff --git a/docs/security/authorization/spark/build.md b/docs/security/authorization/spark/build.md
@@ -83,6 +83,7 @@ The available `ranger.version`s are shown in the following table.
 
 | Ranger Version | Supported | Remark |
 |:--------------:|:---------:|:-----------------------------------------------------------------------------------------:|
+| 2.5.x | √ | - |
 | 2.4.x | √ | - |
 | 2.3.x | √ | - |
 | 2.2.x | √ | - |

diff --git a/extensions/spark/kyuubi-spark-authz/README.md b/extensions/spark/kyuubi-spark-authz/README.md
@@ -26,7 +26,7 @@
 ## Build
 
 ```shell
-build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.version=3.2.1 -Dranger.version=2.4.0
+build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.version=3.2.1 -Dranger.version=2.5.0
 ```
 
 ### Supported Apache Spark Versions
@@ -46,7 +46,8 @@ build/mvn clean package -DskipTests -pl :kyuubi-spark-authz_2.12 -am -Dspark.ver
 
 `-Dranger.version=`
 
-- [x] 2.4.x (default)
+- [x] 2.5.x (default)
+- [x] 2.4.x
 - [x] 2.3.x
 - [x] 2.2.x
 - [x] 2.1.x

diff --git a/extensions/spark/kyuubi-spark-authz/pom.xml b/extensions/spark/kyuubi-spark-authz/pom.xml
@@ -32,7 +32,7 @@
  <url>https://kyuubi.apache.org/</url>
 
  <properties>
- <ranger.version>2.4.0</ranger.version>
+ <ranger.version>2.5.0</ranger.version>
  <!-- the following components' version may need to tune to align w/ the ranger.version-->
  <gethostname4j.version>1.0.0</gethostname4j.version>
  <jersey.client.version>1.19.4</jersey.client.version>

diff --git a/...src/test/gen/scala/org/apache/kyuubi/plugin/spark/authz/gen/PolicyJsonFileGenerator.scala b/...src/test/gen/scala/org/apache/kyuubi/plugin/spark/authz/gen/PolicyJsonFileGenerator.scala
@@ -66,10 +66,11 @@ class PolicyJsonFileGenerator extends AnyFunSuite {
  val generatedStr = mapper.writerWithDefaultPrettyPrinter()
  .writeValueAsString(servicePolicies)
 
+ println("Generated JSON:")
+ println(generatedStr)
+
  if (sys.env.get("KYUUBI_UPDATE").contains("1")) {
- // scalastyle:off println
  println(s"Writing ranger policies to $policyFileName.")
- // scalastyle:on println
  Files.write(
  policyFilePath,
  generatedStr.getBytes(StandardCharsets.UTF_8),