From a7732063abb275e4ee75481f28f47adc882953eb Mon Sep 17 00:00:00 2001
From: zhangdong <zhangdong@selectdb.com>
Date: Wed, 22 Jan 2025 17:43:38 +0800
Subject: [PATCH] 1
---
.../suites/auth_call/test_ddl_job_auth.groovy | 12 +++++++-----
.../suites/auth_call/test_ddl_mtmv_auth.groovy | 10 ++++++----
.../suites/auth_call/test_ddl_table_auth.groovy | 14 ++++++++------
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/regression-test/suites/auth_call/test_ddl_job_auth.groovy b/regression-test/suites/auth_call/test_ddl_job_auth.groovy
index ef75802637757b..bbc554cec30aed 100644
--- a/regression-test/suites/auth_call/test_ddl_job_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_job_auth.groovy
@@ -25,6 +25,10 @@ suite("test_ddl_job_auth","p0,auth_call") {
String tableNameDst = 'test_ddl_job_auth_tb_dst'
String jobName = 'test_ddl_job_auth_job'
+ try_sql("DROP USER ${user}")
+ try_sql """drop database if exists ${dbName}"""
+ try_sql("""DROP JOB where jobName='${jobName}';""")
+ sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
//cloud-mode
if (isCloudMode()) {
def clusters = sql " SHOW CLUSTERS; "
@@ -32,11 +36,9 @@ suite("test_ddl_job_auth","p0,auth_call") {
def validCluster = clusters[0][0]
sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
}
-
- try_sql("DROP USER ${user}")
- try_sql """drop database if exists ${dbName}"""
- try_sql("""DROP JOB where jobName='${jobName}';""")
- sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
+ if (enableStoragevault()) {
+ sql """GRANT usage_priv ON STORAGE VAULT '%' TO ${user}""";
+ }
sql """grant select_priv on regression_test to ${user}"""
sql """create database ${dbName}"""
sql """create table ${dbName}.${tableName} (
diff --git a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
index 160b6b840b019b..6e1dd011b93ca6 100644
--- a/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_mtmv_auth.groovy
@@ -25,6 +25,9 @@ suite("test_ddl_mtmv_auth","p0,auth_call") {
String mtmvName = 'test_ddl_mtmv_auth_mtmv'
String mtmvNameNew = 'test_ddl_mtmv_auth_mtmv_new'
+ try_sql("DROP USER ${user}")
+ try_sql """drop database if exists ${dbName}"""
+ sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
//cloud-mode
if (isCloudMode()) {
def clusters = sql " SHOW CLUSTERS; "
@@ -32,10 +35,9 @@ suite("test_ddl_mtmv_auth","p0,auth_call") {
def validCluster = clusters[0][0]
sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
}
-
- try_sql("DROP USER ${user}")
- try_sql """drop database if exists ${dbName}"""
- sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
+ if (enableStoragevault()) {
+ sql """GRANT usage_priv ON STORAGE VAULT '%' TO ${user}""";
+ }
sql """grant select_priv on regression_test to ${user}"""
sql """create database ${dbName}"""
sql """create table ${dbName}.${tableName} (
diff --git a/regression-test/suites/auth_call/test_ddl_table_auth.groovy b/regression-test/suites/auth_call/test_ddl_table_auth.groovy
index 47ac4e07abc6f9..f285d3f03c572e 100644
--- a/regression-test/suites/auth_call/test_ddl_table_auth.groovy
+++ b/regression-test/suites/auth_call/test_ddl_table_auth.groovy
@@ -28,6 +28,11 @@ suite("test_ddl_table_auth","p0,auth_call") {
String cteSelectDstDb = 'test_ddl_table_cte_select_dst_db'
String cteSelectDstTb = 'test_ddl_table_cte_select_dst_tb'
+ try_sql("DROP USER ${user}")
+ try_sql """drop database if exists ${dbName}"""
+ try_sql """drop database if exists ${cteLikeDstDb}"""
+ try_sql """drop database if exists ${cteSelectDstDb}"""
+ sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
//cloud-mode
if (isCloudMode()) {
def clusters = sql " SHOW CLUSTERS; "
@@ -35,12 +40,9 @@ suite("test_ddl_table_auth","p0,auth_call") {
def validCluster = clusters[0][0]
sql """GRANT USAGE_PRIV ON CLUSTER `${validCluster}` TO ${user}""";
}
-
- try_sql("DROP USER ${user}")
- try_sql """drop database if exists ${dbName}"""
- try_sql """drop database if exists ${cteLikeDstDb}"""
- try_sql """drop database if exists ${cteSelectDstDb}"""
- sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
+ if (enableStoragevault()) {
+ sql """GRANT usage_priv ON STORAGE VAULT '%' TO ${user}""";
+ }
sql """grant select_priv on regression_test to ${user}"""
sql """create database ${dbName}"""