Skip to content

Commit 5630c7d

Browse files
committed
(MAINT) - Remove deprecated 'has_key'
1 parent d367a43 commit 5630c7d

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

manifests/login.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,25 @@
9292
instance => $instance,
9393
require => Sqlserver_tsql["login-${instance}-${login}"],
9494
}
95-
if has_key($_upermissions, 'GRANT') and $_upermissions['GRANT'] =~ Array {
95+
if 'GRANT' in $_upermissions and $_upermissions['GRANT'] =~ Array {
9696
sqlserver::login::permissions { "Sqlserver::Login[${title}]-GRANT-${login}":
9797
state => 'GRANT',
9898
permissions => $_upermissions['GRANT'],
9999
}
100100
}
101-
if has_key($_upermissions, 'DENY') and $_upermissions['DENY'] =~ Array {
101+
if 'DENY' in $_upermissions and $_upermissions['DENY'] =~ Array {
102102
sqlserver::login::permissions { "Sqlserver::Login[${title}]-DENY-${login}":
103103
state => 'DENY',
104104
permissions => $_upermissions['DENY'],
105105
}
106106
}
107-
if has_key($_upermissions, 'REVOKE') and $_upermissions['REVOKE'] =~ Array {
107+
if 'REVOKE' in $_upermissions and $_upermissions['REVOKE'] =~ Array {
108108
sqlserver::login::permissions { "Sqlserver::Login[${title}]-REVOKE-${login}":
109109
state => 'REVOKE',
110110
permissions => $_upermissions['REVOKE'],
111111
}
112112
}
113-
if has_key($_upermissions, 'GRANT_WITH_OPTION') and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
113+
if 'GRANT_WITH_OPTION' in $_upermissions and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
114114
sqlserver::login::permissions { "Sqlserver::Login[${title}]-GRANT-WITH_GRANT_OPTION-${login}":
115115
state => 'GRANT',
116116
with_grant_option => true,

manifests/role.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,25 @@
7979
type => $type,
8080
require => Sqlserver_tsql[$sqlserver_tsql_title],
8181
}
82-
if has_key($_upermissions, 'GRANT') and $_upermissions['GRANT'] =~ Array {
82+
if 'GRANT' in $_upermissions and $_upermissions['GRANT'] =~ Array {
8383
sqlserver::role::permissions { "Sqlserver::Role[${title}]-GRANT-${role}":
8484
state => 'GRANT',
8585
permissions => $_upermissions['GRANT'],
8686
}
8787
}
88-
if has_key($_upermissions, 'DENY') and $_upermissions['DENY'] =~ Array {
88+
if 'DENY' in $_upermissions and $_upermissions['DENY'] =~ Array {
8989
sqlserver::role::permissions { "Sqlserver::Role[${title}]-DENY-${role}":
9090
state => 'DENY',
9191
permissions => $_upermissions['DENY'],
9292
}
9393
}
94-
if has_key($_upermissions, 'REVOKE') and $_upermissions['REVOKE'] =~ Array {
94+
if 'REVOKE' in $_upermissions and $_upermissions['REVOKE'] =~ Array {
9595
sqlserver::role::permissions { "Sqlserver::Role[${title}]-REVOKE-${role}":
9696
state => 'REVOKE',
9797
permissions => $_upermissions['REVOKE'],
9898
}
9999
}
100-
if has_key($_upermissions, 'GRANT_WITH_OPTION') and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
100+
if 'GRANT_WITH_OPTION' in $_upermissions and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
101101
sqlserver::role::permissions { "Sqlserver::Role[${title}]-GRANT-WITH_GRANT_OPTION-${role}":
102102
state => 'GRANT',
103103
with_grant_option => true,

manifests/user.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,25 @@
7979
instance => $instance,
8080
require => Sqlserver_tsql["user-${instance}-${database}-${user}"],
8181
}
82-
if has_key($_upermissions, 'GRANT') and $_upermissions['GRANT'] =~ Array {
82+
if 'GRANT' in $_upermissions and $_upermissions['GRANT'] =~ Array {
8383
sqlserver::user::permissions { "Sqlserver::User[${title}]-GRANT-${user}":
8484
state => 'GRANT',
8585
permissions => $_upermissions['GRANT'],
8686
}
8787
}
88-
if has_key($_upermissions, 'DENY') and $_upermissions['DENY'] =~ Array {
88+
if 'DENY' in $_upermissions and $_upermissions['DENY'] =~ Array {
8989
sqlserver::user::permissions { "Sqlserver::User[${title}]-DENY-${user}":
9090
state => 'DENY',
9191
permissions => $_upermissions['DENY'],
9292
}
9393
}
94-
if has_key($_upermissions, 'REVOKE') and $_upermissions['REVOKE'] =~ Array {
94+
if 'REVOKE' in $_upermissions and $_upermissions['REVOKE'] =~ Array {
9595
sqlserver::user::permissions { "Sqlserver::User[${title}]-REVOKE-${user}":
9696
state => 'REVOKE',
9797
permissions => $_upermissions['REVOKE'],
9898
}
9999
}
100-
if has_key($_upermissions, 'GRANT_WITH_OPTION') and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
100+
if 'GRANT_WITH_OPTION' in $_upermissions and $_upermissions['GRANT_WITH_OPTION'] =~ Array {
101101
sqlserver::user::permissions { "Sqlserver::User[${title}]-GRANT-WITH_GRANT_OPTION-${user}":
102102
state => 'GRANT',
103103
with_grant_option => true,

0 commit comments

Comments
 (0)