Skip to content

[fix](cloud) Fix some cloud regression case due to #33347 #33727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Apr 17, 2024
Merged

[fix](cloud) Fix some cloud regression case due to #33347 #33727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_role.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
"""

result = showRoles.call(roleName)
assertEquals(result.CloudClusterPrivs as String, "$testClusterA: Cluster_usage_priv " as String)
assertEquals(result.CloudStagePrivs as String, "$testStageA: Stage_usage_priv " as String)
assertEquals(result.CloudClusterPrivs as String, "$testClusterA: Cluster_usage_priv" as String)
assertEquals(result.CloudStagePrivs as String, "$testStageA: Stage_usage_priv" as String)
assertEquals(result.Users as String, "")

sql """
Expand All @@ -116,8 +116,8 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
GRANT SELECT_PRIV ON *.*.* TO ROLE '${roleName}'
"""
result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv "
assertEquals("[$testClusterA: Cluster_usage_priv ; $validCluster: Cluster_usage_priv ]" as String, result.CloudClusterPrivs as String)
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv"
assertEquals("[$testClusterA: Cluster_usage_priv; $validCluster: Cluster_usage_priv]" as String, result.CloudClusterPrivs as String)
def db = context.dbName

sql """
Expand Down Expand Up @@ -159,25 +159,25 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
assertTrue(m.keySet().containsAll(Arrays.asList("${testClusterA}" as String, "%", "${validCluster}" as String)) as boolean)
assertEquals(m.values().toUnique().asList().size(), 1)
assertEquals(m.values().toUnique().asList().get(0) as String, "Cluster_usage_priv")
assertEquals(result.GlobalPrivs as String, "Select_priv " as String)
assertEquals(result.GlobalPrivs as String, "Select_priv" as String)
m = splitCloudAuth(result.CloudStagePrivs as String)
assertTrue(m.keySet().containsAll(Arrays.asList("${testStageA}" as String, "%")) as boolean)
assertEquals(m.values().toUnique().asList().size(), 1)
assertEquals(m.values().toUnique().asList().get(0) as String, "Stage_usage_priv")
assertEquals(result.GlobalPrivs as String, "Select_priv " as String)
assertEquals(result.GlobalPrivs as String, "Select_priv" as String)
def matcher = result.Users =~ /.*${user1}.*/
assertTrue(matcher.matches())


result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv"
m = splitCloudAuth(result.CloudClusterPrivs[0] as String)
log.info(m.keySet() as String)
// clusterA: Cluster_usage_priv ; %: Cluster_usage_priv ; compute_cluster: Cluster_usage_priv
assertTrue(m.keySet().containsAll(Arrays.asList("${testClusterA}" as String, "%", "${validCluster}" as String)) as boolean)
assertEquals(m.values().toUnique().asList().size(), 1)
assertEquals(m.values().toUnique().asList().get(0) as String, "Cluster_usage_priv")
assertEquals(result.GlobalPrivs[0] as String, "Select_priv " as String)
assertEquals(result.GlobalPrivs[0] as String, "Select_priv" as String)

def otherRole = "testOtherRole"
def testClusterB = "clusterB"
Expand All @@ -192,23 +192,23 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
"""

result = showRoles.call(otherRole)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv " as String)
assertEquals(result.CloudStagePrivs as String, "$testStageB: Stage_usage_priv " as String)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv" as String)
assertEquals(result.CloudStagePrivs as String, "$testStageB: Stage_usage_priv" as String)
assertEquals(result.Users as String, "")

// add more roles to user1
sql """
GRANT '$otherRole' TO '$user1';
"""
result = showRoles.call(otherRole)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv " as String)
assertEquals(result.CloudStagePrivs as String, "$testStageB: Stage_usage_priv " as String)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv" as String)
assertEquals(result.CloudStagePrivs as String, "$testStageB: Stage_usage_priv" as String)
matcher = result.Users =~ /.*${user1}.*/
assertTrue(matcher.matches())

result = sql_return_maparray """show grants for '${user1}'"""
log.info(result as String)
commonAuth result, "'${user1}'@'%'", "Yes", "testOtherRole,testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testOtherRole,testRole", "Select_priv"
// [%: Cluster_usage_priv ; clusterA: Cluster_usage_priv ; clusterB: Cluster_usage_priv ; compute_cluster: Cluster_usage_priv ]
m = splitCloudAuth(result.CloudClusterPrivs[0] as String)
assertTrue(m.keySet().containsAll(Arrays.asList("${testClusterA}" as String, "%", "${validCluster}" as String, "${testClusterB}" as String)) as boolean)
Expand Down Expand Up @@ -236,7 +236,7 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
assertTrue(matcher.matches())

result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testOtherRole,testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testOtherRole,testRole", "Select_priv"
log.info(result as String)
// CloudClusterPrivs:%: Cluster_usage_priv ; clusterB: Cluster_usage_priv ; compute_cluster: Cluster_usage_priv
m = splitCloudAuth(result.CloudClusterPrivs[0] as String)
Expand All @@ -250,11 +250,11 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
"""

