Skip to content

Commit a3ac7d5

Browse files
dlepikhovadlepikhova
committed
Add grants for pgpro_edition
1 parent 55a7490 commit a3ac7d5

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

‎tests/backup.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,6 +1915,7 @@ def test_backup_with_least_privileges_role(self):
19151915
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
19161916
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
19171917
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
1918+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
19181919
)
19191920
# >= 10
19201921
else:
@@ -1953,6 +1954,7 @@ def test_backup_with_least_privileges_role(self):
19531954
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
19541955
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
19551956
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
1957+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
19561958
)
19571959

19581960
if self.ptrack:
@@ -1966,9 +1968,6 @@ def test_backup_with_least_privileges_role(self):
19661968
"GRANT EXECUTE ON FUNCTION ptrack.ptrack_init_lsn() TO backup;")
19671969

19681970
if ProbackupTest.enterprise:
1969-
node.safe_psql(
1970-
"backupdb",
1971-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")
19721971

19731972
node.safe_psql(
19741973
"backupdb",
@@ -3052,7 +3051,9 @@ def test_missing_replication_permission(self):
30523051
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
30533052
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
30543053
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
3055-
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
3054+
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3055+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
3056+
)
30563057
# >= 10
30573058
else:
30583059
node.safe_psql(
@@ -3075,12 +3076,12 @@ def test_missing_replication_permission(self):
30753076
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
30763077
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
30773078
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3079+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
30783080
)
30793081

30803082
if ProbackupTest.enterprise:
30813083
node.safe_psql(
30823084
"backupdb",
3083-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
30843085
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
30853086

30863087
sleep(2)
@@ -3185,6 +3186,7 @@ def test_missing_replication_permission_1(self):
31853186
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
31863187
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
31873188
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3189+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
31883190
)
31893191
# >= 10
31903192
else:
@@ -3208,12 +3210,13 @@ def test_missing_replication_permission_1(self):
32083210
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
32093211
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
32103212
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3213+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
3214+
32113215
)
32123216

32133217
if ProbackupTest.enterprise:
32143218
node.safe_psql(
32153219
"backupdb",
3216-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
32173220
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
32183221

32193222
replica.promote()

‎tests/checkdb.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ def test_checkdb_with_least_privileges(self):
698698
'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup; '
699699
# 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
700700
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
701+
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
701702
)
702703
# PG 10
703704
elif self.get_version(node) > 100000 and self.get_version(node) < 110000:

‎tests/ptrack.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ def test_ptrack_unprivileged(self):
582582
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
583583
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
584584
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
585+
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
585586
)
586587
# >= 10
587588
else:
@@ -618,6 +619,7 @@ def test_ptrack_unprivileged(self):
618619
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
619620
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
620621
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
622+
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
621623
)
622624

623625
node.safe_psql(
@@ -635,10 +637,6 @@ def test_ptrack_unprivileged(self):
635637
"GRANT SELECT ON TABLE pg_catalog.pg_extension TO backup")
636638

637639
if ProbackupTest.enterprise:
638-
node.safe_psql(
639-
"backupdb",
640-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")
641-
642640
node.safe_psql(
643641
"backupdb",
644642
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")

‎tests/restore.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3268,6 +3268,7 @@ def test_missing_database_map(self):
32683268
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
32693269
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
32703270
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3271+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
32713272
)
32723273
# >= 10
32733274
else:
@@ -3305,6 +3306,7 @@ def test_missing_database_map(self):
33053306
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
33063307
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
33073308
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
3309+
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
33083310
)
33093311

33103312
if self.ptrack:
@@ -3319,9 +3321,6 @@ def test_missing_database_map(self):
33193321
"CREATE EXTENSION ptrack WITH SCHEMA ptrack")
33203322

33213323
if ProbackupTest.enterprise:
3322-
node.safe_psql(
3323-
"backupdb",
3324-
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")
33253324

33263325
node.safe_psql(
33273326
"backupdb",

0 commit comments

Comments
 (0)