diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-17 14:59:59 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-17 14:59:59 -0800 |
| commit | 23fc4db954c22bce2c6cc8996d5fafb175e2b747 (patch) | |
| tree | fef367b2b6a94148b0207ad13acd53e42d49bea1 /lib/puppet/network/http/api | |
| parent | ab27da7967e1e145d5fbc130e5fbcec6795ca775 (diff) | |
| download | puppet-23fc4db954c22bce2c6cc8996d5fafb175e2b747.tar.gz puppet-23fc4db954c22bce2c6cc8996d5fafb175e2b747.tar.xz puppet-23fc4db954c22bce2c6cc8996d5fafb175e2b747.zip | |
(#5132) Provide a query REST interface for inventory
This REST interface returns a list of nodes that match a fact query.
Fact queries can use (in)equality testing as a string comparison, and >,
<, >=, <= numerical comparisons. Multiple tests can be done as AND
comparisons, not OR.
The fact queries need to be prefixed by facts, and the comparisons other
than equality are specified with a .comparison_type after the fact name.
This will be better explained in the REST documentation on the website.
Searches that don't match anything now return empty array instead of a
404 error.
Conflicts:
spec/spec_helper.rb
Diffstat (limited to 'lib/puppet/network/http/api')
| -rw-r--r-- | lib/puppet/network/http/api/v1.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/network/http/api/v1.rb b/lib/puppet/network/http/api/v1.rb index 8aa1f0ee1..0a04a465f 100644 --- a/lib/puppet/network/http/api/v1.rb +++ b/lib/puppet/network/http/api/v1.rb @@ -60,9 +60,8 @@ module Puppet::Network::HTTP::API::V1 # fix to not need this, and our goal is to move away from the complication # that leads to the fix being too long. return :singular if indirection == "facts" - - # "status" really is singular return :singular if indirection == "status" + return :plural if indirection == "inventory" result = (indirection =~ /s$/) ? :plural : :singular |