result = showRoles.call(otherRole)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv " as String)
assertEquals(result.CloudClusterPrivs as String, "$testClusterB: Cluster_usage_priv" as String)
assertEquals(result.Users as String, "")

result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv"
log.info(result as String)
// CloudClusterPrivs:%: Cluster_usage_priv ; compute_cluster: Cluster_usage_priv
m = splitCloudAuth(result.CloudClusterPrivs[0] as String)
Expand Down Expand Up @@ -283,7 +283,7 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
}

result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv"
m = splitCloudAuth(result.CloudClusterPrivs[0] as String)
assertTrue(m.keySet().containsAll(Arrays.asList("%")) as boolean)
assertEquals(m.values().toUnique().asList().size(), 1)
Expand All @@ -305,10 +305,10 @@ suite("test_grant_revoke_cluster_stage_to_role", "cloud_auth") {
assertEquals(m.size(), 0)
m = splitCloudAuth(result.CloudStagePrivs as String)
assertEquals(m.size(), 0)
assertEquals(result.GlobalPrivs as String, "Select_priv " as String)
assertEquals(result.GlobalPrivs as String, "Select_priv" as String)

result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv "
commonAuth result, "'${user1}'@'%'", "Yes", "testRole", "Select_priv"

// can not use @cluster, because no cluster auth
connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) {
Expand Down
28 changes: 14 additions & 14 deletions regression-test/suites/cloud_p0/auth/test_grant_revoke_cluster_to_user.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") {
// ${user1} admin role
sql """create user ${user1} identified by 'Cloud12345' default role 'admin'"""
result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv "
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv"
assertNull(result.CloudClusterPrivs[0])

// ${user2} not admin role
Expand Down Expand Up @@ -124,22 +124,22 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") {

// case run user(default root), and show grant again, should be same result
result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)

sql """GRANT USAGE_PRIV ON CLUSTER '${cluster1}' TO '${user1}'"""
result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)

connect(user = "${user1}", password = 'Cloud12345', url = context.config.jdbcUrl) {
test {
sql """use @${cluster1}"""
exception "Cluster ${cluster1} not exist"
}
result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'", "Yes", "admin", "Admin_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user1}'@'%'", "Yes", "admin", "Admin_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)
}


Expand Down Expand Up @@ -214,8 +214,8 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") {
exception "USAGE denied to user"
}
result = sql_return_maparray """show grants for '${user2}'"""
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)

test {
sql """REVOKE USAGE_PRIV ON CLUSTER 'NotExistCluster' FROM '${user2}'"""
Expand All @@ -225,8 +225,8 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") {

sql """REVOKE USAGE_PRIV ON CLUSTER '${validCluster}' FROM '${user2}'"""
result = sql_return_maparray """show grants for '${user2}'"""
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)

sql "sync"
// 3. revoke cluster
Expand All @@ -250,12 +250,12 @@ suite("test_grant_revoke_cluster_to_user", "cloud_auth") {
}

result = sql_return_maparray """show grants for '${user1}'"""
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv "
commonAuth result, "'${user1}'@'%'" as String, "Yes", "admin", "Admin_priv"
assertNull(result.CloudClusterPrivs[0])

result = sql_return_maparray """show grants for '${user2}'"""
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv "
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv " as String)
commonAuth result, "'${user2}'@'%'" as String, "Yes", "", "Select_priv"
assertEquals(result.CloudClusterPrivs[0] as String, "${cluster1}: Cluster_usage_priv" as String)

// revoke user1 admin role
sql """REVOKE 'admin' FROM ${user1}"""
Expand Down
9 changes: 9 additions & 0 deletions regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,8 +877,17 @@ suite("test_stream_load_move_memtable", "p0") {
PROPERTIES ("replication_allocation" = "tag.location.default: 1");
"""

sql "sync"
try_sql """DROP USER 'ddd'"""
sql """create USER ddd IDENTIFIED BY '123456test!'"""
sql """GRANT LOAD_PRIV ON *.* TO 'ddd'@'%';"""
//cloud-mode
if (isCloudMode()) {
def clusters = sql " SHOW CLUSTERS; "
assertTrue(!clusters.isEmpty())
def validCluster = clusters[0][0]
sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ddd""";
}

streamLoad {
table "${tableName13}"
Expand Down