chef 18.5.0 → 18.6.2

data/lib/chef/providers.rb

@@ -74,7 +74,6 @@ require_relative "provider/package/cab"
 require_relative "provider/package/powershell"
 require_relative "provider/package/msu"
 require_relative "provider/package/snap"
-require_relative "provider/package/snap_tm"
 require_relative "provider/package/habitat"
 
 require_relative "provider/service/arch"

data/lib/chef/resource/alternatives.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class Alternatives < Chef::Resource
 
-      provides(:alternatives, target_mode: true) { true }
+      provides(:alternatives) { true }
 
       description "Use the **alternatives** resource to configure command alternatives in Linux using the alternatives or update-alternatives packages."
       introduced "16.0"
@@ -113,7 +113,7 @@ class Chef
 
         requirements.assert(:install, :set, :remove) do |a|
           a.assertion do
-            ::TargetIO::File.exist?(new_resource.path)
+            ::File.exist?(new_resource.path)
           end
 
           a.whyrun("Assuming file #{new_resource.path} already exists or was created already")

data/lib/chef/resource/apt_preference.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class AptPreference < Chef::Resource
 
-      provides(:apt_preference, target_mode: true) { true }
+      provides(:apt_preference) { true }
 
       description "Use the **apt_preference** resource to create APT [preference files](https://wiki.debian.org/AptPreferences). Preference files are used to control which package versions and sources are prioritized during installation."
       introduced "13.3"

data/lib/chef/resource/apt_repository.rb

@@ -17,6 +17,7 @@
 #
 
 require_relative "../resource"
+require_relative "../http/simple"
 require "tmpdir" unless defined?(Dir.mktmpdir)
 module Addressable
   autoload :URI, "addressable/uri"
@@ -26,7 +27,7 @@ class Chef
   class Resource
     class AptRepository < Chef::Resource
 
-      provides(:apt_repository, target_mode: true) { true }
+      provides(:apt_repository) { true }
 
       description "Use the **apt_repository** resource to specify additional APT repositories. Adding a new repository will update the APT package cache immediately."
       introduced "12.9"
@@ -98,6 +99,7 @@ class Chef
         ```
 
         **Add repository that needs custom options**:
+
         ```ruby
         apt_repository 'corretto' do
           uri          'https://apt.corretto.aws'
@@ -171,7 +173,7 @@ class Chef
         default: true, desired_state: false
 
       property :options, [String, Array],
-        description: "Additional options to set for the repository",
+        description: "Additional options to set for the repository.",
         default: [], coerce: proc { |x| Array(x) }
 
       default_action :add
@@ -287,8 +289,8 @@ class Chef
         def install_key_from_uri(key)
           key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
           cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name)
-          tmp_dir = TargetIO::Dir.mktmpdir(".gpg")
-          at_exit { TargetIO::FileUtils.remove_entry(tmp_dir) }
+          tmp_dir = Dir.mktmpdir(".gpg")
+          at_exit { FileUtils.remove_entry(tmp_dir) }
 
           declare_resource(key_type(key), cached_keyfile) do
             source key
@@ -358,7 +360,7 @@ class Chef
         # @return [void]
         def install_ppa_key(owner, repo)
           url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
-          key_id = TargetIO::HTTP.new(url).get("signing_key_fingerprint").delete('"')
+          key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
           install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
         rescue Net::HTTPClientException => e
           raise "Could not access Launchpad ppa API: #{e.message}"
@@ -432,7 +434,7 @@ class Chef
         # @return [void]
         def cleanup_legacy_file!
           legacy_path = "/etc/apt/sources.list.d/#{new_resource.name}.list"
-          if new_resource.name != new_resource.repo_name && ::TargetIO::File.exist?(legacy_path)
+          if new_resource.name != new_resource.repo_name && ::File.exist?(legacy_path)
             converge_by "Cleaning up legacy #{legacy_path} repo file" do
               file legacy_path do
                 action :delete
@@ -498,7 +500,7 @@ class Chef
         return unless debian?
 
         cleanup_legacy_file!
-        if ::TargetIO::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
+        if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
           converge_by "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/" do
             apt_update new_resource.name do
               ignore_failure true

