diff options
| author | Marc A. Paradise <marc.paradise@gmail.com> | 2021-06-02 09:44:43 -0400 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2021-06-14 19:01:12 -0700 |
| commit | 5f424ecabc54fc30932e7d37de9bf333be4993e9 (patch) | |
| tree | 2d7b0afde543ece091fb2b71dd7756c375f40b1d | |
| parent | f34a99297a88dc8cd650ffecc646825ee8f5ba94 (diff) | |
| download | chef-5f424ecabc54fc30932e7d37de9bf333be4993e9.tar.gz | |
Do not show blacklist deprecation for whitelist
This adds a new AttributeWhitelistConfiguration deprecation
so that we don't report use of whitelist as blacklist.
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
| -rw-r--r-- | lib/chef/deprecated.rb | 4 | ||||
| -rw-r--r-- | lib/chef/node.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb index c48566e7e4..ae205497c4 100644 --- a/lib/chef/deprecated.rb +++ b/lib/chef/deprecated.rb @@ -253,6 +253,10 @@ class Chef target 33 end + class AttributeWhitelistConfiguration < Base + target 34 + end + class Generic < Base def url "https://docs.chef.io/chef_deprecations_client/" diff --git a/lib/chef/node.rb b/lib/chef/node.rb index 50a861066b..6d18baee9c 100644 --- a/lib/chef/node.rb +++ b/lib/chef/node.rb @@ -712,7 +712,7 @@ class Chef # @param [String] level the attribute level def allowlist_or_whitelist_config(level) if Chef::Config["#{level}_attribute_whitelist".to_sym] - Chef.deprecated(:attribute_blacklist_configuration, "Attribute whitelist configurations have been deprecated. Use the allowed_LEVEL_attribute configs instead") + Chef.deprecated(:attribute_whitelist_configuration, "Attribute whitelist configurations have been deprecated. Use the allowed_LEVEL_attribute configs instead") Chef::Config["#{level}_attribute_whitelist".to_sym] else Chef::Config["allowed_#{level}_attributes".to_sym] |