From 73510d27e6286a89dc6818161d57292731162eef Mon Sep 17 00:00:00 2001 From: Thom May Date: Tue, 18 Oct 2016 13:36:22 +0100 Subject: Return a raw hash when creating objects Fixes chef/chef-vault#215 Signed-off-by: Thom May --- lib/chef/knife.rb | 6 +++++- spec/integration/knife/data_bag_create_spec.rb | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 0dbd02ceb4..7b7e2711f8 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -525,7 +525,11 @@ class Chef # FIXME: yard with @yield def create_object(object, pretty_name = nil, object_class: nil) - output = edit_data(object, object_class: object_class) + output = if object_class + edit_data(object, object_class: object_class) + else + edit_hash(object) + end if Kernel.block_given? output = yield(output) diff --git a/spec/integration/knife/data_bag_create_spec.rb b/spec/integration/knife/data_bag_create_spec.rb index 0a07792dbc..dc61d55fd5 100644 --- a/spec/integration/knife/data_bag_create_spec.rb +++ b/spec/integration/knife/data_bag_create_spec.rb @@ -34,12 +34,10 @@ describe "knife data bag create", :workstation do end it "creates a new data bag and item" do - pending "Deprecation warning must get fixed" knife("data bag create foo bar").should_succeed stdout: out, stderr: err end it "adds a new item to an existing bag" do - pending "Deprecation warning must get fixed" knife("data bag create foo").should_succeed stderr: err knife("data bag create foo bar").should_succeed stdout: out, stderr: exists end @@ -50,7 +48,6 @@ describe "knife data bag create", :workstation do end it "fails to add an existing item" do - pending "Deprecation warning must get fixed" knife("data bag create foo bar").should_succeed stdout: out, stderr: err expect { knife("data bag create foo bar") }.to raise_error(Net::HTTPServerException) end -- cgit v1.2.1