Skip to content

Commit dcfe75e

Browse files
author
Morgan Haskel
committed
Rework defaults for $object_name in postgresql::server::grant
You don't have access to parameters within the parameter list.
1 parent 317c146 commit dcfe75e

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

manifests/server/grant.pp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
$db,
55
$privilege = undef,
66
$object_type = 'database',
7-
$object_name = $db,
7+
$object_name = undef,
88
$psql_db = $postgresql::server::default_database,
99
$psql_user = $postgresql::server::user,
1010
$port = $postgresql::server::port
1111
) {
1212
$group = $postgresql::server::group
1313
$psql_path = $postgresql::server::psql_path
1414

15+
if ! $object_name {
16+
$_object_name = $db
17+
} else {
18+
$_object_name = $object_name
19+
}
20+
1521
## Munge the input values
1622
$_object_type = upcase($object_type)
1723
$_privilege = upcase($privilege)
@@ -93,13 +99,13 @@
9399
# object_type => 'TABLE',
94100
# object_name => [$schema, $table],
95101
# }
96-
if is_array($object_name) {
97-
$_togrant_object = join($object_name, '"."')
102+
if is_array($_object_name) {
103+
$_togrant_object = join($_object_name, '"."')
98104
# Never put double quotes into has_*_privilege function
99-
$_granted_object = join($object_name, '.')
105+
$_granted_object = join($_object_name, '.')
100106
} else {
101-
$_granted_object = $object_name
102-
$_togrant_object = $object_name
107+
$_granted_object = $_object_name
108+
$_togrant_object = $_object_name
103109
}
104110

105111
$_unless = $unless_function ? {

0 commit comments

Comments
 (0)