diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-23 10:36:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 10:36:24 -0700 |
| commit | fc769a2347f21f1462ebfe7074eb36711730e487 (patch) | |
| tree | a9b485c7423b54eadd09b5014311a2ebd48d756d | |
| parent | b4302840bb5f99ed26a6266e9a03c8169e09f0b0 (diff) | |
| parent | d073e776b741140642525c78f91a38b30c99ecee (diff) | |
| download | chef-fc769a2347f21f1462ebfe7074eb36711730e487.tar.gz | |
Merge pull request #10040 from chef/databag_path_15
knife vault on windows 10 fails due to ERROR: Chef::Exceptions::InvalidDataBagPath
| -rw-r--r-- | lib/chef/data_bag.rb | 4 | ||||
| -rw-r--r-- | spec/unit/data_bag_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/data_bag.rb b/lib/chef/data_bag.rb index d64d610fd9..5715f1970d 100644 --- a/lib/chef/data_bag.rb +++ b/lib/chef/data_bag.rb @@ -94,7 +94,7 @@ class Chef names = [] paths.each do |path| unless File.directory?(path) - raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' is invalid" + raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory." end names += Dir.glob(File.join( @@ -122,7 +122,7 @@ class Chef data_bag = {} paths.each do |path| unless File.directory?(path) - raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' is invalid" + raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory." end Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path, name.to_s), "*.json")).inject({}) do |bag, f| diff --git a/spec/unit/data_bag_spec.rb b/spec/unit/data_bag_spec.rb index 6089b4b85d..7e5ef46d58 100644 --- a/spec/unit/data_bag_spec.rb +++ b/spec/unit/data_bag_spec.rb @@ -243,7 +243,7 @@ describe Chef::DataBag do expect do Chef::DataBag.load("foo") - end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' is invalid" + end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' not found. Please create this directory." end end |