Flatten regex validation array so nested arrays work

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index 322caea474..1b3a8ddcae 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -291,7 +291,7 @@ class Chef
       def _pv_regex(opts, key, regex)
         value = _pv_opts_lookup(opts, key)
         if !value.nil?
-          Array(regex).each do |r|
+          Array(regex).flatten.each do |r|
             return true if r.match(value.to_s)
           end
           raise Exceptions::ValidationFailed, "Option #{key}'s value #{value} does not match regular expression #{regex.inspect}"
diff --git a/spec/unit/property/validation_spec.rb b/spec/unit/property/validation_spec.rb
index a3649d228c..31bb3f0739 100644
--- a/spec/unit/property/validation_spec.rb
+++ b/spec/unit/property/validation_spec.rb
@@ -402,6 +402,11 @@ describe "Chef::Resource.property validation" do
       [ 'gbh', 123 ],
       [ nil ]
 
+    validation_test 'regex: [ [ /z/, /abc/ ], [ /n/ ] ]',
+      [ 'xabcy', 'aza', 'ana' ],
+      [ 'gbh', 123 ],
+      [ nil ]
+
     validation_test 'regex: []',
       [],
       [ :a ],