summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvijaymmali1990 <vijay.mali@msystechnologies.com>2018-12-21 12:35:37 +0530
committerVijay Mali <vijay.mali@msystechnologies.com>2019-04-17 14:46:24 +0530
commite1650f0c968a88f1c936400c4792624ecd878984 (patch)
treeafa84cdf2cd9b2dc4803370c0d5d758ba7e5ba4b
parent0c2be39a02445ae1c0acbe1a22cd6a2c101ba385 (diff)
downloadchef-e1650f0c968a88f1c936400c4792624ecd878984.tar.gz
Allowing encryption of an unencrypted data bag
Signed-off-by: vijaymmali1990 <vijay.mali@msystechnologies.com>
-rw-r--r--lib/chef/knife/data_bag_edit.rb2
-rw-r--r--spec/unit/knife/data_bag_edit_spec.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb
index 5d76762058..6c7f73ad6c 100644
--- a/lib/chef/knife/data_bag_edit.rb
+++ b/lib/chef/knife/data_bag_edit.rb
@@ -43,7 +43,7 @@ class Chef
exit(1)
end
else
- return item, false
+ return item.raw_data, false
end
end
diff --git a/spec/unit/knife/data_bag_edit_spec.rb b/spec/unit/knife/data_bag_edit_spec.rb
index ff131a7d91..4d7ce68aa2 100644
--- a/spec/unit/knife/data_bag_edit_spec.rb
+++ b/spec/unit/knife/data_bag_edit_spec.rb
@@ -49,8 +49,7 @@ describe Chef::Knife::DataBagEdit do
let(:is_encrypted?) { false }
let(:transmitted_hash) { raw_edited_hash }
- let(:data_to_edit) { db }
-
+ let(:data_to_edit) { db.raw_data }
shared_examples_for "editing a data bag" do
it "correctly edits then uploads the data bag" do
expect(Chef::DataBagItem).to receive(:load).with(bag_name, item_name).and_return(db)