Merge branch 'master' into ps/windows_firewall_rule-rework

37 files changed, 141 insertions, 121 deletions

diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 0aaaa6eace..470a5c0f63 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -25,8 +25,6 @@ builder-to-testers-map:
     - el-7-ppc64
   el-7-ppc64le:
     - el-7-ppc64le
-  el-7-s390x:
-    - el-7-s390x
   el-7-x86_64:
     - el-7-x86_64
     - el-8-x86_64
@@ -37,8 +35,6 @@ builder-to-testers-map:
     - mac_os_x-10.13-x86_64
     - mac_os_x-10.14-x86_64
     - mac_os_x-10.15-x86_64
-  sles-12-s390x:
-    - sles-12-s390x
   sles-12-x86_64:
     - sles-12-x86_64
     - sles-15-x86_64
@@ -49,7 +45,7 @@ builder-to-testers-map:
   ubuntu-16.04-x86_64:
     - ubuntu-16.04-x86_64
     - ubuntu-18.04-x86_64
-    - ubuntu-20.04-x86_64
+#    - ubuntu-20.04-x86_64 # waiting on AMI update
   windows-2012r2-i386:
     - windows-2012r2-i386
   windows-2012r2-x86_64:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836463ed8b..0abe8f1062 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,20 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.0.171 -->
-## [v16.0.171](https://github.com/chef/chef/tree/v16.0.171) (2020-04-01)
+<!-- latest_release 16.0.176 -->
+## [v16.0.176](https://github.com/chef/chef/tree/v16.0.176) (2020-04-02)
 
 #### Merged Pull Requests
