This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 337c292c418 [fix](test) Fix ranger test cases (#49955)
337c292c418 is described below
commit 337c292c418aa0379dd741b23a7a952cedee99c9
Author: zgxme <zhenggaoxi...@selectdb.com>
AuthorDate: Thu Apr 10 16:44:01 2025 +0800
[fix](test) Fix ranger test cases (#49955)
### What problem does this PR solve?
1. View operations are not supported under the external catalog.
2. Update ranger masking results.
Related PR: https://github.com/apache/doris/pull/48023
---
.../data/ranger_p2/test_ranger_masking.out | Bin 4310 -> 4310 bytes
.../test_ranger_access_resource_catalog.groovy | 5 +----
.../test_ranger_access_resource_global.groovy | 7 ++-----
.../test_ranger_access_resource_resource.groovy | 2 +-
.../test_ranger_access_resource_workload_group.groovy | 2 +-
.../test_ranger_access_role_resource_catalog.groovy | 3 ---
6 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/regression-test/data/ranger_p2/test_ranger_masking.out
b/regression-test/data/ranger_p2/test_ranger_masking.out
index 3d97608c000..2410c54f5e7 100644
Binary files a/regression-test/data/ranger_p2/test_ranger_masking.out and
b/regression-test/data/ranger_p2/test_ranger_masking.out differ
diff --git
a/regression-test/suites/ranger_p2/test_ranger_access_resource_catalog.groovy
b/regression-test/suites/ranger_p2/test_ranger_access_resource_catalog.groovy
index 43e8693ced8..8faaf79358a 100644
---
a/regression-test/suites/ranger_p2/test_ranger_access_resource_catalog.groovy
+++
b/regression-test/suites/ranger_p2/test_ranger_access_resource_catalog.groovy
@@ -82,9 +82,6 @@ suite("test_ranger_access_resource_catalog",
"p2,ranger,external") {
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'INSERT INTO ${dbName}.${tableName} VALUES (1, ''test'')')""",
"Error executing INSERT")
executeSqlWithLogging("""SELECT * FROM
${dbName}.${tableName}""", "Error executing SELECT")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'ALTER TABLE ${dbName}.${tableName} ADD COLUMN age INT')""",
"Error executing ALTER TABLE")
- executeSqlWithLogging("""CREATE VIEW
${dbName}.test_view AS SELECT * FROM ${dbName}.${tableName}""", "Error
executing CREATE VIEW")
- executeSqlWithLogging("""SELECT * FROM
${dbName}.test_view""", "Error executing SELECT VIEW")
- executeSqlWithLogging("""SHOW CREATE VIEW
${dbName}.test_view""", "Error executing SHOW CREATE VIEW")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP TABLE IF EXISTS ${dbName}.${tableName}')""", "Error
executing DROP TABLE")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP DATABASE ${dbName}')""", "Error executing DROP DATABASE")
}
@@ -197,7 +194,7 @@ suite("test_ranger_access_resource_catalog",
"p2,ranger,external") {
resource.clear()
resource.put("catalog", new
RangerPolicy.RangerPolicyResource("*"))
policy.setResources(resource)
- policyItem.setUsers([userList[2], "admin"])
+ policyItem.setUsers([userList[2], "admin", "root"])
rangerClient.updatePolicy(rangerServiceName,
"all%20-%20catalog", policy)
waitPolicyEffect()
checkCatalogAccess("internal", "allow", userList[2], pwd,
"internal", 'ranger_test_catalog_db_1', 'ranger_test_catalog_table_1')
diff --git
a/regression-test/suites/ranger_p2/test_ranger_access_resource_global.groovy
b/regression-test/suites/ranger_p2/test_ranger_access_resource_global.groovy
index b6b107adb2c..ec2da95cb42 100644
--- a/regression-test/suites/ranger_p2/test_ranger_access_resource_global.groovy
+++ b/regression-test/suites/ranger_p2/test_ranger_access_resource_global.groovy
@@ -82,9 +82,6 @@ suite("test_ranger_access_resource_global",
"p2,ranger,external") {
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'INSERT INTO ${dbName}.${tableName} VALUES (1, ''test'')')""",
"Error executing INSERT")
executeSqlWithLogging("""SELECT * FROM
${dbName}.${tableName}""", "Error executing SELECT")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'ALTER TABLE ${dbName}.${tableName} ADD COLUMN age INT')""",
"Error executing ALTER TABLE")
- executeSqlWithLogging("""CREATE VIEW
${dbName}.test_view AS SELECT * FROM ${dbName}.${tableName}""", "Error
executing CREATE VIEW")
- executeSqlWithLogging("""SELECT * FROM
${dbName}.test_view""", "Error executing SELECT VIEW")
- executeSqlWithLogging("""SHOW CREATE VIEW
${dbName}.test_view""", "Error executing SHOW CREATE VIEW")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP TABLE IF EXISTS ${dbName}.${tableName}')""", "Error
executing DROP TABLE")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP DATABASE ${dbName}')""", "Error executing DROP DATABASE")
}
@@ -137,7 +134,7 @@ suite("test_ranger_access_resource_global",
"p2,ranger,external") {
// create policy
RangerClient rangerClient = new
RangerClient("http://${rangerEndpoint}";, "simple", rangerUser, rangerPassword,
null)
String policy1 = 'all - global'
- List<String> globalPolicy = ["GRANT", "SELECT", "LOAD",
"ALTER", "CREATE", "DROP", "SHOW_VIEW"]
+ List<String> globalPolicy = ["GRANT", "SELECT", "LOAD",
"ALTER", "CREATE", "DROP", "SHOW_VIEW", "ADMIN", "NODE"]
Map<String, RangerPolicy.RangerPolicyResource> resource = new
HashMap<>()
resource.put("global", new
RangerPolicy.RangerPolicyResource("*"))
@@ -148,7 +145,7 @@ suite("test_ranger_access_resource_global",
"p2,ranger,external") {
policy.setName(policy1)
policy.setResources(resource)
RangerPolicy.RangerPolicyItem policyItem = new
RangerPolicy.RangerPolicyItem()
- policyItem.setUsers([userList[0], "admin"])
+ policyItem.setUsers([userList[0], "admin", "root"])
List<RangerPolicy.RangerPolicyItemAccess> policyItemAccesses =
new ArrayList<RangerPolicy.RangerPolicyItemAccess>()
globalPolicy.forEach {
policyItemAccesses.add(new
RangerPolicy.RangerPolicyItemAccess(it))
diff --git
a/regression-test/suites/ranger_p2/test_ranger_access_resource_resource.groovy
b/regression-test/suites/ranger_p2/test_ranger_access_resource_resource.groovy
index 4ff9e0f79b7..a8d4b2d3cba 100644
---
a/regression-test/suites/ranger_p2/test_ranger_access_resource_resource.groovy
+++
b/regression-test/suites/ranger_p2/test_ranger_access_resource_resource.groovy
@@ -100,7 +100,7 @@ suite("test_ranger_access_resource", "p2,ranger,external") {
resource.clear()
resource.put("resource", new
RangerPolicy.RangerPolicyResource("*"))
policy.setResources(resource)
- policyItem.setUsers([userList[1], "admin"])
+ policyItem.setUsers([userList[1], "admin", "root"])
rangerClient.updatePolicy(rangerServiceName,
"all%20-%20resource", policy)
waitPolicyEffect()
connect("${userList[1]}", "$pwd", "$defaultJdbcUrl") {
diff --git
a/regression-test/suites/ranger_p2/test_ranger_access_resource_workload_group.groovy
b/regression-test/suites/ranger_p2/test_ranger_access_resource_workload_group.groovy
index 6b928b3a7d5..9bfddf8bd27 100644
---
a/regression-test/suites/ranger_p2/test_ranger_access_resource_workload_group.groovy
+++
b/regression-test/suites/ranger_p2/test_ranger_access_resource_workload_group.groovy
@@ -86,7 +86,7 @@ suite("test_ranger_access_workload_group",
"p2,ranger,external") {
resource.clear()
resource.put("workload_group", new
RangerPolicy.RangerPolicyResource("*"))
policy.setResources(resource)
- policyItem.setUsers([userList[1], "admin"])
+ policyItem.setUsers([userList[1], "admin", "root"])
rangerClient.updatePolicy(rangerServiceName,
"all%20-%20workload_group", policy)
waitPolicyEffect()
connect("${userList[1]}", "$pwd", "$defaultJdbcUrl") {
diff --git
a/regression-test/suites/ranger_p2/test_ranger_access_role_resource_catalog.groovy
b/regression-test/suites/ranger_p2/test_ranger_access_role_resource_catalog.groovy
index 9a27a6c2871..155ae871f30 100644
---
a/regression-test/suites/ranger_p2/test_ranger_access_role_resource_catalog.groovy
+++
b/regression-test/suites/ranger_p2/test_ranger_access_role_resource_catalog.groovy
@@ -83,9 +83,6 @@ suite("test_ranger_access_role_resource_catalog",
"p2,ranger,external") {
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'INSERT INTO ${dbName}.${tableName} VALUES (1, ''test'')')""",
"Error executing INSERT")
executeSqlWithLogging("""SELECT * FROM
${dbName}.${tableName}""", "Error executing SELECT")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'ALTER TABLE ${dbName}.${tableName} ADD COLUMN age INT')""",
"Error executing ALTER TABLE")
- executeSqlWithLogging("""CREATE VIEW
${dbName}.test_view AS SELECT * FROM ${dbName}.${tableName}""", "Error
executing CREATE VIEW")
- executeSqlWithLogging("""SELECT * FROM
${dbName}.test_view""", "Error executing SELECT VIEW")
- executeSqlWithLogging("""SHOW CREATE VIEW
${dbName}.test_view""", "Error executing SHOW CREATE VIEW")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP TABLE IF EXISTS ${dbName}.${tableName}')""", "Error
executing DROP TABLE")
executeSqlWithLogging("""CALL EXECUTE_STMT
('${catalog}', 'DROP DATABASE ${dbName}')""", "Error executing DROP DATABASE")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
