diff options
author | John Keiser <jkeiser@opscode.com> | 2014-08-20 09:33:26 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-08-22 09:20:49 -0700 |
commit | cdf5a01eae674197132b644c9e0ee5fcea19d85e (patch) | |
tree | 4a8212458fae48db2c3d734fbc5b0e81f3057a67 | |
parent | 0bccfd74679ae382d04e319972353f9a692bbf30 (diff) | |
download | chef-zero-cdf5a01eae674197132b644c9e0ee5fcea19d85e.tar.gz |
Get container endpoints passing oc pedant
-rw-r--r-- | lib/chef_zero/data_normalizer.rb | 5 | ||||
-rw-r--r-- | lib/chef_zero/endpoints/container_endpoint.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/chef_zero/data_normalizer.rb b/lib/chef_zero/data_normalizer.rb index 89edfeb..f102946 100644 --- a/lib/chef_zero/data_normalizer.rb +++ b/lib/chef_zero/data_normalizer.rb @@ -26,8 +26,9 @@ module ChefZero end def self.normalize_container(container, name) - container['containername'] ||= name - container['containerpath'] ||= name + container.delete('id') + container['containername'] = name + container['containerpath'] = name container end diff --git a/lib/chef_zero/endpoints/container_endpoint.rb b/lib/chef_zero/endpoints/container_endpoint.rb index 685ddc6..edb6a7f 100644 --- a/lib/chef_zero/endpoints/container_endpoint.rb +++ b/lib/chef_zero/endpoints/container_endpoint.rb @@ -10,6 +10,8 @@ module ChefZero super(server, %w(id containername)) end + undef_method(:put) + def populate_defaults(request, response_json) container = JSON.parse(response_json, :create_additions => false) container = DataNormalizer.normalize_container(container, request.rest_path[3]) |