Skip to content

Commit f41ca73

Browse files
committed
Remove has_key usage
In the next puppetlabs-stdlib major version this function will be dropped. Native Puppet is used instead.
1 parent 27d2abd commit f41ca73

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

manifests/server/database.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828

2929
# If possible use the version of the remote database, otherwise
3030
# fallback to our local DB version
31-
if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
31+
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
3232
$version = $connect_settings['DBVERSION']
3333
} else {
3434
$version = $postgresql::server::_version
3535
}
3636

3737
# If the connection settings do not contain a port, then use the local server port
38-
if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
38+
if $connect_settings != undef and 'PGPORT' in $connect_settings {
3939
$port = undef
4040
} else {
4141
$port = $postgresql::server::port

manifests/server/default_privileges.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
) {
3838
# If possible use the version of the remote database, otherwise
3939
# fallback to our local DB version
40-
if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
40+
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
4141
$version = $connect_settings['DBVERSION']
4242
} else {
4343
$version = $postgresql::server::_version
@@ -64,7 +64,7 @@
6464
#
6565
if $port != undef {
6666
$port_override = $port
67-
} elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
67+
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
6868
$port_override = undef
6969
} else {
7070
$port_override = $postgresql::server::port

manifests/server/extension.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#
7575
if $port != undef {
7676
$port_override = $port
77-
} elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
77+
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
7878
$port_override = undef
7979
} else {
8080
$port_override = $postgresql::server::port

manifests/server/grant.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#
7676
if $port != undef {
7777
$port_override = $port
78-
} elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
78+
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
7979
$port_override = undef
8080
} else {
8181
$port_override = $postgresql::server::port

manifests/server/reassign_owned_by.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
if $port != undef {
2828
$port_override = $port
29-
} elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
29+
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
3030
$port_override = undef
3131
} else {
3232
$port_override = $postgresql::server::port

manifests/server/role.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
#
5353
if $port != undef {
5454
$port_override = $port
55-
} elsif $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
55+
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
5656
$port_override = undef
5757
} else {
5858
$port_override = $postgresql::server::port
5959
}
6060

6161
# If possible use the version of the remote database, otherwise
6262
# fallback to our local DB version
63-
if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
63+
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
6464
$version = $connect_settings['DBVERSION']
6565
} else {
6666
$version = $postgresql::server::_version

manifests/server/schema.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name]
2828

2929
# If the connection settings do not contain a port, then use the local server port
30-
if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
30+
if $connect_settings != undef and 'PGPORT' in $connect_settings {
3131
$port = undef
3232
} else {
3333
$port = $postgresql::server::port

manifests/server/tablespace.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$module_workdir = $postgresql::server::module_workdir
1919

2020
# If the connection settings do not contain a port, then use the local server port
21-
if $connect_settings != undef and has_key( $connect_settings, 'PGPORT') {
21+
if $connect_settings != undef and 'PGPORT' in $connect_settings {
2222
$port = undef
2323
} else {
2424
$port = $postgresql::server::port

0 commit comments

Comments
 (0)