diff options
| author | Helen <helen@puppetlabs.com> | 2016-10-12 15:40:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 15:40:42 +0100 |
| commit | d9900211cc5a4efe18452e9908e50e08ea27436c (patch) | |
| tree | 8791cd53c7596a126912872b7e985342a671af6d /lib/puppet/functions/validate_array.rb | |
| parent | 6fb746528dde4b6ee10eff4a008f76db6276bc2d (diff) | |
| parent | f2741dc814c1b6c10d8dd69c17aabf5bae106c17 (diff) | |
Merge pull request #673 from DavidS/modules-3962-compat-fixes
(MODULES-3962) Rework v4 function shims to work on puppet 3.7 and 4.0.0
Diffstat (limited to 'lib/puppet/functions/validate_array.rb')
| -rw-r--r-- | lib/puppet/functions/validate_array.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb index c8553c4..f59c6b4 100644 --- a/lib/puppet/functions/validate_array.rb +++ b/lib/puppet/functions/validate_array.rb @@ -1,7 +1,12 @@ -Puppet::Functions.create_function(:validate_array, Puppet::Functions::InternalFunction) do +Puppet::Functions.create_function(:validate_array) do dispatch :deprecation_gen do - scope_param - optional_repeated_param 'Any', :args + param 'Any', :scope + repeated_param 'Any', :args + end + # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1. + def call(scope, *args) + manipulated_args = [scope] + args + self.class.dispatcher.dispatch(self, scope, manipulated_args) end def deprecation_gen(scope, *args) call_function('deprecation', 'validate_array', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.") |