puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add invalid templates to result when invalid templates are provided to config endpoint

Browse source
This commit is contained in:
kirby@puppetlabs.com 2018-05-23 17:45:48 -07:00
parent ab0c5b53a0
commit 6cf12a157e
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/vmpooler/api/v1.rb
View file

@ -820,7 +820,8 @@ module Vmpooler
invalid.each do |bad_template| invalid.each do |bad_template|
metrics.increment("config.invalid.#{bad_template}") metrics.increment("config.invalid.#{bad_template}")
end end
status 404 result[:bad_templates] = invalid
status 400
end end
else else
metrics.increment('config.invalid.unknown') metrics.increment('config.invalid.unknown')
@ -846,7 +847,8 @@ module Vmpooler
invalid.each do |bad_template| invalid.each do |bad_template|
metrics.increment("config.invalid.#{bad_template}") metrics.increment("config.invalid.#{bad_template}")
end end
status 404 result[:bad_templates] = invalid
status 400
end end
else else
metrics.increment('config.invalid.unknown') metrics.increment('config.invalid.unknown')
@ -863,9 +865,12 @@ module Vmpooler
if pools if pools
result = { result = {
'ok' => true, pool_configuration: pools,
'pool configuration' => pools status: {
ok: true
} }
}
status 200 status 200
end end
JSON.pretty_generate(result) JSON.pretty_generate(result)