summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/client.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/client_spec.rb16
9 files changed, 37 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ad08f923f..3967a96e28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.7.30 -->
-## [v16.7.30](https://github.com/chef/chef/tree/v16.7.30) (2020-11-09)
+<!-- latest_release 16.7.31 -->
+## [v16.7.31](https://github.com/chef/chef/tree/v16.7.31) (2020-11-10)
#### Merged Pull Requests
-- Don&#39;t uses regexes in splits when we don&#39;t need to [#10610](https://github.com/chef/chef/pull/10610) ([tas50](https://github.com/tas50))
+- Added deprecation warning for enforce_path_sanity [#10613](https://github.com/chef/chef/pull/10613) ([kapilchouhan99](https://github.com/kapilchouhan99))
<!-- latest_release -->
<!-- release_rollup since=16.6.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Added deprecation warning for enforce_path_sanity [#10613](https://github.com/chef/chef/pull/10613) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 16.7.31 -->
- Don&#39;t uses regexes in splits when we don&#39;t need to [#10610](https://github.com/chef/chef/pull/10610) ([tas50](https://github.com/tas50)) <!-- 16.7.30 -->
- Use ||= where we can [#10609](https://github.com/chef/chef/pull/10609) ([tas50](https://github.com/tas50)) <!-- 16.7.29 -->
- Collapse more duplicate branches [#10605](https://github.com/chef/chef/pull/10605) ([tas50](https://github.com/tas50)) <!-- 16.7.28 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0991815232..ba0030fda5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.7.30)
+ chef (16.7.31)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.30)
- chef-utils (= 16.7.30)
+ chef-config (= 16.7.31)
+ chef-utils (= 16.7.31)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -64,12 +64,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.7.30-universal-mingw32)
+ chef (16.7.31-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.30)
- chef-utils (= 16.7.30)
+ chef-config (= 16.7.31)
+ chef-utils (= 16.7.31)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -115,15 +115,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.7.30)
- chef (= 16.7.30)
+ chef-bin (16.7.31)
+ chef (= 16.7.31)
PATH
remote: chef-config
specs:
- chef-config (16.7.30)
+ chef-config (16.7.31)
addressable
- chef-utils (= 16.7.30)
+ chef-utils (= 16.7.31)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -132,7 +132,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.7.30)
+ chef-utils (16.7.31)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index c3265b4312..95f2f27ebe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.30 \ No newline at end of file
+16.7.31 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index c77ef5117c..6456d4bd05 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.30".freeze
+ VERSION = "16.7.31".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 70b27db2a9..3fa9b88b86 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.30".freeze
+ VERSION = "16.7.31".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 0d05acdc44..ed88156264 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.30"
+ VERSION = "16.7.31"
end
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 41e3846812..099c061a96 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -243,12 +243,12 @@ class Chef
run_status.run_context = run_context
events.run_start(Chef::VERSION, run_status)
-
logger.info("*** #{ChefUtils::Dist::Infra::PRODUCT} #{Chef::VERSION} ***")
logger.info("Platform: #{RUBY_PLATFORM}")
logger.info "#{ChefUtils::Dist::Infra::CLIENT.capitalize} pid: #{Process.pid}"
logger.info "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
logger.debug("#{ChefUtils::Dist::Infra::CLIENT.capitalize} request_id: #{request_id}")
+ logger.warn("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!") if Chef::Config[:enforce_path_sanity]
ENV["PATH"] = ChefUtils::DSL::DefaultPaths.default_paths if Chef::Config[:enforce_default_paths] || Chef::Config[:enforce_path_sanity]
run_ohai
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 072938f9af..488fb6496e 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("16.7.30")
+ VERSION = Chef::VersionString.new("16.7.31")
end
#
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 34c0a2c548..377a0b8f05 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -801,4 +801,20 @@ describe Chef::Client do
allow_any_instance_of(Chef::RunLock).to receive(:save_pid).and_raise(NoMethodError)
end
end
+
+ describe "deprecated enforce_path_sanity" do
+ include_context "a client run"
+ include_context "converge completed"
+
+ it "print a warning, when enforce_path_sanity is passed" do
+ Chef::Config[:enforce_path_sanity] = true
+ expect(logger).to receive(:warn).with("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!")
+ client.run
+ end
+
+ it "should not print a warning, when enforce_path_sanity is not passed" do
+ expect(logger).not_to receive(:warn).with("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!")
+ client.run
+ end
+ end
end
View Lorry Controller Status