Use ChefUtils::CANARY and update to the chefstyle that enforces that

Signed-off-by: Tim Smith <tsmith@chef.io>

10 files changed, 11 insertions, 11 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 1dbfbc150f..20b9849b4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 1155f0044aca2fb7776d28f5adbe523a4705527f
+  revision: a40b62de5f41e98ba240eb502d778470e1ec5186
   branch: master
   specs:
-    chefstyle (1.4.0)
+    chefstyle (1.4.1)
       rubocop (= 0.91.0)
 
 GIT
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index 002ab207b9..4ffbcde1c0 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -27,7 +27,7 @@ require "mixlib/cli" unless defined?(Mixlib::CLI)
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require "rbconfig" unless defined?(RbConfig)
 require_relative "application/exit_code"
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 module LicenseAcceptance
   autoload :Acceptor, "license_acceptance/acceptor"
 end
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 36ff1640d7..4a749a7c39 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -21,7 +21,7 @@ require_relative "base"
 require_relative "../handler/error_report"
 require_relative "../workstation_config_loader"
 autoload :URI, "uri"
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 module Mixlib
   module Authentication
     autoload :Log, "mixlib/authentication"
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index cda0852e13..8264393bb9 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -21,7 +21,7 @@ require_relative "../../chef"
 require_relative "client"
 require "fileutils" unless defined?(FileUtils)
 require "pathname" unless defined?(Pathname)
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 # DO NOT MAKE EDITS, see Chef::Application::Base
 #
diff --git a/lib/chef/event_loggers/windows_eventlog.rb b/lib/chef/event_loggers/windows_eventlog.rb
index c1958321a8..6b290eb8a7 100644
--- a/lib/chef/event_loggers/windows_eventlog.rb
+++ b/lib/chef/event_loggers/windows_eventlog.rb
@@ -19,7 +19,7 @@
 require_relative "base"
 require_relative "../platform/query_helpers"
 require_relative "../win32/eventlog"
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 class Chef
   module EventLoggers
diff --git a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
index 9c16072de7..d858c756a4 100644
--- a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 class Chef
   module Formatters
diff --git a/lib/chef/local_mode.rb b/lib/chef/local_mode.rb
index 5be97d9783..e7346322d2 100644
--- a/lib/chef/local_mode.rb
+++ b/lib/chef/local_mode.rb
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "config"
 require_relative "monkey_patches/webrick-utils" if ChefUtils.windows?
 
diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb
index 0d75d76497..e2c07ad9f7 100644
--- a/lib/chef/provider/file.rb
+++ b/lib/chef/provider/file.rb
@@ -31,7 +31,7 @@ require_relative "../util/backup"
 require_relative "../util/diff"
 require_relative "../util/selinux"
 require_relative "../file_content_management/deploy"
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 # The Tao of File Providers:
 #  - the content provider must always return a tempfile that we can delete/mv
diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb
index f9f7823f0a..7bebc4ae4c 100644
--- a/lib/chef/resource/file.rb
+++ b/lib/chef/resource/file.rb
@@ -22,7 +22,7 @@ require_relative "../platform/query_helpers"
 require_relative "../mixin/securable"
 require_relative "file/verification"
 require "pathname" unless defined?(Pathname)
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 class Chef
   class Resource
diff --git a/lib/chef/run_lock.rb b/lib/chef/run_lock.rb
index 0f1eaf0742..75d1432773 100644
--- a/lib/chef/run_lock.rb
+++ b/lib/chef/run_lock.rb
@@ -23,7 +23,7 @@ end
 require_relative "config"
 require_relative "exceptions"
 require "timeout" unless defined?(Timeout)
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 class Chef