data/lib/chef/resource/apt_update.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class AptUpdate < Chef::Resource
 
-      provides(:apt_update, target_mode: true) { true }
+      provides(:apt_update) { true }
 
       description "Use the **apt_update** resource to manage APT repository updates on Debian and Ubuntu platforms."
       introduced "12.7"
@@ -62,8 +62,8 @@ class Chef
         #
         # @return [Boolean]
         def apt_up_to_date?
-          ::TargetIO::File.exist?("#{STAMP_DIR}/update-success-stamp") &&
-            ::TargetIO::File.mtime("#{STAMP_DIR}/update-success-stamp") > Time.now - new_resource.frequency
+          ::File.exist?("#{STAMP_DIR}/update-success-stamp") &&
+            ::File.mtime("#{STAMP_DIR}/update-success-stamp") > Time.now - new_resource.frequency
         end
 
         def do_update

data/lib/chef/resource/bff_package.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class BffPackage < Chef::Resource::Package
 
-      provides :bff_package, target_mode: true
+      provides :bff_package
 
       description "Use the **bff_package** resource to manage packages for the AIX platform using the installp utility. When a package is installed from a local file, it must be added to the node using the **remote_file** or **cookbook_file** resources."
       introduced "12.0"

data/lib/chef/resource/chef_client_config.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class ChefClientConfig < Chef::Resource
 
-      provides :chef_client_config, target_mode: true
+      provides :chef_client_config
 
       description "Use the **chef_client_config** resource to create a client.rb file in the #{ChefUtils::Dist::Infra::PRODUCT} configuration directory. See the [client.rb docs](https://docs.chef.io/config_rb_client/) for more details on options available in the client.rb configuration file."
       introduced "16.6"
@@ -195,7 +195,8 @@ class Chef
 
       property :policy_persist_run_list, [true, false],
         description: "Override run lists defined in a Policyfile with the `run_list` defined on the #{ChefUtils::Dist::Server::PRODUCT}.",
-        introduced: "17.3"
+        introduced: "17.3",
+        default: false
 
       property :minimal_ohai, [true, false],
         description: "Run a minimal set of Ohai plugins providing data necessary for the execution of #{ChefUtils::Dist::Infra::PRODUCT}'s built-in resources. Setting this to true will skip many large and time consuming data sets such as `cloud` or `packages`. Setting this to true may break cookbooks that assume all Ohai data will be present.",

data/lib/chef/resource/chef_sleep.rb

@@ -20,7 +20,7 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefSleep < Chef::Resource
-      provides :chef_sleep, target_mode: true
+      provides :chef_sleep
 
       description "Use the **chef_sleep** resource to pause (sleep) for a number of seconds during a #{ChefUtils::Dist::Infra::PRODUCT} run. Only use this resource when a command or service exits successfully but is not ready for the next step in a recipe."
       introduced "15.5"

data/lib/chef/resource/cookbook_file.rb

@@ -28,7 +28,7 @@ class Chef
     class CookbookFile < Chef::Resource::File
       include Chef::Mixin::Securable
 
-      provides :cookbook_file, target_mode: true
+      provides :cookbook_file
 
       description "Use the **cookbook_file** resource to transfer files from a sub-directory of COOKBOOK_NAME/files/ to a specified path located on a host that is running the #{ChefUtils::Dist::Infra::PRODUCT}. The file is selected according to file specificity, which allows different source files to be used based on the hostname, host platform (operating system, distro, or as appropriate), or platform version. Files that are located in the COOKBOOK_NAME/files/default sub-directory may be used on any platform.\n\nDuring a #{ChefUtils::Dist::Infra::PRODUCT} run, the checksum for each local file is calculated and then compared against the checksum for the same file as it currently exists in the cookbook on the #{ChefUtils::Dist::Server::PRODUCT}. A file is not transferred when the checksums match. Only files that require an update are transferred from the #{ChefUtils::Dist::Server::PRODUCT} to a node."
 

data/lib/chef/resource/cron/cron.rb

@@ -28,7 +28,7 @@ class Chef
 
       use "cron_shared"
 
