RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge branch 'feature/master/XXXX_validation'

Browse Source 
* feature/master/XXXX_validation:
  Fixup validation for Puppet 2.6.8
  Add basic validation to class parameters
This commit is contained in:
Jeff McCune
2011-05-25 16:09:31 -07:00
parent 85a4f8fb1f 993b2e5e4c
commit ac7cdf8cce
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@@ -17,6 +17,13 @@ class java(
$version='1.6.0_25-fcs' $version='1.6.0_25-fcs'
) { ) {
# Cannot pass anonymous arrays to functions in 2.6.8
$v_true_false = [ '^true$', '^false$' ]
# Must compare string values, not booleans.
validate_re("$jre", $v_true_false)
validate_re("$jdk", $v_true_false)
validate_re($version, '^[._0-9a-zA-Z:-]+$')
$jre_real = $jre $jre_real = $jre
$jdk_real = $jdk $jdk_real = $jdk
$version_real = $version $version_real = $version

3
manifests/jdk_package.pp
View File

@@ -17,7 +17,8 @@ class java::jdk_package (
$version $version
) { ) {
# JJM FIXME Validation! validate_re($version, '^[._0-9a-zA-Z:-]+$')
$version_real = $version $version_real = $version
package { 'jdk': package { 'jdk':

3
manifests/jre_package.pp
View File

@@ -14,7 +14,8 @@ class java::jre_package (
$version $version
) { ) {
# JJM FIXME Validation! validate_re($version, '^[._0-9a-zA-Z:-]+$')
$version_real = $version $version_real = $version
package { 'jre': package { 'jre':