This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 9bab631ebf8 [fix](auth)Fix the error message of auth (#37884)
9bab631ebf8 is described below
commit 9bab631ebf869a27f125777eb91f3bda6cd88d17
Author: zfr95 <87513668+zfr9...@users.noreply.github.com>
AuthorDate: Mon Jul 29 11:17:17 2024 +0800
[fix](auth)Fix the error message of auth (#37884)
## Proposed changes
[fix](auth)Fix the error message of auth
---
regression-test/suites/auth_up_down_p0/load.groovy | 15 ++++-----------
.../suites/auth_up_down_p0/test_grant_revoke_auth.groovy | 15 ++++++++++++---
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/regression-test/suites/auth_up_down_p0/load.groovy
b/regression-test/suites/auth_up_down_p0/load.groovy
index 93c7605bc7c..df164a7c2a1 100644
--- a/regression-test/suites/auth_up_down_p0/load.groovy
+++ b/regression-test/suites/auth_up_down_p0/load.groovy
@@ -41,13 +41,6 @@
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
sql """CREATE USER '${user2}' IDENTIFIED BY '${pwd}'"""
sql """grant select_priv on regression_test to ${user1}"""
sql """grant select_priv on regression_test to ${user2}"""
- if (isCloudMode()) {
- //grant cluster to user
- def res = sql_return_maparray "show clusters;"
- logger.info("show clusters from ${res}")
- sql """GRANT USAGE_PRIV ON CLUSTER "${res[0].cluster}" TO "${user1}";
"""
- sql """GRANT USAGE_PRIV ON CLUSTER "${res[0].cluster}" TO "${user2}";
"""
- }
sql """CREATE ROLE ${role1}"""
sql """CREATE ROLE ${role2}"""
@@ -148,7 +141,7 @@
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
sql "select username from ${dbName}.${tableName1}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) {
@@ -170,7 +163,7 @@
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
sql "select username from ${dbName}.${tableName1}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) {
@@ -184,7 +177,7 @@
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
sql "select username from ${dbName}.${tableName2}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("USAGE/ADMIN privilege"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
sql """GRANT USAGE_PRIV ON WORKLOAD GROUP '${wg1}' TO '${user1}';"""
@@ -201,6 +194,6 @@
suite("test_upgrade_downgrade_prepare_auth","p0,auth,restart_fe") {
sql """GRANT USAGE_PRIV ON RESOURCE ${rg1} TO ${user1};"""
connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) {
def res = sql """SHOW RESOURCES;"""
- assertTrue(res.size == 10)
+ assertTrue(res.size() == 10)
}
}
diff --git
a/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy
b/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy
index 8828be66528..9a57cf146d3 100644
--- a/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy
+++ b/regression-test/suites/auth_up_down_p0/test_grant_revoke_auth.groovy
@@ -35,13 +35,22 @@
suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") {
String rg1 = 'test_up_down_resource_1_hdfs'
String rg2 = 'test_up_down_resource_2_hdfs'
+ //cloud-mode
+ if (isCloudMode()) {
+ //grant cluster to user
+ def res = sql_return_maparray "show clusters;"
+ logger.info("show clusters from ${res}")
+ sql """GRANT USAGE_PRIV ON CLUSTER "${res[0].cluster}" TO "${user1}";
"""
+ sql """GRANT USAGE_PRIV ON CLUSTER "${res[0].cluster}" TO "${user2}";
"""
+ }
+
// user
connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) {
try {
sql "select username from ${dbName}.${tableName1}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) {
@@ -54,7 +63,7 @@
suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") {
sql "select username from ${dbName}.${tableName1}"
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Admin_priv,Select_priv"))
+ assertTrue(e.getMessage().contains("denied"))
}
}
connect(user=user2, password="${pwd}", url=context.config.jdbcUrl) {
@@ -70,6 +79,6 @@
suite("test_upgrade_downgrade_compatibility_auth","p0,auth,restart_fe") {
// resource group
connect(user=user1, password="${pwd}", url=context.config.jdbcUrl) {
def res = sql """SHOW RESOURCES;"""
- assertTrue(res.size == 10)
+ assertTrue(res.size() == 10)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
