Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit cb78fef

Browse files
committed
Revisit parameter validation
* Remove calls to deprecated validate_* functions Replace regex validation with !~ comparison * Remove string/bool/hash/array validations Not truly relevant anyway "Puppet 3 deprecation is coming"
1 parent afdb18d commit cb78fef

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

manifests/init.pp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,15 @@
7575
}
7676

7777
# parameters validation
78-
validate_re($version, '^([0-9]|[0-9]u[0-9]{1,3})$', '$version must be formated as \'major\'u\'minor\' or just \'major\'')
79-
validate_re($type, '^(jre|jdk)$', '$type must be either \'jre\' or \'jdk\'')
80-
validate_re($format_real, '^(rpm|tar\.gz)$', '$format must be either \'rpm\' or \'tar.gz\'')
81-
validate_bool($check_checksum, $add_alternative)
82-
validate_absolute_path($install_path)
78+
if $version !~ /^([0-9]|[0-9]u[0-9]{1,3})$/ {
79+
fail('$version must be formated as \'major\'u\'minor\' or just \'major\'')
80+
}
81+
if $type !~ /^(jre|jdk)$/ {
82+
fail('$type must be either \'jre\' or \'jdk\'')
83+
}
84+
if $format_real !~ /^(rpm|tar\.gz)$/ {
85+
fail('$format must be either \'rpm\' or \'tar.gz\'')
86+
}
8387

8488
# set to latest release if no minor version was provided
8589
if $version == '8' {

manifests/installation.pp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,12 @@
5656
$install_path = $oracle_java::install_path
5757

5858
# parameters validation
59-
validate_re($version, '^([0-9]|[0-9]u[0-9]{1,3})$', '$version must be formated as \'major\'u\'minor\' or just \'major\'')
60-
validate_re($type, '^(jre|jdk)$', '$type must be either \'jre\' or \'jdk\'')
61-
validate_bool($check_checksum, $add_alternative)
59+
if $version !~ /^([0-9]|[0-9]u[0-9]{1,3})$/ {
60+
fail('$version must be formated as \'major\'u\'minor\' or just \'major\'')
61+
}
62+
if $type !~ /^(jre|jdk)$/ {
63+
fail('$type must be either \'jre\' or \'jdk\'')
64+
}
6265

6366
# set to latest release if no minor version was provided
6467
if $version == '8' {

0 commit comments

Comments
 (0)