@@ -31,10 +31,14 @@ class CollExpr < AST::Branch when "and"; code1.call(resource) and code2.call(resource) when "or"; code1.call(resource) or code2.call(resource) when "==" - if resource[str1].is_a?(Array) - resource[str1].include?(str2) + if str1 == "tag" + resource.tagged?(str2) else - resource[str1] == str2 + if resource[str1].is_a?(Array) + resource[str1].include?(str2) + else + resource[str1] == str2 + end end when "!="; resource[str1] != str2 end @@ -58,8 +62,11 @@ class CollExpr < AST::Branch if oper == "=" or oper == "!=" # Add the rails association info where necessary - if str1 == "title" + case str1 + when "title" str = "title #{oper} '#{str2}'" + when "tag" + str = "puppet_tags.name #{oper} '#{str2}'" else str = "param_values.value #{oper} '#{str2}' and " + "param_names.name = '#{str1}'" lib/puppet/parser/ast/collexpr.rb @@ -102,7 +102,7 @@ class Puppet::Parser::Collector raise Puppet::DevError, "Cannot collect resources for a nil host" unless @scope.host host = Puppet::Rails::Host.find_by_name(@scope.host) - query = {:include => {:param_values => :param_name}} + query = {:include => {:param_values => :param_name, :puppet_tags => :resource_tags}} search = "(exported=? AND restype=?)" values = [true, @type] lib/puppet/parser/collector.rb @@ -74,6 +74,27 @@ describe Puppet::Parser::AST::CollExpr do end end + describe "when evaluating with tags" do + before :each do + @tag = stub 'tag', :safeevaluate => 'tag' + @value = stub 'value', :safeevaluate => 'value' + + @resource = stub 'resource' + @resource.stubs(:tagged?).with("value").returns(true) + end + + it "should produce a textual representation of the expression" do + collexpr = ast::CollExpr.new(:test1 => @tag, :test2 => @value, :oper=>"==") + result = collexpr.evaluate(@scope) + result[0].should == "puppet_tags.name = 'value'" + end + + it "should inspect resource tags if the query term is on tags" do + collexpr = ast::CollExpr.new(:test1 => @tag, :test2 => @value, :oper => "==") + collexpr.evaluate(@scope)[1].call(@resource).should be_true + end + end + [:exported,:virtual].each do |mode| it "should check for array member equality if resource parameter is an array for == in mode #{mode}" do array = mock 'array', :safeevaluate => "array" spec/unit/parser/ast/collexpr.rb @@ -502,10 +502,10 @@ describe Puppet::Parser::Collector, "when building its ActiveRecord query for co @collector.evaluate end - it "should return parameter names and parameter values when querying ActiveRecord" do + it "should return parameter names, parameter values and tags when querying ActiveRecord" do Puppet::Rails::Resource.stubs(:find).with { |*arguments| options = arguments[3] - options[:include] == {:param_values => :param_name} + options[:include] == {:param_values => :param_name, :puppet_tags => :resource_tags} }.returns([]) @collector.evaluate spec/unit/parser/collector.rb b5855ec1a5af2bec6c4ac35f8e6a885999b09bf9 Brice Figureau brice-puppet@daysofwonder.com http://github.com/lak/puppet/commit/f9516d49a02facb43e2856766b6439673450fdd1 f9516d49a02facb43e2856766b6439673450fdd1 2009-06-05T16:52:53-07:00 2009-06-03T12:10:36-07:00 Make sure virtual and rails query use tags when tag are searched Up to now, when trying to match with tags: File<<| tag == 'value' |>> in fact we were querying parameters. Hopefully all the user tags are stored in parameters so it was working. But it wasn't possible to search on auto-tags (like class name). This patch makes sure searching by tag is done on tags both on the rails side and the resource side. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com> 06df981d0a51f55d8a749706ae7d349e6b5401ec James Turnbull james@lovedthanlost.net