summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-05-29 13:31:43 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-05-29 13:31:43 -0700
commit7b436722e4a49849654ea24a501fc904b4aa208d (patch)
tree81901df98b6d68de4bd8702921dd13178b4b3ee9
parent82a64b9d545d53ab9aa55cc12ef80105d96e766e (diff)
downloadchef-zero-7b436722e4a49849654ea24a501fc904b4aa208d.tar.gz
Return minimal version of cookbook from depsolver
-rw-r--r--lib/chef_zero/data_normalizer.rb4
-rw-r--r--lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/chef_zero/data_normalizer.rb b/lib/chef_zero/data_normalizer.rb
index 79e94bd..e0d17c6 100644
--- a/lib/chef_zero/data_normalizer.rb
+++ b/lib/chef_zero/data_normalizer.rb
@@ -89,6 +89,10 @@ module ChefZero
end
cookbook['json_class'] ||= 'Chef::CookbookVersion'
cookbook['chef_type'] ||= 'cookbook_version'
+ if method == 'MIN'
+ cookbook['metadata'].delete('attributes')
+ cookbook['metadata'].delete('long_description')
+ end
cookbook
end
diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
index 190fd11..e7c83a1 100644
--- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
@@ -41,7 +41,7 @@ module ChefZero
result = {}
solved.each_pair do |name, versions|
cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
- result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'GET')
+ result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'MIN')
end
json_response(200, result)
end