-      provides :cron, target_mode: true
+      provides :cron
 
       description "Use the **cron** resource to manage cron entries for time-based job scheduling. Properties for a schedule will default to * if not provided. The cron resource requires access to a crontab program, typically cron. Warning: The cron resource should only be used to modify an entry in a crontab file. The `cron_d` resource directly manages `cron.d` files. This resource ships in #{ChefUtils::Dist::Infra::PRODUCT} 14.4 or later and can also be found in the [cron](https://github.com/chef-cookbooks/cron) cookbook) for previous #{ChefUtils::Dist::Infra::PRODUCT} releases."
 

data/lib/chef/resource/cron/cron_d.rb

@@ -26,7 +26,7 @@ class Chef
 
       use "cron_shared"
 
-      provides :cron_d, target_mode: true
+      provides :cron_d
 
       introduced "14.4"
       description "Use the **cron_d** resource to manage cron job files in the `/etc/cron.d` directory. Warning: #{ChefUtils::Dist::Infra::PRODUCT} also ships with the **cron** resource for managing the monolithic `/etc/crontab` file on platforms that lack cron.d support. See the [cron resource](/resources/cron/) for information on using that resource."

data/lib/chef/resource/cron_access.rb

@@ -23,7 +23,7 @@ require_relative "../resource"
 class Chef
   class Resource
     class CronAccess < Chef::Resource
-      provides :cron_access, target_mode: true
+      provides :cron_access
       provides(:cron_manage) # legacy name @todo in Chef 15 we should { true } this so it wins over the cookbook
 
       introduced "14.4"

data/lib/chef/resource/directory.rb

@@ -25,7 +25,7 @@ class Chef
   class Resource
     class Directory < Chef::Resource
 
-      provides :directory, target_mode: true
+      provides :directory
 
       description "Use the **directory** resource to manage a directory, which is a hierarchy"\
                   " of folders that comprises all of the information stored on a computer."\

data/lib/chef/resource/dpkg_package.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class DpkgPackage < Chef::Resource::Package
 
-      provides :dpkg_package, target_mode: true
+      provides :dpkg_package
 
       description "Use the **dpkg_package** resource to manage packages for the dpkg platform. When a package is installed from a local file, it must be added to the node using the **remote_file** or **cookbook_file** resources."
 

data/lib/chef/resource/file/verification/json.rb

@@ -37,7 +37,7 @@ class Chef
           provides :json
 
           def verify(path, opts = {})
-            Chef::JSONCompat.parse(TargetIO::IO.read(path))
+            Chef::JSONCompat.parse(IO.read(path))
             true
           rescue Chef::Exceptions::JSON::ParseError => e
             Chef::Log.error("Json syntax verify failed with : #{e.message}")

data/lib/chef/resource/file/verification/systemd_unit.rb

@@ -49,7 +49,7 @@ class Chef
 
             Dir.mktmpdir("chef-systemd-unit") do |dir|
               temp = "#{dir}/#{::File.basename(@parent_resource.path)}"
-              ::TargetIO::FileUtils.cp(path, temp)
+              ::FileUtils.cp(path, temp)
               verify_command(temp, opts)
             end
           end

data/lib/chef/resource/file/verification/yaml.rb

@@ -39,7 +39,7 @@ class Chef
           provides :yaml
 
           def verify(path, opts = {})
-            Psych.parse(TargetIO::IO.read(path))
+            Psych.parse_file(path)
             true
           rescue Psych::SyntaxError => e
             Chef::Log.error("Yaml syntax verify failed with : #{e.message}")

data/lib/chef/resource/file.rb

@@ -29,7 +29,7 @@ class Chef
     class File < Chef::Resource
       include Chef::Mixin::Securable
 
-      provides :file, target_mode: true
+      provides :file
 
       description "Use the **file** resource to manage files directly on a node. Note: Use the **cookbook_file** resource to copy a file from a cookbook's `/files` directory. Use the **template** resource to create a file based on a template in a cookbook's `/templates` directory. And use the **remote_file** resource to transfer a file to a node from a remote location."
 

data/lib/chef/resource/freebsd_package.rb

@@ -25,8 +25,8 @@ require_relative "../provider/package/freebsd/pkgng"
 class Chef
   class Resource
     class FreebsdPackage < Chef::Resource::Package
