Skip to content

Commit 6eb4b8e

Browse files
committed
Update RangerSparkExtensionSuite.scala
1 parent 61efb8a commit 6eb4b8e

File tree

1 file changed

+50
-32
lines changed

1 file changed

+50
-32
lines changed

extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/RangerSparkExtensionSuite.scala

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ abstract class RangerSparkExtensionSuite extends AnyFunSuite
5656
}
5757

5858
protected def errorMessage(
59-
privilege: String,
60-
resource: String = "default/src",
61-
user: String = UserGroupInformation.getCurrentUser.getShortUserName): String = {
59+
privilege: String,
60+
resource: String = "default/src",
61+
user: String = UserGroupInformation.getCurrentUser.getShortUserName): String = {
6262
s"Permission denied: user [$user] does not have [$privilege] privilege on [$resource]"
6363
}
6464

@@ -189,12 +189,16 @@ abstract class RangerSparkExtensionSuite extends AnyFunSuite
189189
val e = intercept[AccessControlException](sql(create))
190190
assert(e.getMessage === errorMessage("create", "mydb"))
191191
withCleanTmpResources(Seq((testDb, "database"))) {
192-
doAs(admin, assert(Try {
193-
sql(create)
194-
}.isSuccess))
195-
doAs(admin, assert(Try {
196-
sql(alter)
197-
}.isSuccess))
192+
doAs(
193+
admin,
194+
assert(Try {
195+
sql(create)
196+
}.isSuccess))
197+
doAs(
198+
admin,
199+
assert(Try {
200+
sql(alter)
201+
}.isSuccess))
198202
val e1 = intercept[AccessControlException](sql(alter))
199203
assert(e1.getMessage === errorMessage("alter", "mydb"))
200204
val e2 = intercept[AccessControlException](sql(drop))
@@ -216,24 +220,34 @@ abstract class RangerSparkExtensionSuite extends AnyFunSuite
216220
assert(e.getMessage === errorMessage("create"))
217221

218222
withCleanTmpResources(Seq((s"$db.$table", "table"))) {
219-
doAs(bob, assert(Try {
220-
sql(create0)
221-
}.isSuccess))
222-
doAs(bob, assert(Try {
223-
sql(alter0)
224-
}.isSuccess))
223+
doAs(
224+
bob,
225+
assert(Try {
226+
sql(create0)
227+
}.isSuccess))
228+
doAs(
229+
bob,
230+
assert(Try {
231+
sql(alter0)
232+
}.isSuccess))
225233

226234
val e1 = intercept[AccessControlException](sql(drop0))
227235
assert(e1.getMessage === errorMessage("drop"))
228-
doAs(bob, assert(Try {
229-
sql(alter0)
230-
}.isSuccess))
231-
doAs(bob, assert(Try {
232-
sql(select).collect()
233-
}.isSuccess))
234-
doAs(kent, assert(Try {
235-
sql(s"SELECT key FROM $db.$table").collect()
236-
}.isSuccess))
236+
doAs(
237+
bob,
238+
assert(Try {
239+
sql(alter0)
240+
}.isSuccess))
241+
doAs(
242+
bob,
243+
assert(Try {
244+
sql(select).collect()
245+
}.isSuccess))
246+
doAs(
247+
kent,
248+
assert(Try {
249+
sql(s"SELECT key FROM $db.$table").collect()
250+
}.isSuccess))
237251

238252
Seq(
239253
select,
@@ -617,16 +631,18 @@ class HiveCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
617631
// query all columns of the permanent view
618632
// with access privileges to the permanent view but no privilege to the source table
619633
val sql1 = s"SELECT * FROM $db1.$permView"
620-
doAs(userPermViewOnly, {
621-
sql(sql1).collect()
622-
})
634+
doAs(
635+
userPermViewOnly, {
636+
sql(sql1).collect()
637+
})
623638

624639
// query the second column of permanent view with multiple columns
625640
// with access privileges to the permanent view but no privilege to the source table
626641
val sql2 = s"SELECT name FROM $db1.$permView"
627-
doAs(userPermViewOnly, {
628-
sql(sql2).collect()
629-
})
642+
doAs(
643+
userPermViewOnly, {
644+
sql(sql2).collect()
645+
})
630646
}
631647
}
632648

@@ -1495,10 +1511,12 @@ class HiveCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
14951511
doAs(admin, sql(s"CREATE VIEW $db1.$view1 AS SELECT * FROM $db1.$table1"))
14961512
checkAnswer(
14971513
someone,
1498-
s"SELECT count(*) FROM $db1.$table1 WHERE id > 1", Row(0) :: Nil)
1514+
s"SELECT count(*) FROM $db1.$table1 WHERE id > 1",
1515+
Row(0) :: Nil)
14991516
checkAnswer(
15001517
someone,
1501-
s"SELECT count(*) FROM $db1.$view1 WHERE id > 1", Row(0) :: Nil)
1518+
s"SELECT count(*) FROM $db1.$view1 WHERE id > 1",
1519+
Row(0) :: Nil)
15021520
interceptContains[AccessControlException](
15031521
doAs(
15041522
someone,

0 commit comments

Comments
 (0)