From 6cf12a157e2545386e5e8d3f732f3b1416fcddf1 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Wed, 23 May 2018 17:45:48 -0700 Subject: [PATCH] Add invalid templates to result when invalid templates are provided to config endpoint --- lib/vmpooler/api/v1.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index be8fc3f..797ce7e 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -820,7 +820,8 @@ module Vmpooler invalid.each do |bad_template| metrics.increment("config.invalid.#{bad_template}") end - status 404 + result[:bad_templates] = invalid + status 400 end else metrics.increment('config.invalid.unknown') @@ -846,7 +847,8 @@ module Vmpooler invalid.each do |bad_template| metrics.increment("config.invalid.#{bad_template}") end - status 404 + result[:bad_templates] = invalid + status 400 end else metrics.increment('config.invalid.unknown') @@ -863,9 +865,12 @@ module Vmpooler if pools result = { - 'ok' => true, - 'pool configuration' => pools + pool_configuration: pools, + status: { + ok: true + } } + status 200 end JSON.pretty_generate(result)