-      provides :freebsd_package, target_mode: true
-      provides :package, platform: "freebsd", target_mode: true
+      provides :freebsd_package
+      provides :package, platform: "freebsd"
 
       description "Use the **freebsd_package** resource to manage packages for the FreeBSD platform."
 

data/lib/chef/resource/group.rb

@@ -48,7 +48,7 @@ class Chef
       ```
       EXAMPLES
 
-      provides :group, target_mode: true
+      provides :group
 
       allowed_actions :create, :remove, :modify, :manage
       default_action :create

data/lib/chef/resource/habitat/habitat_package.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class HabitatPackage < Chef::Resource::Package
 
-      provides :habitat_package, target_mode: true
+      provides :habitat_package
       use "habitat_shared"
       description "Use the **habitat_package** to install or remove Chef Habitat packages from Habitat Builder."
       introduced "17.3"

data/lib/chef/resource/habitat/habitat_sup.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class HabitatSup < Chef::Resource
 
-      provides(:habitat_sup, target_mode: true) do |_node|
+      provides :habitat_sup do |_node|
         false
       end
 
@@ -186,10 +186,10 @@ class Chef
         habitat_install new_resource.name do
           license new_resource.license
           hab_version new_resource.sup_version if new_resource.sup_version
-          not_if { ::TargetIO::File.exist?("/bin/hab") }
-          not_if { ::TargetIO::File.exist?("/usr/bin/hab") }
-          not_if { ::TargetIO::File.exist?("c:/habitat/hab.exe") }
-          not_if { ::TargetIO::File.exist?("c:/ProgramData/Habitat/hab.exe") }
+          not_if { ::File.exist?("/bin/hab") }
+          not_if { ::File.exist?("/usr/bin/hab") }
+          not_if { ::File.exist?("c:/habitat/hab.exe") }
+          not_if { ::File.exist?("c:/ProgramData/Habitat/hab.exe") }
         end
 
         habitat_package "core/hab-sup" do
@@ -205,7 +205,7 @@ class Chef
         if windows?
           directory "C:/hab/sup/default/config" do
             recursive true
-            only_if { ::TargetIO::Dir.exist?("C:/hab") }
+            only_if { ::Dir.exist?("C:/hab") }
             only_if { use_toml_config }
             action :create
           end
@@ -235,14 +235,14 @@ class Chef
               keep_latest_packages: new_resource.keep_latest
             )
             only_if { use_toml_config }
-            only_if { ::TargetIO::Dir.exist?("C:/hab/sup/default/config") }
+            only_if { ::Dir.exist?("C:/hab/sup/default/config") }
           end
         else
           directory "/hab/sup/default/config" do
             mode "0755"
             recursive true
             only_if { use_toml_config }
-            only_if { ::TargetIO::Dir.exist?("/hab") }
+            only_if { ::Dir.exist?("/hab") }
             action :create
           end
 
@@ -271,7 +271,7 @@ class Chef
               keep_latest_packages: new_resource.keep_latest
             )
             only_if { use_toml_config }
-            only_if { ::TargetIO::Dir.exist?("/hab/sup/default/config") }
+            only_if { ::Dir.exist?("/hab/sup/default/config") }
           end
         end
       end

data/lib/chef/resource/habitat/habitat_sup_systemd.rb

@@ -20,8 +20,8 @@ require_relative "habitat_sup"
 class Chef
   class Resource
     class HabitatSupSystemd < HabitatSup
-      provides :habitat_sup, os: "linux", target_mode: true
-      provides :habitat_sup_systemd, target_mode: true
+      provides :habitat_sup, os: "linux"
+      provides :habitat_sup_systemd
 
       action :run do
         super()

data/lib/chef/resource/habitat_install.rb

@@ -19,7 +19,7 @@ require_relative "../resource"
 class Chef
   class Resource
     class HabitatInstall < Chef::Resource
-      provides :habitat_install, target_mode: true
+      provides :habitat_install
 
       description "Use the **habitat_install** resource to install Chef Habitat."
       introduced "17.3"
@@ -70,7 +70,7 @@ class Chef
         description: "Specify the version of `Habitat` you would like to install."
 
       action :install, description: "Installs Habitat. Does nothing if the `hab` binary is found in the default location for the system (`/bin/hab` on Linux, `/usr/local/bin/hab` on macOS, `C:/habitat/hab.exe` on Windows)" do
-        if ::TargetIO::File.exist?(hab_path)
+        if ::File.exist?(hab_path)
           cmd = shell_out!([hab_path, "--version"].flatten.compact.join(" "))
           version = %r{hab (\d*\.\d*\.\d[^\/]*)}.match(cmd.stdout)[1]
           return if version == new_resource.hab_version
@@ -94,7 +94,7 @@ class Chef
             path habfile
             destination "#{Chef::Config[:file_cache_path]}/habitat"
             action :extract
-            not_if { ::TargetIO::Dir.exist?("c:\\habitat") }
+            not_if { ::Dir.exist?("c:\\habitat") }
           end
 
           directory "c:\\habitat" do

data/lib/chef/resource/homebrew_cask.rb

@@ -18,7 +18,7 @@
 #
 
 require_relative "../resource"
-require_relative "../mixin/homebrew_user"
+require_relative "../mixin/homebrew"
 
 class Chef
   class Resource
@@ -29,7 +29,7 @@ class Chef
       description "Use the **homebrew_cask** resource to install binaries distributed via the Homebrew package manager."
       introduced "14.0"
 
-      include Chef::Mixin::HomebrewUser
+      include Chef::Mixin::Homebrew
 
       property :cask_name, String,
         description: "An optional property to set the cask name if it differs from the resource block's name.",
@@ -40,10 +40,6 @@ class Chef
       property :options, String,
         description: "Options to pass to the brew command during installation."
 
-      property :install_cask, [TrueClass, FalseClass],
-        description: "Automatically install the Homebrew cask tap, if necessary.",
-        default: true
-
       property :homebrew_path, String,
         description: "The path to the Homebrew binary."
 
@@ -53,37 +49,27 @@ class Chef
         default_description: "Calculated default username"\
 
       action :install, description: "Install an application that is packaged as a Homebrew cask." do
-        if new_resource.install_cask
-          homebrew_tap "homebrew/cask" do
-            homebrew_path homebrew_bin_path(new_resource.homebrew_path)
-            owner new_resource.owner
-          end
-        end
-
         unless casked?
           converge_by("install cask #{new_resource.cask_name} #{new_resource.options}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} install --cask #{new_resource.cask_name} #{new_resource.options}",
-              user: new_resource.owner,
-              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-              cwd: ::Dir.home(new_resource.owner))
+            execute "install cask #{new_resource.cask_name}" do
+              command "#{homebrew_bin_path(new_resource.homebrew_path)} install --cask #{new_resource.cask_name} #{new_resource.options}"
+              user new_resource.owner
+              cwd ::Dir.home(new_resource.owner)
+              login true
+            end
           end
         end
       end
 
       action :remove, description: "Remove an application that is packaged as a Homebrew cask." do
-        if new_resource.install_cask
-          homebrew_tap "homebrew/cask" do
-            homebrew_path homebrew_bin_path(new_resource.homebrew_path)
-            owner new_resource.owner
-          end
-        end
-
         if casked?
           converge_by("uninstall cask #{new_resource.cask_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} uninstall --cask #{new_resource.cask_name}",
-              user: new_resource.owner,
-              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-              cwd: ::Dir.home(new_resource.owner))
+            execute "uninstall cask #{new_resource.cask_name}" do
+              command "#{homebrew_bin_path(new_resource.homebrew_path)} uninstall --cask #{new_resource.cask_name}"
+              user new_resource.owner
+              cwd ::Dir.home(new_resource.owner)
+              login true
+            end
           end
         end
       end
@@ -98,10 +84,13 @@ class Chef
         # @return [Boolean]
         def casked?
           unscoped_name = new_resource.cask_name.split("/").last
-          shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} list --cask 2>/dev/null",
+          shell_out!(
+            "#{homebrew_bin_path(new_resource.homebrew_path)} list --cask 2>/dev/null",
             user: new_resource.owner,
             env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-            cwd: ::Dir.home(new_resource.owner)).stdout.split.include?(unscoped_name)
+            cwd: ::Dir.home(new_resource.owner),
+            login: true
+          ).stdout.split.include?(unscoped_name)
         end
       end
     end

data/lib/chef/resource/homebrew_tap.rb

@@ -18,7 +18,7 @@
 #
 
 require_relative "../resource"
-require_relative "../mixin/homebrew_user"
+require_relative "../mixin/homebrew"
 
 class Chef
   class Resource
@@ -29,7 +29,7 @@ class Chef
       description "Use the **homebrew_tap** resource to add additional formula repositories to the Homebrew package manager."
       introduced "14.0"
 
-      include Chef::Mixin::HomebrewUser
+      include Chef::Mixin::Homebrew
 
       property :tap_name, String,
         description: "An optional property to set the tap name if it differs from the resource block's name.",
@@ -51,10 +51,13 @@ class Chef
       action :tap, description: "Add a Homebrew tap." do
         unless tapped?(new_resource.tap_name)
           converge_by("tap #{new_resource.tap_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} tap #{new_resource.tap_name} #{new_resource.url || ""}",
-              user: new_resource.owner,
-              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-              cwd: ::Dir.home(new_resource.owner))
+            execute "tap #{new_resource.tap_name}" do
+              command "#{homebrew_bin_path(new_resource.homebrew_path)} tap #{new_resource.tap_name} #{new_resource.url || ""}"
+              user new_resource.owner
+              default_env true
+              cwd ::Dir.home(new_resource.owner)
+              login true
+            end
           end
         end
       end
@@ -62,21 +65,33 @@ class Chef
       action :untap, description: "Remove a Homebrew tap." do
         if tapped?(new_resource.tap_name)
           converge_by("untap #{new_resource.tap_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} untap #{new_resource.tap_name}",
-              user: new_resource.owner,
-              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-              cwd: ::Dir.home(new_resource.owner))
+            execute "untap #{new_resource.tap_name}" do
+              command "#{homebrew_bin_path(new_resource.homebrew_path)} untap #{new_resource.tap_name}"
+              user new_resource.owner
+              default_env true
+              cwd ::Dir.home(new_resource.owner)
+              login true
+            end
           end
         end
       end
 
-      # Is the passed tap already tapped
-      #
-      # @return [Boolean]
-      def tapped?(name)
-        base_path = ["#{::File.dirname(which("brew"))}/../homebrew", "#{::File.dirname(which("brew"))}/../Homebrew", "/opt/homebrew", "/usr/local/Homebrew", "/home/linuxbrew/.linuxbrew"].uniq.select { |x| Dir.exist?(x) }.first
-        tap_dir = name.gsub("/", "/homebrew-")
-        ::File.directory?("#{base_path}/Library/Taps/#{tap_dir}")
+      action_class do
+        # Is the passed tap already tapped
+        #
+        # @return [Boolean]
+        def tapped?(name)
+          brew_path = ::File.dirname(homebrew_bin_path(new_resource.homebrew_path))
+          base_path = [
+            "#{brew_path}/../homebrew",
+            "#{brew_path}/../Homebrew",
+            "/opt/homebrew",
+            "/usr/local/Homebrew",
+            "/home/linuxbrew/.linuxbrew",
+          ].filter_map { |x| x if Dir.exist?(x) }.first
+          tap_dir = name.gsub("/", "/homebrew-")
+          ::File.directory?("#{base_path}/Library/Taps/#{tap_dir}")
+        end
       end
     end
   end

data/lib/chef/resource/homebrew_update.rb

@@ -19,13 +19,13 @@
 #
 
 require_relative "../resource"
-require_relative "../mixin/homebrew_user"
+require_relative "../mixin/homebrew"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Resource
     class HomebrewUpdate < Chef::Resource
-      include Chef::Mixin::HomebrewUser
+      include Chef::Mixin::Homebrew
 
       provides(:homebrew_update) { true }
 
@@ -78,9 +78,9 @@ class Chef
           end
 
           execute "brew update" do
-            command %w{brew update}
-            default_env true
+            command "#{homebrew_bin_path} update"
             user find_homebrew_uid
+            login true
             notifies :touch, "file[#{BREW_STAMP}]", :immediately
           end
         end