-- Add Windows 10 Tester [#9564](https://github.com/chef/chef/pull/9564) ([tas50](https://github.com/tas50))
+- Convert more resources to unified_mode [#9570](https://github.com/chef/chef/pull/9570) ([lamont-granquist](https://github.com/lamont-granquist))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.6.10 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Convert more resources to unified_mode [#9570](https://github.com/chef/chef/pull/9570) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.0.176 -->
+- Update Nokogiri to 1.11.0.rc2 [#9572](https://github.com/chef/chef/pull/9572) ([tas50](https://github.com/tas50)) <!-- 16.0.175 -->
+- Update Ruby to 2.7.1 / bundler to 2.1.4 [#9569](https://github.com/chef/chef/pull/9569) ([tas50](https://github.com/tas50)) <!-- 16.0.174 -->
+- Stop building S390x packages [#9568](https://github.com/chef/chef/pull/9568) ([tas50](https://github.com/tas50)) <!-- 16.0.173 -->
+- Make the hab version check a full version check not just minor release [#9565](https://github.com/chef/chef/pull/9565) ([TheLunaticScripter](https://github.com/TheLunaticScripter)) <!-- 16.0.172 -->
 - Add Windows 10 Tester [#9564](https://github.com/chef/chef/pull/9564) ([tas50](https://github.com/tas50)) <!-- 16.0.171 -->
 - Fix functional tests on Windows 10 by matching less [#9563](https://github.com/chef/chef/pull/9563) ([btm](https://github.com/btm)) <!-- 16.0.170 -->
 - Fix cloud? helper to only report true on cloud instances [#9553](https://github.com/chef/chef/pull/9553) ([tas50](https://github.com/tas50)) <!-- 16.0.169 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 32a90151c7..aeb3c2d283 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: ebbcec68f08a048406764ceae8d2ac33a33507af
+  revision: d0e353d4415834d58aa267f8bc6d5c4ce8d95652
   branch: master
   specs:
-    chefstyle (0.15.1)
-      rubocop (= 0.80.1)
+    chefstyle (1.0.0)
+      rubocop (= 0.81.0)
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 10615b80e8abd2a8a3263a3514822a90158c14d1
+  revision: 1f3fc923263abac1cff1f64e22813d1c5e47e53b
   branch: master
   specs:
-    ohai (16.0.12)
+    ohai (16.0.15)
       chef-config (>= 12.8, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -27,12 +27,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (16.0.171)
+    chef (16.0.176)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 16.0.171)
-      chef-utils (= 16.0.171)
+      chef-config (= 16.0.176)
+      chef-utils (= 16.0.176)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
@@ -61,12 +61,12 @@ PATH
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (16.0.171-universal-mingw32)
+    chef (16.0.176-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 16.0.171)
-      chef-utils (= 16.0.171)
+      chef-config (= 16.0.176)
+      chef-utils (= 16.0.176)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
@@ -111,15 +111,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (16.0.171)
-      chef (= 16.0.171)
+    chef-bin (16.0.176)
+      chef (= 16.0.176)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (16.0.171)
+    chef-config (16.0.176)
       addressable
-      chef-utils (= 16.0.171)
+      chef-utils (= 16.0.176)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -128,7 +128,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (16.0.171)
+    chef-utils (16.0.176)
 
 GEM
   remote: https://rubygems.org/
@@ -176,7 +176,7 @@ GEM
     equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     fauxhai-ng (8.0.0)
       net-ssh
@@ -285,7 +285,7 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
     parallel (1.19.1)
-    parser (2.7.0.4)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.3)
@@ -331,14 +331,14 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.80.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-prof (1.2.0)
     ruby-progressbar (1.10.1)
     ruby-shadow (2.5.0)
@@ -399,8 +399,10 @@ GEM
       tty-screen (~> 0.7)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
+    unf_ext (0.0.7.7-x86-mingw32)
+    unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uri_template (0.7.0)
     uuidtools (2.1.5)
diff --git a/VERSION b/VERSION
index abec1b0e1a..f8bfe3573b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.171
\ No newline at end of file
+16.0.176
\ 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 fbf18110a4..e4f10648b4 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("../..", __FILE__)
-  VERSION = "16.0.171".freeze
+  VERSION = "16.0.176".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b3a2453cf4..f5de419f33 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("../..", __FILE__)
-  VERSION = "16.0.171".freeze
+  VERSION = "16.0.176".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 32ca448832..585631535e 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "16.0.171".freeze
+  VERSION = "16.0.176".freeze
 end
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index e15f076ba3..719f5e7a5a 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -16,9 +16,8 @@ $pkg_deps=@(
 )
 
 function Invoke-Begin {
-    $hab_version = (hab --version)
-    $hab_minor_version = $hab_version.split('.')[1]
-    if ( -not $? -Or $hab_minor_version -lt 85 ) {
+    [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0]
+    if ($hab_version -lt [Version]"0.85.0" ) {
         Write-Warning "(╯°□°）╯︵ ┻━┻ I CAN'T WORK UNDER THESE CONDITIONS!"
         Write-Warning ":habicat: I'm being built with $hab_version. I need at least Hab 0.85.0, because I use the -IsPath option for setting/pushing paths in SetupEnvironment."
         throw "unable to build: required minimum version of Habitat not installed"
diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb
index b33ba097bb..3516cadda7 100644
--- a/lib/chef/provider/launchd.rb
+++ b/lib/chef/provider/launchd.rb
@@ -89,24 +89,41 @@ class Chef
       end
 
       def manage_plist(action)
-        return unless manage_agent?(action)
-
         if source
-          res = cookbook_file_resource
+          cookbook_file @path do
+            cookbook_name = cookbook if cookbook
+            name(@path) if @path
+            backup(backup) if backup
+            group(group) if group
+            mode(mode) if mode
+            owner(owner) if owner
+            source(source) if source
+            action(action)
+            only_if { manage_agent?(action) }
+          end
         else
-          res = file_resource
+          file @path do
+            name(@path) if @path
+            backup(backup) if backup
+            content(content) if content?
+            group(group) if group
+            mode(mode) if mode
+            owner(owner) if owner
+            action(action)
+            only_if { manage_agent?(action) }
+          end
         end
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
-        res.updated
       end
 
       def manage_service(action)
-        return unless manage_agent?(action)
-
-        res = service_resource
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
+        macosx_service label do
+          name(label) if label
+          service_name(label) if label
+          plist(@path) if @path
+          session_type(session_type) if session_type
+          action(action)
+          only_if { manage_agent?(action) }
+        end
       end
 
       def manage_agent?(action)
@@ -127,38 +144,6 @@ class Chef
         true
       end
 
-      def service_resource
-        res = Chef::Resource::MacosxService.new(label, run_context)
-        res.name(label) if label
-        res.service_name(label) if label
-        res.plist(@path) if @path
-        res.session_type(session_type) if session_type
-        res
-      end
-
-      def file_resource
-        res = Chef::Resource::File.new(@path, run_context)
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.content(content) if content?
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res
-      end
-
-      def cookbook_file_resource
-        res = Chef::Resource::CookbookFile.new(@path, run_context)
-        res.cookbook_name = cookbook if cookbook
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res.source(source) if source
-        res
-      end
-
       def define_resource_requirements
         requirements.assert(
           :create, :create_if_missing, :delete, :enable, :disable
diff --git a/lib/chef/provider/osx_profile.rb b/lib/chef/provider/osx_profile.rb
index 1a5484ccbf..ba63d4b02a 100644
--- a/lib/chef/provider/osx_profile.rb
+++ b/lib/chef/provider/osx_profile.rb
@@ -33,6 +33,7 @@ class Chef
         current_resource.profile_name(new_resource.profile_name)
 
         all_profiles = get_installed_profiles
+        # FIXME: stop mutating the desired state
         new_resource.profile(
           new_resource.profile ||
           new_resource.profile_name
@@ -149,6 +150,7 @@ class Chef
             ::File.dirname(cookbook_file)
           )
         )
+        # FIXME: should use a real cookbook file, or document what this craziness is
         remote_file = Chef::Resource::CookbookFile.new(
           ::File.join(
             get_cache_dir,
@@ -180,6 +182,7 @@ class Chef
       end
 
       def write_profile_to_disk
+        # FIXME: use a real chef file resource and stop hacking up tempfiles directly
         new_resource.path(Chef::FileCache.create_cache_path("profiles"))
         tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
         tempfile.write(@new_profile_hash.to_plist)
diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb
index 00cc450253..1bdcc9c08b 100644
--- a/lib/chef/provider/powershell_script.rb
+++ b/lib/chef/provider/powershell_script.rb
@@ -22,6 +22,7 @@ require_relative "windows_script"
 class Chef
   class Provider
     class PowershellScript < Chef::Provider::WindowsScript
+      # FIXME: use composition not inheritance
 
       provides :powershell_script
 
diff --git a/lib/chef/provider/systemd_unit.rb b/lib/chef/provider/systemd_unit.rb
index c5cd9a1960..f1b104de21 100644
--- a/lib/chef/provider/systemd_unit.rb
+++ b/lib/chef/provider/systemd_unit.rb
@@ -232,14 +232,15 @@ class Chef
         end
       end
 
-      def manage_unit_file(action = :nothing)
-        Chef::Resource::File.new(unit_path, run_context).tap do |f|
-          f.owner "root"
-          f.group "root"
-          f.mode "0644"
-          f.content new_resource.to_ini
-          f.verify :systemd_unit if new_resource.verify
-        end.run_action(action)
+      def manage_unit_file(the_action = :nothing)
+        file unit_path do
+          owner "root"
+          group "root"
+          mode "0644"
+          content new_resource.to_ini
+          verify :systemd_unit if new_resource.verify
+          action the_action
+        end
       end
 
       def daemon_reload
diff --git a/lib/chef/provider/yum_repository.rb b/lib/chef/provider/yum_repository.rb
index 9ae3bad29c..97d49d1bed 100644
--- a/lib/chef/provider/yum_repository.rb
+++ b/lib/chef/provider/yum_repository.rb
@@ -1,6 +1,6 @@
 #
 # Author:: Thom May (<thom@chef.io>)
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/chef/resource/chef_vault_secret.rb b/lib/chef/resource/chef_vault_secret.rb
index b1272df6f2..8652dc1c98 100644
--- a/lib/chef/resource/chef_vault_secret.rb
+++ b/lib/chef/resource/chef_vault_secret.rb
@@ -21,6 +21,8 @@ require "chef-vault"
 class Chef
   class Resource
     class ChefVaultSecret < Chef::Resource
+      unified_mode true
+
       provides :chef_vault_secret
 
       introduced "16.0"
@@ -116,16 +118,14 @@ class Chef
       action :delete do
         description "Deletes the item and the item's keys ('id'_keys)."
 
-        converge_by("remove #{new_resource.id} and #{new_resource.id}_keys from #{new_resource.data_bag}") do
-          chef_data_bag_item new_resource.id do
-            data_bag new_resource.data_bag
-            action :delete
-          end
+        chef_data_bag_item new_resource.id do
+          data_bag new_resource.data_bag
+          action :delete
+        end
 
-          chef_data_bag_item [new_resource.id, "keys"].join("_") do
-            data_bag new_resource.data_bag
-            action :delete
-          end
+        chef_data_bag_item [new_resource.id, "keys"].join("_") do
+          data_bag new_resource.data_bag
+          action :delete
         end
       end
     end
diff --git a/lib/chef/resource/group.rb b/lib/chef/resource/group.rb
index d2948b36c7..058a5a63d4 100644
--- a/lib/chef/resource/group.rb
+++ b/lib/chef/resource/group.rb
@@ -20,6 +20,7 @@
 class Chef
   class Resource
     class Group < Chef::Resource
+      unified_mode true
       state_attrs :members
 
       description "Use the group resource to manage a local group."
diff --git a/lib/chef/resource/launchd.rb b/lib/chef/resource/launchd.rb
index 87addde5d7..d939559b02 100644
--- a/lib/chef/resource/launchd.rb
+++ b/lib/chef/resource/launchd.rb
@@ -21,6 +21,7 @@ require_relative "../resource"
 class Chef
   class Resource
     class Launchd < Chef::Resource
+      unified_mode true
       provides :launchd
 
       description "Use the launchd resource to manage system-wide services (daemons) and per-user services (agents) on the macOS platform."
diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb
index 256048928a..afd0d69bec 100644
--- a/lib/chef/resource/macports_package.rb
+++ b/lib/chef/resource/macports_package.rb
@@ -21,6 +21,7 @@ require_relative "package"
 class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
+      unified_mode true
       provides :macports_package
 
       description "Use the macports_package resource to manage packages for the macOS platform."
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 15fabf2982..4a96aad353 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -23,6 +23,7 @@ class Chef
   class Resource
     class Mount < Chef::Resource
       description "Use the mount resource to manage a mounted file system."
+      unified_mode true
 
       provides :mount
 
diff --git a/lib/chef/resource/msu_package.rb b/lib/chef/resource/msu_package.rb
index 7ccd28ba95..830aac9797 100644
--- a/lib/chef/resource/msu_package.rb
+++ b/lib/chef/resource/msu_package.rb
@@ -23,6 +23,7 @@ class Chef
   class Resource
     class MsuPackage < Chef::Resource::Package
       include Chef::Mixin::Uris
+      unified_mode true
 
       provides :msu_package
 
diff --git a/lib/chef/resource/openbsd_package.rb b/lib/chef/resource/openbsd_package.rb
index 05d77b44dc..fa49ddf44f 100644
--- a/lib/chef/resource/openbsd_package.rb
+++ b/lib/chef/resource/openbsd_package.rb
@@ -25,6 +25,7 @@ require_relative "../provider/package/openbsd"
 class Chef
   class Resource
     class OpenbsdPackage < Chef::Resource::Package
+      unified_mode true
       provides :openbsd_package
       provides :package, os: "openbsd"
 
diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb
index 2a350124f7..5389696b72 100644
--- a/lib/chef/resource/osx_profile.rb
+++ b/lib/chef/resource/osx_profile.rb
@@ -21,6 +21,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class OsxProfile < Chef::Resource
+      unified_mode true
+
       provides :osx_profile
       provides :osx_config_profile
 
diff --git a/lib/chef/resource/package.rb b/lib/chef/resource/package.rb
index 9a7134aad9..4e7b4133f6 100644
--- a/lib/chef/resource/package.rb
+++ b/lib/chef/resource/package.rb
@@ -22,6 +22,7 @@ require_relative "../resource"
 class Chef
   class Resource
     class Package < Chef::Resource
+      unified_mode true
       provides :package
 
       description "Use the package resource to manage packages. When the package is"\
diff --git a/lib/chef/resource/powershell_package.rb b/lib/chef/resource/powershell_package.rb
index 7fb926db7c..7ae967a389 100644
--- a/lib/chef/resource/powershell_package.rb
+++ b/lib/chef/resource/powershell_package.rb
@@ -16,12 +16,11 @@
 #
 
 require_relative "package"
-require_relative "../mixin/uris"
 
 class Chef
   class Resource
     class PowershellPackage < Chef::Resource::Package
-      include Chef::Mixin::Uris
+      unified_mode true
 
       provides :powershell_package
 
diff --git a/lib/chef/resource/powershell_package_source.rb b/lib/chef/resource/powershell_package_source.rb
index 2710974a73..d253de0958 100644
--- a/lib/chef/resource/powershell_package_source.rb
+++ b/lib/chef/resource/powershell_package_source.rb
@@ -21,6 +21,8 @@ require_relative "../json_compat"
 class Chef
   class Resource
     class PowershellPackageSource < Chef::Resource
+      unified_mode true
+
       provides :powershell_package_source
 
       description "Use the powershell_package_source resource to register a PowerShell package repository."
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb
index 727ff6609a..49f1fa75fa 100644
--- a/lib/chef/resource/powershell_script.rb
+++ b/lib/chef/resource/powershell_script.rb
@@ -20,6 +20,8 @@ require_relative "windows_script"
 class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
+      unified_mode true
+
       provides :powershell_script, os: "windows"
 
       property :flags, String,
diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb
index ea57d0f9c2..5088cd2d62 100644
--- a/lib/chef/resource/rhsm_register.rb
+++ b/lib/chef/resource/rhsm_register.rb
@@ -127,12 +127,14 @@ class Chef
         end
 
         def registered_with_rhsm?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager status", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Overall Status: Unknown/)
         end
 
         def katello_cert_rpm_installed?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("rpm -qa | grep katello-ca-consumer")
           cmd.run_command
           !cmd.stdout.match(/katello-ca-consumer/).nil?
diff --git a/lib/chef/resource/rhsm_repo.rb b/lib/chef/resource/rhsm_repo.rb
index b1a8d06d6f..95fb36b071 100644
--- a/lib/chef/resource/rhsm_repo.rb
+++ b/lib/chef/resource/rhsm_repo.rb
@@ -20,6 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmRepo < Chef::Resource
+      unified_mode true
+
       provides(:rhsm_repo) { true }
 
       description "Use the rhsm_repo resource to enable or disable Red Hat Subscription Manager"\
@@ -54,6 +56,7 @@ class Chef
 
       action_class do
         def repo_enabled?(repo)
+          # FIXME: use shell_out()
           cmd = Mixlib::ShellOut.new("subscription-manager repos --list-enabled", env: { LANG: "en_US" })
           cmd.run_command
           repo == "*" || !cmd.stdout.match(/Repo ID:\s+#{repo}$/).nil?
diff --git a/lib/chef/resource/rhsm_subscription.rb b/lib/chef/resource/rhsm_subscription.rb
index b7c84e95b4..3e805b9ae1 100644
--- a/lib/chef/resource/rhsm_subscription.rb
+++ b/lib/chef/resource/rhsm_subscription.rb
@@ -20,6 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmSubscription < Chef::Resource
+      unified_mode true
+
       provides(:rhsm_subscription) { true }
 
       description "Use the rhsm_subscription resource to add or remove Red Hat Subscription Manager"\
@@ -55,6 +57,7 @@ class Chef
 
       action_class do
         def subscription_attached?(subscription)
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed | grep #{subscription}", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Pool ID:\s+#{subscription}$/).nil?
@@ -65,6 +68,7 @@ class Chef
           pool = nil
           serial = nil
 
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed", env: { LANG: "en_US" })
           cmd.run_command
           cmd.stdout.lines.each do |line|
diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index 46054f21d9..71eb344483 100644
--- a/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@hjksolutions.com>)
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2008-2019, Chef Software Inc.
+# Copyright:: Copyright 2008-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@ class Chef
     class Service < Chef::Resource
       include ChefUtils::DSL::Service
       extend ChefUtils::DSL::Service
+      unified_mode true
 
       provides :service, target_mode: true
 
diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb
index e652f82def..d248146a01 100644
--- a/lib/chef/resource/ssh_known_hosts_entry.rb
+++ b/lib/chef/resource/ssh_known_hosts_entry.rb
@@ -23,6 +23,8 @@ require_relative "../dist"
 class Chef
   class Resource
     class SshKnownHostsEntry < Chef::Resource
+      unified_mode true
+
       provides :ssh_known_hosts_entry
 
       description "Use the ssh_known_hosts_entry resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified."
diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb
index 1c318ded5c..0d477323f9 100644
--- a/lib/chef/resource/systemd_unit.rb
+++ b/lib/chef/resource/systemd_unit.rb
@@ -23,6 +23,8 @@ require "iniparse"
 class Chef
   class Resource
     class SystemdUnit < Chef::Resource
+      unified_mode true
+
       provides(:systemd_unit) { true }
 
       description "Use the systemd_unit resource to create, manage, and run systemd units."
diff --git a/lib/chef/resource/yum_repository.rb b/lib/chef/resource/yum_repository.rb
index 28e5c809c5..1136ae56da 100644
--- a/lib/chef/resource/yum_repository.rb
+++ b/lib/chef/resource/yum_repository.rb
@@ -21,6 +21,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class YumRepository < Chef::Resource
+      unified_mode true
+
       provides(:yum_repository) { true }
 
       description "Use the yum_repository resource to manage a Yum repository configuration"\
diff --git a/lib/chef/resource/zypper_repository.rb b/lib/chef/resource/zypper_repository.rb
index 6cc0929fad..f55a42e6a8 100644
--- a/lib/chef/resource/zypper_repository.rb
+++ b/lib/chef/resource/zypper_repository.rb
@@ -21,6 +21,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class ZypperRepository < Chef::Resource
+      unified_mode true
+
       provides(:zypper_repository) { true }
       provides(:zypper_repo) { true }
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6c028f7e25..3657e33ce5 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("../..", __FILE__)
-  VERSION = Chef::VersionString.new("16.0.171")
+  VERSION = Chef::VersionString.new("16.0.176")
 end
 
 #
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fc2a5edad1..6a58cd3999 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: c086d8057ac9a15486fe2010009db0dee1cea682
+  revision: 18564cc92b5f7b6d3ada694a41adf3bf948918fb
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,8 +32,8 @@ GEM
     artifactory (3.0.12)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.281.0)
-    aws-sdk-core (3.91.0)
+    aws-partitions (1.293.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -41,7 +41,7 @@ GEM
     aws-sdk-kms (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.61.0)
+    aws-sdk-s3 (1.61.1)
       aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -164,7 +164,7 @@ GEM
     equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
     ffi (1.12.2-x64-mingw32)
@@ -183,7 +183,6 @@ GEM
     hashie (4.1.0)
     highline (1.7.10)
     httpclient (2.8.3)
-    inifile (3.0.0)
     iniparse (1.5.0)
     iostruct (0.0.4)
     ipaddress (0.8.3)
@@ -240,10 +239,10 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    octokit (4.17.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (15.7.4)
+    ohai (15.8.0)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -274,7 +273,7 @@ GEM
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -306,10 +305,9 @@ GEM
     thor (0.20.3)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.9)
-    train-core (3.2.23)
+    tomlrb (1.3.0)
+    train-core (3.2.26)
       addressable (~> 2.5)
-      inifile (~> 3.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 1243714975..b90deee99f 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,7 +4,7 @@
 # NOTE: You MUST update omnibus-software when adding new versions of
 # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
 override :rubygems, version: "3.1.2" # pin to what ships in the ruby version
-override :bundler, version: "2.1.2" # pin to what ships in the ruby version
+override :bundler, version: "2.1.4" # pin to what ships in the ruby version
 override "libarchive", version: "3.4.2"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.15"
@@ -15,10 +15,10 @@ override "libxslt", version: "1.1.34"
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "nokogiri", version: "1.11.0.rc1"
+override "nokogiri", version: "1.11.0.rc2"
 override "openssl", version: "1.0.2u"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.7.0"
+override "ruby", version: "2.7.1"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh
index e74f598d40..b4bbce59f9 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -35,9 +35,9 @@ sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf
 echo "--- Installing Ruby ASDF plugin"
 /opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
 
-echo "--- Installing Ruby 2.6.5"
-/opt/asdf/bin/asdf install ruby 2.6.5
-/opt/asdf/bin/asdf global ruby 2.6.5
+echo "--- Installing Ruby 2.6.6"
+/opt/asdf/bin/asdf install ruby 2.6.6
+/opt/asdf/bin/asdf global ruby 2.6.6
 
 # Update Gems
 gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)