diff options
| author | Tim Smith <tsmith@chef.io> | 2018-06-07 19:14:23 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-06-07 19:14:23 -0700 |
| commit | e3f7926802888836e2a926e55a7c9143d94b8bea (patch) | |
| tree | 5a3600b5c722420ce25b282bd0e946d1bbc1cc8b | |
| parent | 7124b8cf1ab63cef731b1943c6d8dad2fe131469 (diff) | |
| download | chef-e3f7926802888836e2a926e55a7c9143d94b8bea.tar.gz | |
Deprecated the Chef::Provider::Package::Freebsd::Pkg provider
FreeBSD 10 and later have pkgng and Chef will use that instead. This Oct even FreeBSD 10 goes fully EOL so we'll be supporting multiple EOL versions back come April. We should speed up this resource and simplify things by removing the unnecessary provider and the logic that decides which one to use.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/deprecated.rb | 10 | ||||
| -rw-r--r-- | lib/chef/resource/freebsd_package.rb | 2 | ||||
| -rw-r--r-- | spec/unit/resource/freebsd_package_spec.rb | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb index 792df69f71..904578ff0b 100644 --- a/lib/chef/deprecated.rb +++ b/lib/chef/deprecated.rb @@ -278,6 +278,16 @@ class Chef end end + class FreebsdPkgProvider < Base + def id + 23 + end + + def target + "freebsd_pkg_provider.html" + end + end + # id 3694 was deleted # Returned when using the deprecated option on a property diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb index d16355d027..234bbf8fd2 100644 --- a/lib/chef/resource/freebsd_package.rb +++ b/lib/chef/resource/freebsd_package.rb @@ -63,6 +63,8 @@ class Chef elsif supports_pkgng? Chef::Provider::Package::Freebsd::Pkgng else + Chef.deprecated(:freebsd_package_provider, "The freebsd_package provider for pkg (Chef::Provider::Package::Freebsd::Pkg) is deprecated and will be removed from Chef core in 15.0 (April 2019).") + Chef::Provider::Package::Freebsd::Pkg end end diff --git a/spec/unit/resource/freebsd_package_spec.rb b/spec/unit/resource/freebsd_package_spec.rb index b609284895..9747c41a88 100644 --- a/spec/unit/resource/freebsd_package_spec.rb +++ b/spec/unit/resource/freebsd_package_spec.rb @@ -93,6 +93,7 @@ describe Chef::Resource::FreebsdPackage do [1000016, 1000000, 901503, 902506, 802511].each do |freebsd_version| node.automatic_attrs[:os_version] = freebsd_version + expect(Chef).to receive(:deprecated).with(:freebsd_package_provider, kind_of(String)) resource.after_created expect(resource.provider).to eq(Chef::Provider::Package::Freebsd::Pkg) end |