Skip to content

Commit afc4f7d

Browse files
committed
fix: split rbac tests into basic (1.2.311) and full (1.2.833) suites
rbac/ reverted to pre-54fceaa6b0 content compatible with writer 1.2.311. rbac_all/ preserves the expanded test (procedure/sequence/connection/ warehouse) with writer 1.2.833 which supports all these features.
1 parent c0be702 commit afc4f7d

File tree

5 files changed

+100
-56
lines changed

5 files changed

+100
-56
lines changed

tests/compat_fuse/compat-logictest/rbac/fuse_compat_read.test

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
statement ok
2-
GRANT access connection on connection c2 to role 'role2';
3-
4-
statement ok
5-
GRANT access sequence on sequence seq2 to role 'role2';
6-
7-
statement ok
8-
GRANT access sequence on procedure p1(int) to role 'role2';
9-
10-
statement ok
11-
GRANT ownership on connection c2 to role 'role2';
12-
13-
statement ok
14-
GRANT ownership on sequence seq2 to role 'role2';
15-
16-
statement ok
17-
GRANT ownership on procedure p1(int) to role 'role2';
18-
191
statement ok
202
show grants for role 'role1';
213

tests/compat_fuse/compat-logictest/rbac/fuse_compat_write.test

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,6 @@ grant select on default.* to role 'role1';
1010
statement ok
1111
create function a as (a) -> (a+1);
1212

13-
statement ok
14-
drop procedure if exists p1(int);
15-
16-
statement ok
17-
CREATE PROCEDURE if not exists p1(x int) RETURNS int not null LANGUAGE SQL COMMENT='test' AS $$
18-
BEGIN
19-
RETURN x;
20-
END;
21-
$$;
22-
23-
statement ok
24-
create connection c1 storage_type = 's3' access_key_id ='11' secret_access_key ='11' ENDPOINT_URL='http://127.0.0.1:9900';
25-
26-
statement ok
27-
create connection c2 storage_type = 's3' access_key_id ='22' secret_access_key ='22' ENDPOINT_URL='http://127.0.0.1:9900';
28-
29-
statement ok
30-
create sequence seq1;
31-
32-
statement ok
33-
create sequence seq2;
34-
3513
statement ok
3614
drop role if exists 'role2';
3715

@@ -40,19 +18,3 @@ create role 'role2';
4018

4119
statement ok
4220
GRANT OWNERSHIP on udf a to role 'role1';
43-
44-
statement ok
45-
GRANT OWNERSHIP on procedure p1(int) to role 'role1';
46-
47-
statement ok
48-
GRANT create warehouse on *.* to role 'role1';
49-
50-
statement ok
51-
GRANT create connection on *.* to role 'role1';
52-
53-
statement ok
54-
GRANT create sequence on *.* to role 'role1';
55-
56-
statement ok
57-
GRANT create procedure on *.* to role 'role1';
58-
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
statement ok
2+
GRANT access connection on connection c2 to role 'role2';
3+
4+
statement ok
5+
GRANT access sequence on sequence seq2 to role 'role2';
6+
7+
statement ok
8+
GRANT access sequence on procedure p1(int) to role 'role2';
9+
10+
statement ok
11+
GRANT ownership on connection c2 to role 'role2';
12+
13+
statement ok
14+
GRANT ownership on sequence seq2 to role 'role2';
15+
16+
statement ok
17+
GRANT ownership on procedure p1(int) to role 'role2';
18+
19+
statement ok
20+
show grants for role 'role1';
21+
22+
statement ok
23+
grant ownership on udf a to role 'role2'
24+
25+
statement ok
26+
show grants for role 'role1';
27+
28+
statement ok
29+
show grants for role 'role2';
30+
31+
statement ok
32+
drop role role1;
33+
34+
statement ok
35+
drop role role2;
36+
37+
statement ok
38+
show roles;
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
statement ok
2+
drop role if exists 'role1';
3+
4+
statement ok
5+
create role 'role1';
6+
7+
statement ok
8+
grant select on default.* to role 'role1';
9+
10+
statement ok
11+
create function a as (a) -> (a+1);
12+
13+
statement ok
14+
drop procedure if exists p1(int);
15+
16+
statement ok
17+
CREATE PROCEDURE if not exists p1(x int) RETURNS int not null LANGUAGE SQL COMMENT='test' AS $$
18+
BEGIN
19+
RETURN x;
20+
END;
21+
$$;
22+
23+
statement ok
24+
create connection c1 storage_type = 's3' access_key_id ='11' secret_access_key ='11' ENDPOINT_URL='http://127.0.0.1:9900';
25+
26+
statement ok
27+
create connection c2 storage_type = 's3' access_key_id ='22' secret_access_key ='22' ENDPOINT_URL='http://127.0.0.1:9900';
28+
29+
statement ok
30+
create sequence seq1;
31+
32+
statement ok
33+
create sequence seq2;
34+
35+
statement ok
36+
drop role if exists 'role2';
37+
38+
statement ok
39+
create role 'role2';
40+
41+
statement ok
42+
GRANT OWNERSHIP on udf a to role 'role1';
43+
44+
statement ok
45+
GRANT OWNERSHIP on procedure p1(int) to role 'role1';
46+
47+
statement ok
48+
GRANT create warehouse on *.* to role 'role1';
49+
50+
statement ok
51+
GRANT create connection on *.* to role 'role1';
52+
53+
statement ok
54+
GRANT create sequence on *.* to role 'role1';
55+
56+
statement ok
57+
GRANT create procedure on *.* to role 'role1';

tests/compat_fuse/test_cases.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
- { writer: "1.2.318", reader: current, meta: [1.2.527, 1.2.677, 1.2.833], suite: rbac }
1919
- { writer: "1.2.680", reader: current, meta: [1.2.527, 1.2.680, 1.2.833], suite: udf }
2020

21+
# --- Backward compat: rbac_all (procedure/sequence/connection/warehouse) ---
22+
# Requires writer >= 1.2.832 (procedure without experimental toggle).
23+
- { writer: "1.2.833", reader: current, meta: [1.2.833], suite: rbac_all }
24+
2125
# --- Forward compat: current writer -> old reader ---
2226
- { writer: current, reader: "1.2.311", meta: [1.2.770], suite: rbac }
2327
- { writer: current, reader: "1.2.318", meta: [1.2.770], suite: rbac }
2428
- { writer: current, reader: "1.2.680", meta: [1.2.770], suite: udf }
29+
- { writer: current, reader: "1.2.833", meta: [1.2.833], suite: rbac_all }

0 commit comments

Comments
 (0)