From 6bcb8976383fc8949a6c664a97167928cb406711 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 28 Oct 2013 13:35:54 -0700 Subject: improve depsolver error message - at least return the last cookbook that failed inside the recursive bowels of the depsolver. not sure if this will produce a slightly misleading error messge in the case of a cookbook resolution failure, but it should give at least point at a cookbook that has a problem. --- lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb index efd21a4..dbc2f98 100644 --- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb +++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb @@ -6,6 +6,7 @@ module ChefZero module Endpoints # /environments/NAME/cookbook_versions class EnvironmentCookbookVersionsEndpoint < RestBase + def post(request) cookbook_names = list_data(request, ['cookbooks']) @@ -35,7 +36,11 @@ module ChefZero # Depsolve! solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints) if !solved - return raise RestErrorResponse.new(412, "Unsolvable versions!") + if @last_missing_dep && !cookbook_names.include?(@last_missing_dep) + return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}") + else + return raise RestErrorResponse.new(412, "Unsolvable versions!") + end end result = {} @@ -72,6 +77,7 @@ module ChefZero new_unsolved = new_unsolved + [dep_name] # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep. if !exists_data_dir?(request, ['cookbooks', dep_name]) + @last_missing_dep = dep_name.to_s dep_not_found = true break end -- cgit v1.2.1 From 056b975dd45f94cc690e3c0e8bc6780623c481ce Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 28 Oct 2013 14:40:14 -0700 Subject: slight better error message on constraint failure --- .../endpoints/environment_cookbook_versions_endpoint.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb index dbc2f98..2e56a51 100644 --- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb +++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb @@ -37,8 +37,11 @@ module ChefZero solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints) if !solved if @last_missing_dep && !cookbook_names.include?(@last_missing_dep) - return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}") + return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}") + elsif @last_constraint_failure + return raise RestErrorResponse.new(412, "Could not satisfy version constraints for: #{@last_constraint_failure}") else + return raise RestErrorResponse.new(412, "Unsolvable versions!") end end @@ -52,7 +55,12 @@ module ChefZero end def depsolve(request, unsolved, desired_versions, environment_constraints) - return nil if desired_versions.values.any? { |versions| versions.empty? } + desired_versions.each do |cb, ver| + if ver.empty? + @last_constraint_failure = cb + return nil + end + end # If everything is already solve_for = unsolved[0] -- cgit v1.2.1