Deal with rspec-puppet's Puppet::Resource

When testing the relations in rspec-puppet, it turns out that there are
other classes and they don't match which breaks tests.

Author: ekohl

lib/puppet_x/certs/common.rb

@@ -59,8 +59,14 @@ module Common
 
           validate do |value|
             ca_resource = resource.catalog.resource(value.to_s)
-            if ca_resource && ca_resource.class.to_s != 'Puppet::Type::Ca'
-              raise ArgumentError, "Expected Ca resource, got #{ca_resource.class} #{ca_resource.inspect}"
+            if ca_resource
+              # rspec-puppet presents Puppet::Resource instances
+              resource_type = ca_resource.is_a?(Puppet::Resource) ? ca_resource.resource_type.to_s : ca_resource.class.to_s
+              if resource_type != 'Puppet::Type::Ca'
+                raise ArgumentError, "Expected Ca resource, got #{ca_resource.class} #{ca_resource.inspect}"
+              end
+            else
+              raise ArgumentError, "Ca #{value} not found in catalog"
             end
           end
         end
@@ -98,15 +104,13 @@ module Common
             param_resource = resource.catalog.resource(value.to_s)
 
             if param_resource
-              param_resource_type = if param_resource.is_a?(Puppet::Resource)
-                                      param_resource.resource_type
-                                    else
-                                      param_resource.to_resource.resource_type
-                                    end
-
-              unless ['Puppet::Type::Ca', 'Puppet::Type::Cert'].include?(param_resource_type.to_s)
-                raise ArgumentError, "Expected Ca or Cert resource, got #{param_resource_type} #{param_resource.inspect}"
+              # rspec-puppet presents Puppet::Resource instances
+              resource_type = param_resource.is_a?(Puppet::Resource) ? param_resource.resource_type : param_resource.class
+              unless ['Puppet::Type::Ca', 'Puppet::Type::Cert'].include?(resource_type.to_s)
+                raise ArgumentError, "Expected Ca or Cert resource, got #{resource_type} #{param_resource.inspect}"
               end
+            else
+              raise ArgumentError, "Key_pair #{value} not found in catalog"
             end
           end
         end