summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-08-03 21:38:54 -0700
committerGitHub <noreply@github.com>2020-08-03 21:38:54 -0700
commit9a8c48e4a4ce169e824211ba797a77c21eae1704 (patch)
tree6167237f4e5ec4c84758f7fefd1286cf02795d79
parentb390d87f3710afb466ce7a80510af0bebb64052f (diff)
parentc965d25dd22f2b13f51be79fd0c8c3767b4b4da6 (diff)
downloadchef-9a8c48e4a4ce169e824211ba797a77c21eae1704.tar.gz
Merge pull request #10256 from chef/shell_out
Remove unnecessary Mixin::ShellOut in providers
-rw-r--r--lib/chef/provider/cron/unix.rb2
-rw-r--r--lib/chef/provider/group.rb2
-rw-r--r--lib/chef/provider/ifconfig.rb3
-rw-r--r--lib/chef/provider/mount.rb2
-rw-r--r--lib/chef/provider/package.rb2
-rw-r--r--lib/chef/provider/service/openbsd.rb3
-rw-r--r--lib/chef/provider/systemd_unit.rb2
-rw-r--r--lib/chef/provider/windows_task.rb3
8 files changed, 0 insertions, 19 deletions
diff --git a/lib/chef/provider/cron/unix.rb b/lib/chef/provider/cron/unix.rb
index f807ede3bb..cb3a2f9a61 100644
--- a/lib/chef/provider/cron/unix.rb
+++ b/lib/chef/provider/cron/unix.rb
@@ -26,8 +26,6 @@ class Chef
class Provider
class Cron
class Unix < Chef::Provider::Cron
- include Chef::Mixin::ShellOut
-
provides :cron, os: "solaris2"
private
diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb
index bfbffe9139..905a22dc33 100644
--- a/lib/chef/provider/group.rb
+++ b/lib/chef/provider/group.rb
@@ -17,13 +17,11 @@
#
require_relative "../provider"
-require_relative "../mixin/shell_out"
require "etc" unless defined?(Etc)
class Chef
class Provider
class Group < Chef::Provider
- include Chef::Mixin::ShellOut
attr_accessor :group_exists
attr_accessor :change_desc
diff --git a/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb
index cfabe292f9..f8d84507a3 100644
--- a/lib/chef/provider/ifconfig.rb
+++ b/lib/chef/provider/ifconfig.rb
@@ -17,7 +17,6 @@
#
require_relative "../log"
-require_relative "../mixin/shell_out"
require_relative "../provider"
require_relative "../resource/file"
require_relative "../exceptions"
@@ -34,8 +33,6 @@ class Chef
class Ifconfig < Chef::Provider
provides :ifconfig
- include Chef::Mixin::ShellOut
-
attr_accessor :config_template
attr_accessor :config_path
diff --git a/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb
index 6c8e500e36..013b8a67b3 100644
--- a/lib/chef/provider/mount.rb
+++ b/lib/chef/provider/mount.rb
@@ -18,13 +18,11 @@
#
require_relative "../log"
-require_relative "../mixin/shell_out"
require_relative "../provider"
class Chef
class Provider
class Mount < Chef::Provider
- include Chef::Mixin::ShellOut
attr_accessor :unmount_retries
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 41146d581d..8ace5e033b 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -16,7 +16,6 @@
# limitations under the License.
#
-require_relative "../mixin/shell_out"
require_relative "../mixin/subclass_directive"
require_relative "../log"
require_relative "../file_cache"
@@ -27,7 +26,6 @@ require "shellwords" unless defined?(Shellwords)
class Chef
class Provider
class Package < Chef::Provider
- include Chef::Mixin::ShellOut
extend Chef::Mixin::SubclassDirective
# subclasses declare this if they want all their arguments as arrays of packages and names
diff --git a/lib/chef/provider/service/openbsd.rb b/lib/chef/provider/service/openbsd.rb
index fe42e2133c..99e8cff6aa 100644
--- a/lib/chef/provider/service/openbsd.rb
+++ b/lib/chef/provider/service/openbsd.rb
@@ -16,7 +16,6 @@
# limitations under the License.
#
-require_relative "../../mixin/shell_out"
require_relative "init"
require_relative "../../resource/service"
@@ -27,8 +26,6 @@ class Chef
provides :service, os: "openbsd"
- include Chef::Mixin::ShellOut
-
attr_reader :init_command, :rc_conf, :rc_conf_local, :enabled_state_found
RC_CONF_PATH = "/etc/rc.conf".freeze
diff --git a/lib/chef/provider/systemd_unit.rb b/lib/chef/provider/systemd_unit.rb
index 39876f7a3f..97043e48c7 100644
--- a/lib/chef/provider/systemd_unit.rb
+++ b/lib/chef/provider/systemd_unit.rb
@@ -18,7 +18,6 @@
require_relative "../provider"
require_relative "../mixin/which"
-require_relative "../mixin/shell_out"
require_relative "../resource/file"
require_relative "../resource/file/verification/systemd_unit"
require "iniparse"
@@ -28,7 +27,6 @@ class Chef
class Provider
class SystemdUnit < Chef::Provider
include Chef::Mixin::Which
- include Chef::Mixin::ShellOut
provides :systemd_unit
diff --git a/lib/chef/provider/windows_task.rb b/lib/chef/provider/windows_task.rb
index 63a7b331e1..c402818321 100644
--- a/lib/chef/provider/windows_task.rb
+++ b/lib/chef/provider/windows_task.rb
@@ -16,7 +16,6 @@
# limitations under the License.
#
-require_relative "../mixin/shell_out"
require "rexml/document" unless defined?(REXML::Document)
require "iso8601" if ChefUtils.windows?
require_relative "../provider"
@@ -26,8 +25,6 @@ require "win32/taskscheduler" if ChefUtils.windows?
class Chef
class Provider
class WindowsTask < Chef::Provider
- include Chef::Mixin::ShellOut
-
if ChefUtils.windows?
include Win32