fix types that subclass ini_setting

Signed-off-by: Brian Witt <brianwitt@gmail.com>

Author: bwitt

lib/puppet/provider/ini_setting/ruby.rb

@@ -70,7 +70,13 @@ def destroy
   end
 
   def value
-    ini_file.get_value(section, setting)
+    result = ini_file.get_value(section, setting)
+    return result if result.nil?
+
+    value_property = resource.class.attrclass(:value)
+    return result if value_property && value_property.array_matching == :all
+
+    (result.length == 1) ? result.first : result
   end
 
   def value=(_value)

spec/unit/puppet/provider/ini_setting/ruby_spec.rb

@@ -1731,4 +1731,49 @@ def self.file_path
       validate_file(expected_content_six, tmpfile)
     end
   end
+
+  context 'when used by a custom type whose value property is not array_matching' do
+    before(:all) do
+      Puppet::Type.newtype(:scalar_value_ini_setting) do
+        newparam(:name, namevar: true)
+        newparam(:section)
+        newparam(:setting)
+        newparam(:path)
+        newparam(:key_val_separator) { defaultto('=') }
+        newparam(:section_prefix) { defaultto('[') }
+        newparam(:section_suffix) { defaultto(']') }
+        newparam(:indent_char) { defaultto(' ') }
+        newparam(:indent_width)
+        newparam(:force_new_section_creation) { defaultto(true) }
+        ensurable
+        newproperty(:value) do
+          munge { |v| v.to_s }
+        end
+      end
+      Puppet::Type.type(:scalar_value_ini_setting).provide(
+        :ruby,
+        parent: Puppet::Type.type(:ini_setting).provider(:ruby),
+      )
+    end
+
+    let(:orig_content) do
+      <<-INIFILE
+[section1]
+http_interface=127.0.0.1
+      INIFILE
+    end
+
+    it 'returns a scalar from #value so insync? matches a scalar should' do
+      resource = Puppet::Type.type(:scalar_value_ini_setting).new(
+        title: 'http_interface',
+        path: tmpfile,
+        section: 'section1',
+        setting: 'http_interface',
+        value: '127.0.0.1',
+      )
+      provider = Puppet::Type.type(:scalar_value_ini_setting).provider(:ruby).new(resource)
+      expect(provider.value).to eq('127.0.0.1')
+      expect(resource.property(:value).insync?(provider.value)).to be true
+    end
+  end
 end