Merge branch 'master' into frozen

9 files changed, 34 insertions, 20 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fedff4653..80f92aa900 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.19 -->
-## [v16.7.19](https://github.com/chef/chef/tree/v16.7.19) (2020-10-31)
+<!-- latest_release 16.7.20 -->
+## [v16.7.20](https://github.com/chef/chef/tree/v16.7.20) (2020-11-02)
 
 #### Merged Pull Requests
-- Update ohai to 16.7.9 and rspec to 3.10 [#10587](https://github.com/chef/chef/pull/10587) ([tas50](https://github.com/tas50))
+- Fix homebrew_update [#10586](https://github.com/chef/chef/pull/10586) ([phiggins](https://github.com/phiggins))
 <!-- latest_release -->
 
 <!-- release_rollup since=16.6.14 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Fix homebrew_update [#10586](https://github.com/chef/chef/pull/10586) ([phiggins](https://github.com/phiggins)) <!-- 16.7.20 -->
 - Update ohai to 16.7.9 and rspec to 3.10 [#10587](https://github.com/chef/chef/pull/10587) ([tas50](https://github.com/tas50)) <!-- 16.7.19 -->
 - Improve Windows resource performance by converting powershell_out usage to powershell_exec [#10545](https://github.com/chef/chef/pull/10545) ([mwrock](https://github.com/mwrock)) <!-- 16.7.18 -->
 - Simplify regexes by removing extra character classes [#10584](https://github.com/chef/chef/pull/10584) ([tas50](https://github.com/tas50)) <!-- 16.7.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2dfe987943..05f6fc41b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (16.7.19)
+    chef (16.7.20)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.7.19)
-      chef-utils (= 16.7.19)
+      chef-config (= 16.7.20)
+      chef-utils (= 16.7.20)
       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.19-universal-mingw32)
+    chef (16.7.20-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.7.19)
-      chef-utils (= 16.7.19)
+      chef-config (= 16.7.20)
+      chef-utils (= 16.7.20)
       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.19)
-      chef (= 16.7.19)
+    chef-bin (16.7.20)
+      chef (= 16.7.20)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (16.7.19)
+    chef-config (16.7.20)
       addressable
-      chef-utils (= 16.7.19)
+      chef-utils (= 16.7.20)
       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.19)
+    chef-utils (16.7.20)
 
 GEM
   remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 98563181ee..fff22ebaab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.19
\ No newline at end of file
+16.7.20
\ 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 13b3fd6767..60b8dc0b6b 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.19".freeze
+  VERSION = "16.7.20".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index e58973b491..718ef3cdad 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.19".freeze
+  VERSION = "16.7.20".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 6ecd191413..8d6fb201f8 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.19"
+  VERSION = "16.7.20"
 end
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
index ff68021a81..876fac6bde 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
@@ -73,6 +73,16 @@ launchd "io.chef.testing.fake" do
   action "enable"
 end
 
+homebrew_update "update" do
+  action :update
+end
+
+homebrew_package "vim"
+
+homebrew_package "vim" do
+  action :purge
+end
+
 include_recipe "::_dmg_package"
 include_recipe "::_macos_userdefaults"
 include_recipe "::_ohai_hint"
diff --git a/lib/chef/resource/homebrew_update.rb b/lib/chef/resource/homebrew_update.rb
index cc191cbbdb..27b352bfb6 100644
--- a/lib/chef/resource/homebrew_update.rb
+++ b/lib/chef/resource/homebrew_update.rb
@@ -19,11 +19,14 @@
 #
 
 require_relative "../resource"
+require_relative "../mixin/homebrew_user"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Resource
     class HomebrewUpdate < Chef::Resource
+      include Chef::Mixin::HomebrewUser
+
       unified_mode true
 
       provides(:homebrew_update) { true }
@@ -79,7 +82,7 @@ class Chef
           execute "brew update" do
             command %w{brew update}
             default_env true
-            user Homebrew.owner
+            user find_homebrew_uid
             notifies :touch, "file[#{BREW_STAMP}]", :immediately
           end
         end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0f133f6199..25b739662d 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.19")
+  VERSION = Chef::VersionString.new("16.7.20")
 end
 
 #