Merge pull request #222 from wk8/wk8/fix_watch_syntax

Fixing the syntax for Consul watches
sous-chefs · Sep 25, 2015 · 169703e · 169703e
2 parents bedf13e + 3670858
commit 169703e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/libraries/consul_watch.rb b/libraries/consul_watch.rb
@@ -35,7 +35,7 @@ class ConsulWatch < Chef::Resource
       attribute(:parameters, option_collector: true, default: {})
 
       def to_json
-        JSON.pretty_generate({ type: type }.merge(parameters))
+        JSON.pretty_generate(watches: [{ type: type }.merge(parameters)])
       end
 
       action(:create) do

diff --git a/test/spec/libraries/consul_watch_spec.rb b/test/spec/libraries/consul_watch_spec.rb
@@ -19,9 +19,13 @@
       .with(user: 'consul', group: 'consul', mode: '0640')
       .with(content: JSON.pretty_generate(
         {
-          type: 'key',
-          key: 'foo/bar/baz',
-          handler: '/bin/false'
+          watches: [
+            {
+              type: 'key',
+              key: 'foo/bar/baz',
+              handler: '/bin/false'
+            }
+          ]
         }
       ))
     end