these values need to be quoted

strider · Jan 14, 2015 · 64c4020 · 64c4020
1 parent ba762bd
commit 64c4020
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/spec/defines/collectd_plugin_snmp_data_spec.rb b/spec/defines/collectd_plugin_snmp_data_spec.rb
@@ -35,7 +35,7 @@
         :values => %w{ foo bar baz }
       })
     }
-    it { should contain_file('snmp-data-foo.conf').with_content(/Values foo bar baz/) }
+    it { should contain_file('snmp-data-foo.conf').with_content(/Values "foo" "bar" "baz"/) }
   end
 
   context 'values is just a string' do
@@ -44,7 +44,7 @@
         :values => 'bat'
       })
     }
-    it { should contain_file('snmp-data-foo.conf').with_content(/Values bat/) }
+    it { should contain_file('snmp-data-foo.conf').with_content(/Values "bat"/) }
   end
 
   context 'table is true' do

diff --git a/spec/defines/collectd_plugin_snmp_host_spec.rb b/spec/defines/collectd_plugin_snmp_host_spec.rb
@@ -48,13 +48,13 @@
     let (:params) {{
       :collect => %w{ foo bar baz }
     }}
-    it { should contain_file(filename).with_content(/Collect foo bar baz/) }
+    it { should contain_file(filename).with_content(/Collect "foo" "bar" "baz"/) }
   end
 
   context 'collect is just a string' do
     let (:params) {{
       :collect => 'bat'
     }}
-    it { should contain_file(filename).with_content(/Collect bat/) }
+    it { should contain_file(filename).with_content(/Collect "bat"/) }
   end
 end
diff --git a/templates/plugin/snmp/data.conf.erb b/templates/plugin/snmp/data.conf.erb
@@ -3,6 +3,6 @@
     Type "<%= @type %>"
     Table <%= @table_bool ? 'true' : 'false' %>
     Instance "<%= @instance %>"
-    Values <%= Array(@values).join(' ') %>
+    Values <%= Array(@values).map { |x| %Q{"#{x}"} }.join(' ') %>
   </Data>
 </Plugin>
diff --git a/templates/plugin/snmp/host.conf.erb b/templates/plugin/snmp/host.conf.erb
@@ -3,7 +3,7 @@
     Address "<%= @address %>"
     Version <%= @version %>
     Community "<%= @community %>"
-    Collect <%= Array(@collect).join(" ") %>
+    Collect <%= Array(@collect).map { |x| %Q{"#{x}"} }.join(' ') %>
     <%- if !@interval.nil? -%>
     Interval <%= @interval %>
     <%- end -%>