Fix SimpleProvider composite namevar matching

Author: seanmil

lib/puppet/resource_api/simple_provider.rb

@@ -10,11 +10,13 @@ module Puppet::ResourceApi
   # and absence of resources.
   class SimpleProvider
     def set(context, changes)
+      namevars = context.type.namevars
+
       changes.each do |name, change|
         is = if context.type.feature?('simple_get_filter')
-               change.key?(:is) ? change[:is] : (get(context, [name]) || []).find { |r| r[:name] == name }
+               change.key?(:is) ? change[:is] : (get(context, [name]) || []).find { |r| SimpleProvider.build_name(namevars, r) == name }
              else
-               change.key?(:is) ? change[:is] : (get(context) || []).find { |r| r[:name] == name }
+               change.key?(:is) ? change[:is] : (get(context) || []).find { |r| SimpleProvider.build_name(namevars, r) == name }
              end
         context.type.check_schema(is) unless change.key?(:is)
 
@@ -25,10 +27,10 @@ def set(context, changes)
         is = SimpleProvider.create_absent(:name, name) if is.nil?
         should = SimpleProvider.create_absent(:name, name) if should.nil?
 
-        name_hash = if context.type.namevars.length > 1
+        name_hash = if namevars.length > 1
                       # pass a name_hash containing the values of all namevars
                       name_hash = {}
-                      context.type.namevars.each do |namevar|
+                      namevars.each do |namevar|
                         name_hash[namevar] = change[:should][namevar]
                       end
                       name_hash
@@ -74,5 +76,14 @@ def self.create_absent(namevar, title)
       result[:ensure] = 'absent'
       result
     end
+
+    # @api private
+    def self.build_name(namevars, resource_hash)
+      if namevars.size > 1
+        Hash[namevars.map { |attr| [attr, resource_hash[attr]] }]
+      else
+        resource_hash[namevars[0]]
+      end
+    end
   end
 end

spec/puppet/resource_api/simple_provider_spec.rb

@@ -40,6 +40,10 @@ def delete(context, _name); end
   context 'with no changes' do
     let(:changes) { {} }
 
+    before(:each) do
+      allow(type_def).to receive(:namevars)
+    end
+
     it 'does not call create' do
       expect(provider).to receive(:create).never
       provider.set(context, changes)
@@ -362,6 +366,7 @@ def delete(context, _name); end
       allow(context).to receive(:updating).with('title').and_yield
       allow(type_def).to receive(:feature?).with('simple_get_filter')
       allow(type_def).to receive(:ensurable?).and_return(false)
+      allow(type_def).to receive(:namevars).and_return([:name])
     end
 
     it { expect { provider.set(context, changes) }.to raise_error %r{SimpleProvider cannot be used with a Type that is not ensurable} }