From 84bac2ab984243b81961f8a18b6db28aad4e150f Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 26 Sep 2014 17:31:25 -0700 Subject: [PATCH] Issue #93 --- libraries/chef_nexus.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/chef_nexus.rb b/libraries/chef_nexus.rb index 76e554c..2128d15 100644 --- a/libraries/chef_nexus.rb +++ b/libraries/chef_nexus.rb @@ -213,7 +213,12 @@ def encrypted_data_bag_for(node, data_bag) def encrypted_data_bag_item(node, data_bag, data_bag_item) if node[:nexus][:use_chef_vault] - item = ChefVault::Item.load(data_bag, data_bag_item) + begin + item = ChefVault::Item.load(data_bag, data_bag_item) + # if you are using vault and if data bag it not present we need to handle that exception as well + rescue ChefVault::Exceptions::KeysNotFound + return nil + end else item = Chef::EncryptedDataBagItem.load(data_bag, data_bag_item) end @@ -226,10 +231,6 @@ def encrypted_data_bag_item(node, data_bag, data_bag_item) # Adding a different rescue block if things exception needs to be handled differently rescue Chef::Exceptions::ValidationFailed => e nil - - # if you are using vault and if data bag it not present we need to handle that exception as well - rescue ChefVault::Exceptions::KeysNotFound - nil end end end