Skip to content

Commit a767382

Browse files
Merge pull request #206 from david22swan/BUGFIX/main/remove_validate_legacy
(CONT-967) Replace all uses of validate_*() with assert_type()
2 parents c86262f + 3ccd3d0 commit a767382

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

manifests/init.pp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@
162162

163163
$_au_base = "${_basekey}\\AU"
164164

165-
validate_legacy(Boolean, 'validate_bool', $purge_values)
166-
167165
registry_key { $_basekey:
168166
ensure => present,
169167
purge_values => $purge_values,
@@ -190,14 +188,14 @@
190188
has_enabled => false,
191189
}
192190
if $server_url {
193-
validate_legacy(Optional[Variant[Stdlib::HTTPUrl,Boolean]],'validate_re' ,$server_url, '^http(|s):\/\/', "server_url is required to be either http or https, ${server_url}")
191+
assert_type(Stdlib::HTTPUrl, $server_url)
194192
wsus_client::setting { "${_basekey}\\WUServer":
195193
type => 'string',
196194
data => $server_url,
197195
has_enabled => false,
198196
}
199197
if $enable_status_server != undef {
200-
validate_legacy(Boolean, 'validate_bool', $enable_status_server)
198+
assert_type(Boolean, $enable_status_server)
201199
$_ensure_status_server = $enable_status_server ? {
202200
true => 'present',
203201
false => 'absent',

manifests/setting.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
validate_in_range($data,$validate_range[0],$validate_range[1])
4646
}
4747
if $validate_bool {
48-
validate_legacy(Boolean, 'validate_bool', $data)
48+
assert_type(Boolean, $data)
4949
}
5050
$_data = $validate_bool ? {
5151
true => bool2num($data),

0 commit comments

Comments
 (0)