Merge pull request puppetlabs#765 from hunner/fix_defines

(PE-20308) Fix defined_with_params() for defined type strings & references

Author: eputnam

lib/puppet/parser/functions/defined_with_params.rb

@@ -29,7 +29,7 @@
     # Workaround for PE-20308
     if reference.is_a?(String)
       type_name, title = Puppet::Resource.type_and_title(reference, nil)
-      type = Puppet::Type.type(type_name)
+      type = Puppet::Pops::Evaluator::Runtime3ResourceSupport.find_resource_type_or_class(find_global_scope, type_name)
     elsif reference.is_a?(Puppet::Resource)
       type = reference.resource_type
       title = reference.title

spec/fixtures/test/manifests/deftype.pp

@@ -0,0 +1,3 @@
+define test::deftype($param = 'foo') {
+  notify { "deftype: $title": }
+}

spec/functions/defined_with_params_spec.rb

@@ -55,4 +55,14 @@
       end
     end
   end
+
+  describe 'when passed a defined type' do
+    let :pre_condition do
+      'test::deftype { "foo": }'
+    end
+    it { is_expected.to run.with_params('Test::Deftype[foo]', {}).and_return(true) }
+    it { is_expected.to run.with_params('Test::Deftype[bar]', {}).and_return(false) }
+    it { is_expected.to run.with_params(Puppet::Resource.new('Test::Deftype[foo]'), {}).and_return(true) }
+    it { is_expected.to run.with_params(Puppet::Resource.new('Test::Deftype[bar]'), {}).and_return(false) }
+  end
 end

spec/functions/ensure_resource_spec.rb

@@ -38,6 +38,13 @@
       it { expect(lambda { catalogue }).to contain_user('username1').with_ensure('present') }
       it { expect(lambda { catalogue }).to contain_user('username1').without_gid }
     end
+
+    describe 'after running ensure_resource("test::deftype", "foo", {})' do
+      before { subject.call(['test::deftype', 'foo', {}]) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(lambda { catalogue }).to contain_test__deftype('foo').without_ensure }
+    end
   end
 
   context 'given a catalog with UTF8 chars' do
@@ -114,4 +121,15 @@
       }
     end
   end
+
+  context 'given a catalog with "test::deftype { foo: }"' do
+    let(:pre_condition) { 'test::deftype { "foo": }' }
+
+    describe 'after running ensure_resource("test::deftype", "foo", {})' do
+      before { subject.call(['test::deftype', 'foo', {}]) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(lambda { catalogue }).to contain_test__deftype('foo').without_ensure }
+    end
+  end
 end