Skip to content

Commit d9ce3b4

Browse files
committed
Remove db argument from the role resource
This option doesn't make sense, because roles are not specific to databases on PostgreSQL. It was not documented on the README, so I don't see value in making this backwards compatible.
1 parent 06f3a81 commit d9ce3b4

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

manifests/server/role.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
$password_hash = false,
55
$createdb = false,
66
$createrole = false,
7-
$db = $postgresql::server::default_database,
87
$port = undef,
98
$login = true,
109
$inherit = true,
@@ -15,6 +14,7 @@
1514
$connect_settings = $postgresql::server::default_connect_settings,
1615
Enum['present', 'absent'] $ensure = 'present',
1716
) {
17+
$psql_db = $postgresql::server::default_database
1818
$psql_user = $postgresql::server::user
1919
$psql_group = $postgresql::server::group
2020
$psql_path = $postgresql::server::psql_path
@@ -40,7 +40,7 @@
4040
}
4141

4242
Postgresql_psql {
43-
db => $db,
43+
db => $psql_db,
4444
port => $port_override,
4545
psql_user => $psql_user,
4646
psql_group => $psql_group,

spec/acceptance/server/grant_role_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class { 'postgresql::server': }
5252
5353
# Create a role to grant to the user
5454
postgresql::server::role { $group:
55-
db => $db,
5655
login => false,
5756
require => Postgresql::Server::Database[$db],
5857
}
@@ -106,7 +105,6 @@ class { 'postgresql::server': }
106105
107106
# Create a role to grant to the user
108107
postgresql::server::role { $group:
109-
db => $db,
110108
login => false,
111109
require => Postgresql::Server::Database[$db],
112110
}
@@ -160,7 +158,6 @@ class { 'postgresql::server': }
160158
161159
# Create a role to grant to the user
162160
postgresql::server::role { $group:
163-
db => $db,
164161
login => false,
165162
require => Postgresql::Server::Database[$db],
166163
}
@@ -197,7 +194,6 @@ class { 'postgresql::server': }
197194
198195
# Create a role to grant to the nonexistent user
199196
postgresql::server::role { $group:
200-
db => $db,
201197
login => false,
202198
require => Postgresql::Server::Database[$db],
203199
}

spec/acceptance/server/grant_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class { 'postgresql::server': }
3131
3232
# Create a user to grant privileges to
3333
postgresql::server::role { $user:
34-
db => $db,
35-
require => Postgresql::Server::Database[$db],
3634
}
3735
3836
# Make a local user for ident auth

spec/acceptance/server/reassign_owned_by_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class { 'postgresql::server': }
2727
2828
# Create a user to reassign ownership to
2929
postgresql::server::role { $new_owner:
30-
db => $db,
31-
require => Postgresql::Server::Database[$db],
3230
}
3331
3432
# Make a local user for ident auth

0 commit comments

Comments
 (0)