merge all dist files back into dist.rb

Signed-off-by: Marc Chamberland <chamberland.marc@gmail.com>
Signed-off-by: Lance Albertson <lance@osuosl.org>

74 files changed, 164 insertions, 241 deletions

diff --git a/chef-bin/bin/chef-service-manager b/chef-bin/bin/chef-service-manager
index 44e39a5bd3..c7b1177447 100755
--- a/chef-bin/bin/chef-service-manager
+++ b/chef-bin/bin/chef-service-manager
@@ -21,7 +21,7 @@
 $:.unshift(File.join(__dir__, "..", "lib"))
 require "chef"
 require "chef/application/windows_service_manager"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 if Chef::Platform.windows?
   chef_client_service = {
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index 1254911e35..36f404b8f1 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -36,6 +36,7 @@ autoload :URI, "uri"
 autoload :Addressable, "addressable/uri"
 autoload :OpenSSL, "openssl"
 autoload :YAML, "yaml"
+require "chef-utils/dist"
 
 module ChefConfig
 
@@ -124,7 +125,7 @@ module ChefConfig
     #
     def self.c_opscode_dir(windows: ChefUtils.windows?)
       drive = windows_installation_drive || "C:"
-      PathHelper.join(drive, ChefConfig::Dist::LEGACY_CONF_DIR, ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
+      PathHelper.join(drive, ChefUtils::Dist::Org::LEGACY_CONF_DIR, ChefUtils::Dist::Infra::DIR_SUFFIX, windows: windows)
     end
 
     # the drive where Chef is installed on a windows host. This is determined
diff --git a/chef-config/lib/chef-config/mixin/credentials.rb b/chef-config/lib/chef-config/mixin/credentials.rb
index 13f490ba71..7a96bf059e 100644
--- a/chef-config/lib/chef-config/mixin/credentials.rb
+++ b/chef-config/lib/chef-config/mixin/credentials.rb
@@ -17,7 +17,7 @@
 
 autoload :Tomlrb, "tomlrb"
 require_relative "../path_helper"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 module ChefConfig
   module Mixin
diff --git a/chef-utils/lib/chef-utils.rb b/chef-utils/lib/chef-utils.rb
index 5cf80ddde4..c1b06ed3fb 100644
--- a/chef-utils/lib/chef-utils.rb
+++ b/chef-utils/lib/chef-utils.rb
@@ -30,7 +30,6 @@ require_relative "chef-utils/dsl/virtualization"
 require_relative "chef-utils/dsl/which"
 require_relative "chef-utils/dsl/windows"
 require_relative "chef-utils/mash"
-require_relative "chef-utils/dist"
 
 # This is the Chef Infra Client DSL, not everything needs to go in here
 module ChefUtils
diff --git a/chef-utils/lib/chef-utils/dist.rb b/chef-utils/lib/chef-utils/dist.rb
index a45dd9d64b..0493e65c3a 100644
--- a/chef-utils/lib/chef-utils/dist.rb
+++ b/chef-utils/lib/chef-utils/dist.rb
@@ -1,25 +1,102 @@
-# Copyright:: Copyright (c) Chef Software Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-require_relative "dist/org"
-require_relative "dist/infra"
-require_relative "dist/apply"
-require_relative "dist/automate"
-require_relative "dist/compliance"
-require_relative "dist/inspec"
-require_relative "dist/run"
-require_relative "dist/server"
-require_relative "dist/solo"
-require_relative "dist/workstation"
-require_relative "dist/zero"
+module ChefUtils
+  module Dist
+    class Apply
+      # The chef-apply product name
+      PRODUCT = "Chef Infra Apply".freeze
+      # The chef-apply binary
+      EXEC = "chef-apply".freeze
+    end
+    class Automate
+      PRODUCT = "Chef Automate".freeze
+    end
+    class Compliance
+      PRODUCT = "Chef Compliance".freeze
+    end
+    class Infra
+      # When referencing a product directly, as in "Chef Infra"
+      PRODUCT = "Chef Infra Client".freeze
+
+      # The chef-main-wrapper executable name.
+      EXEC = "chef".freeze
+
+      # The client's alias (chef-client)
+      CLIENT = "chef-client".freeze
+
+      # A short name for the product
+      SHORT = "chef".freeze
+
+      # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
+      # "chef" => /etc/cinc, /var/cinc, C:\\cinc
+      DIR_SUFFIX = "chef".freeze
+
+      # The user's configuration directory
+      USER_CONF_DIR = ".chef".freeze
+
+      # chef-shell executable
+      SHELL = "chef-shell".freeze
+
+      # The chef-shell default configuration file
+      SHELL_CONF = "chef_shell.rb".freeze
+    end
+    class Inspec
+      PRODUCT = "Chef Inspec".freeze
+
+      EXEC = "inspec".freeze
+
+      DIR_SUFFIX = "inspec".freeze
+    end
+    class Org
+      # Main Website address
+      WEBSITE = "https://chef.io".freeze
+
+      # The downloads site
+      DOWNLOADS_URL = "downloads.chef.io".freeze
+
+      # The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
+      # DIR_SUFFIX is appended to it in code where relevant
+      LEGACY_CONF_DIR = "opscode".freeze
+    end
+    class Run
+      # chef-run's product name
+      PRODUCT = "Chef Infra Run".freeze
+
+      # The chef-run binary
+      EXEC = "chef-run".freeze
+    end
+    class Server
+      # The name of the server product
+      PRODUCT = "Chef Infra Server".freeze
+
+      # Assumed location of the chef-server configuration directory
+      # TODO: This actually sounds like a job for ChefUtils methods
+      CONF_DIR = "/etc/chef-server".freeze
+    end
+    class Solo
+      # Chef-Solo's product name
+      PRODUCT = "Chef Infra Solo".freeze
+
+      # The chef-solo executable (legacy local mode)
+      EXEC = "chef-solo".freeze
+    end
+    class Workstation
+      # The Workstation's product name
+      PRODUCT = "Chef Workstation".freeze
+
+      # The old ChefDK product name
+      DK = "ChefDK".freeze
+
+      # The suffix for workstation's eponymous folders, like /opt/workstation
+      DIR_SUFFIX = "chef-workstation".freeze
+
+      # The suffix for ChefDK's eponymous folders, like /opt/chef-dk
+      LEGACY_DIR_SUFFIX = "chef-dk".freeze
+    end
+    class Zero
+      # chef-zero executable
+      PRODUCT = "Chef Infra Zero".freeze
+
+      # The chef-zero executable (local mode)
+      EXEC = "chef-zero".freeze
+    end
+  end
+end
diff --git a/chef-utils/lib/chef-utils/dist/apply.rb b/chef-utils/lib/chef-utils/dist/apply.rb
deleted file mode 100644
index d4ef297510..0000000000
--- a/chef-utils/lib/chef-utils/dist/apply.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module ChefUtils
-  module Dist
-    class Apply
-      # The chef-apply product name
-      PRODUCT = "Chef Infra Apply".freeze
-      # The chef-apply binary
-      EXEC = "chef-apply".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/automate.rb b/chef-utils/lib/chef-utils/dist/automate.rb
deleted file mode 100644
index bcdd5673bd..0000000000
--- a/chef-utils/lib/chef-utils/dist/automate.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ChefUtils
-  module Dist
-    class Automate
-      PRODUCT = "Chef Automate".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/compliance.rb b/chef-utils/lib/chef-utils/dist/compliance.rb
deleted file mode 100644
index 0f73194eb9..0000000000
--- a/chef-utils/lib/chef-utils/dist/compliance.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ChefUtils
-  module Dist
-    class Compliance
-      PRODUCT = "Chef Compliance".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/infra.rb b/chef-utils/lib/chef-utils/dist/infra.rb
deleted file mode 100644
index 55b7c8f951..0000000000
--- a/chef-utils/lib/chef-utils/dist/infra.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module ChefUtils
-  module Dist
-    class Infra
-      # When referencing a product directly, as in "Chef Infra"
-      PRODUCT = "Chef Infra Client".freeze
-
-      # The chef-main-wrapper executable name.
-      EXEC = "chef".freeze
-
-      # The client's alias (chef-client)
-      CLIENT = "chef-client".freeze
-
-      # A short name for the product
-      SHORT = "chef".freeze
-
-      # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
-      # "cinc" => /etc/cinc, /var/cinc, C:\\cinc
-      DIR_SUFFIX = "chef".freeze
-
-      # The user's configuration directory
-      USER_CONF_DIR = ".chef".freeze
-
-      # chef-shell executable
-      SHELL = "chef-shell".freeze
-
-      # The chef-shell default configuration file
-      SHELL_CONF = "chef_shell.rb".freeze
-
-      # chef-zero executable
-      ZERO = "Chef Infra Zero".freeze
-
-      # Chef-Solo's product name
-      SOLO = "Chef Infra Solo".freeze
-
-      # The chef-zero executable (local mode)
-      ZEROEXEC = "chef-zero".freeze
-
-      # The chef-solo executable (legacy local mode)
-      SOLOEXEC = "chef-solo".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/inspec.rb b/chef-utils/lib/chef-utils/dist/inspec.rb
deleted file mode 100644
index a2204b9674..0000000000
--- a/chef-utils/lib/chef-utils/dist/inspec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ChefUtils
-  module Dist
-    class Inspec
-      PRODUCT = "Chef Inspec".freeze
-
-      EXEC = "inspec".freeze
-
-      DIR_SUFFIX = "inspec".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/org.rb b/chef-utils/lib/chef-utils/dist/org.rb
deleted file mode 100644
index 69cc2771e5..0000000000
--- a/chef-utils/lib/chef-utils/dist/org.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ChefUtils
-  module Dist
-    class Org
-      # Main Website address
-      WEBSITE = "https://chef.io".freeze
-
-      # The downloads site
-      DOWNLOADS_URL = "downloads.chef.io".freeze
-
-      # The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
-      # DIR_SUFFIX is appended to it in code where relevant
-      LEGACY_CONF_DIR = "opscode".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/run.rb b/chef-utils/lib/chef-utils/dist/run.rb
deleted file mode 100644
index 0045b405d2..0000000000
--- a/chef-utils/lib/chef-utils/dist/run.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ChefUtils
-  module Dist
-    class Run
-      # chef-run's product name
-      PRODUCT = "Chef Infra Run".freeze
-
-      # The chef-run binary
-      EXEC = "chef-run".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/server.rb b/chef-utils/lib/chef-utils/dist/server.rb
deleted file mode 100644
index 797f0efbf2..0000000000
--- a/chef-utils/lib/chef-utils/dist/server.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module ChefUtils
-  module Dist
-    class Server
-      # The name of the server product
-      PRODUCT = "Chef Infra Server".freeze
-
-      # Assumed location of the chef-server configuration directory
-      # TODO: This actually sounds like a job for ChefUtils methods
-      CONF_DIR = "/etc/chef-server".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/solo.rb b/chef-utils/lib/chef-utils/dist/solo.rb
deleted file mode 100644
index 8b3ee9c9d5..0000000000
--- a/chef-utils/lib/chef-utils/dist/solo.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ChefUtils
-  module Dist
-    class Solo
-      # Chef-Solo's product name
-      PRODUCT = "Chef Infra Solo".freeze
-
-      # The chef-solo executable (legacy local mode)
-      EXEC = "chef-solo".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/workstation.rb b/chef-utils/lib/chef-utils/dist/workstation.rb
deleted file mode 100644
index c8725dd86d..0000000000
--- a/chef-utils/lib/chef-utils/dist/workstation.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module ChefUtils
-  module Dist
-    class Workstation
-      # The Workstation's product name
-      PRODUCT = "Chef Workstation".freeze
-
-      # The old ChefDK product name
-      DK = "ChefDK".freeze
-
-      # The suffix for workstation's eponymous folders, like /opt/workstation
-      DIR_SUFFIX = "chef-workstation".freeze
-
-      # The suffix for ChefDK's eponymous folders, like /opt/chef-dk
-      LEGACY_DIR_SUFFIX = "chef-dk".freeze
-    end
-  end
-end
diff --git a/chef-utils/lib/chef-utils/dist/zero.rb b/chef-utils/lib/chef-utils/dist/zero.rb
deleted file mode 100644
index 74d2b8132c..0000000000
--- a/chef-utils/lib/chef-utils/dist/zero.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ChefUtils
-  module Dist
-    class Zero
-      # chef-zero executable
-      PRODUCT = "Chef Infra Zero".freeze
-
-      # The chef-zero executable (local mode)
-      EXEC = "chef-zero".freeze
-    end
-  end
-end
diff --git a/lib/chef/application/exit_code.rb b/lib/chef/application/exit_code.rb
index c634ba2b58..817bbca2f7 100644
--- a/lib/chef/application/exit_code.rb
+++ b/lib/chef/application/exit_code.rb
@@ -22,7 +22,7 @@ class Chef
     # These are the exit codes defined in Chef RFC 062
     # https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md
     class ExitCode
-      require "chef-utils/dist/infra"
+      require "chef-utils/dist"
 
       # -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is
       # not enumerated in an active constant.
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index 8332b1e747..70149ea082 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -29,7 +29,7 @@ require "socket" unless defined?(Socket)
 require "uri" unless defined?(URI)
 require "win32/daemon"
 require_relative "../mixin/shell_out"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Application
diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb
index 5bbebd62e2..f630ed57d2 100644
--- a/lib/chef/application/windows_service_manager.rb
+++ b/lib/chef/application/windows_service_manager.rb
@@ -21,7 +21,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
 end
 require_relative "../config"
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Application
diff --git a/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb
index 168f3647f6..d901fa27be 100644
--- a/lib/chef/chef_fs/knife.rb
+++ b/lib/chef/chef_fs/knife.rb
@@ -18,7 +18,7 @@
 
 require_relative "../knife"
 require "pathname" unless defined?(Pathname)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   module ChefFS
diff --git a/lib/chef/cookbook/synchronizer.rb b/lib/chef/cookbook/synchronizer.rb
index 04040d74d8..e3ea9e5150 100644
--- a/lib/chef/cookbook/synchronizer.rb
+++ b/lib/chef/cookbook/synchronizer.rb
@@ -17,7 +17,7 @@ require_relative "../client"
 require_relative "../util/threaded_job_queue"
 require_relative "../server_api"
 require "singleton" unless defined?(Singleton)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
 
diff --git a/lib/chef/cookbook_site_streaming_uploader.rb b/lib/chef/cookbook_site_streaming_uploader.rb
index 6041c6c459..66c866772d 100644
--- a/lib/chef/cookbook_site_streaming_uploader.rb
+++ b/lib/chef/cookbook_site_streaming_uploader.rb
@@ -28,7 +28,7 @@ module Mixlib
     autoload :SignedHeaderAuth, "mixlib/authentication/signedheaderauth"
   end
 end
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   # == Chef::CookbookSiteStreamingUploader
diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb
index 41da9c2ed5..fc28ac9364 100644
--- a/lib/chef/data_collector.rb
+++ b/lib/chef/data_collector.rb
@@ -26,7 +26,7 @@ require_relative "data_collector/run_end_message"
 require_relative "data_collector/run_start_message"
 require_relative "data_collector/config_validation"
 require_relative "data_collector/error_handlers"
-require "chef-utils/dist/automate"
+require "chef-utils/dist"
 
 class Chef
   class DataCollector
diff --git a/lib/chef/deprecation/warnings.rb b/lib/chef/deprecation/warnings.rb
index f1033270a4..4443d9869d 100644
--- a/lib/chef/deprecation/warnings.rb
+++ b/lib/chef/deprecation/warnings.rb
@@ -21,7 +21,7 @@ class Chef
     module Warnings
 
       require_relative "../version"
-      require "chef-utils/dist/infra"
+      require "chef-utils/dist"
 
       def add_deprecation_warnings_for(method_names)
         method_names.each do |name|
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index 4d8584363a..0a66f71185 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -25,7 +25,7 @@ require_relative "mixin/params_validate"
 require_relative "mixin/from_file"
 require_relative "version_constraint"
 require_relative "server_api"
-require "chef-utils/dist/solo"
+require "chef-utils/dist"
 
 class Chef
   class Environment
diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb
index c93dead219..addeb4c97f 100644
--- a/lib/chef/exceptions.rb
+++ b/lib/chef/exceptions.rb
@@ -18,7 +18,7 @@
 # limitations under the License.
 
 require "chef-config/exceptions"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 require_relative "constants"
 
 class Chef
diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index 6d923a12ac..7870924b09 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -1,6 +1,6 @@
 require_relative "base"
 require_relative "../config"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   module Formatters
diff --git a/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb b/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
index ae96a47aad..22eaabe2db 100644
--- a/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb
@@ -18,7 +18,7 @@
 #
 
 require_relative "api_error_formatting"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
 
 class Chef
   module Formatters
diff --git a/lib/chef/formatters/minimal.rb b/lib/chef/formatters/minimal.rb
index 92c33aa69b..653dbade89 100644
--- a/lib/chef/formatters/minimal.rb
+++ b/lib/chef/formatters/minimal.rb
@@ -1,5 +1,5 @@
 require_relative "base"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
 
diff --git a/lib/chef/http/http_request.rb b/lib/chef/http/http_request.rb
index 3bafaca667..9904a1a8e3 100644
--- a/lib/chef/http/http_request.rb
+++ b/lib/chef/http/http_request.rb
@@ -25,7 +25,7 @@ autoload :CGI, "cgi"
 module Net
   autoload :HTTP, File.expand_path("../monkey_patches/net_http", __dir__)
 end
-require "chef-utils/dist/org"
+require "chef-utils/dist"
 
 # To load faster, we only want ohai's version string.
 # However, in ohai before 0.6.0, the version is defined
diff --git a/lib/chef/http/socketless_chef_zero_client.rb b/lib/chef/http/socketless_chef_zero_client.rb
index 01f8d8c648..5c91d8742e 100644
--- a/lib/chef/http/socketless_chef_zero_client.rb
+++ b/lib/chef/http/socketless_chef_zero_client.rb
@@ -44,7 +44,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require "chef_zero/server"
-require "chef-utils/dist/zero"
+require "chef-utils/dist"
 module Net
   autoload :HTTPResponse, File.expand_path("../monkey_patches/net_http", __dir__)
 end
diff --git a/lib/chef/knife/client_create.rb b/lib/chef/knife/client_create.rb
index 4fe3bbeb02..9cdc20045e 100644
--- a/lib/chef/knife/client_create.rb
+++ b/lib/chef/knife/client_create.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index dad54ce133..44107661a4 100644
--- a/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index 14e7374b0e..54e1cba5e7 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -19,7 +19,7 @@
 require_relative "../../run_list"
 require_relative "../../util/path_helper"
 require "pathname" unless defined?(Pathname)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb
index 15c4bd3020..775eab05e2 100644
--- a/lib/chef/knife/core/windows_bootstrap_context.rb
+++ b/lib/chef/knife/core/windows_bootstrap_context.rb
@@ -18,7 +18,7 @@
 
 require_relative "bootstrap_context"
 require_relative "../../util/path_helper"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/exec.rb b/lib/chef/knife/exec.rb
index b42cc7d8f1..6a60355520 100644
--- a/lib/chef/knife/exec.rb
+++ b/lib/chef/knife/exec.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef::Knife::Exec < Chef::Knife
 
diff --git a/lib/chef/knife/node_show.rb b/lib/chef/knife/node_show.rb
index e87d7b165e..e58982b320 100644
--- a/lib/chef/knife/node_show.rb
+++ b/lib/chef/knife/node_show.rb
@@ -18,7 +18,7 @@
 
 require_relative "../knife"
 require_relative "core/node_presenter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/ssl_check.rb b/lib/chef/knife/ssl_check.rb
index d9bd9b0857..e447d3d2a8 100644
--- a/lib/chef/knife/ssl_check.rb
+++ b/lib/chef/knife/ssl_check.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/status.rb b/lib/chef/knife/status.rb
index b67d9b811a..9a86153d41 100644
--- a/lib/chef/knife/status.rb
+++ b/lib/chef/knife/status.rb
@@ -19,7 +19,7 @@
 require_relative "../knife"
 require_relative "core/status_presenter"
 require_relative "core/node_presenter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/knife/user_create.rb b/lib/chef/knife/user_create.rb
index 83ed21296f..07d847ec98 100644
--- a/lib/chef/knife/user_create.rb
+++ b/lib/chef/knife/user_create.rb
@@ -18,7 +18,7 @@
 #
 
 require_relative "../knife"
-require "chef-utils/dist/server"
+require "chef-utils/dist"
 
 class Chef
   class Knife
diff --git a/lib/chef/log/syslog.rb b/lib/chef/log/syslog.rb
index a024b05b53..e3abf46786 100644
--- a/lib/chef/log/syslog.rb
+++ b/lib/chef/log/syslog.rb
@@ -19,7 +19,7 @@
 require "logger"
 require "syslog-logger"
 require_relative "../mixin/unformatter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Log
diff --git a/lib/chef/log/winevt.rb b/lib/chef/log/winevt.rb
index 300544205a..42787f83ba 100644
--- a/lib/chef/log/winevt.rb
+++ b/lib/chef/log/winevt.rb
@@ -19,7 +19,7 @@
 require_relative "../event_loggers/base"
 require_relative "../platform/query_helpers"
 require_relative "../mixin/unformatter"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Log
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb
index 71d00e046f..5b23306b3d 100644
--- a/lib/chef/policy_builder/policyfile.rb
+++ b/lib/chef/policy_builder/policyfile.rb
@@ -24,7 +24,7 @@ require_relative "../run_context"
 require_relative "../config"
 require_relative "../node"
 require_relative "../server_api"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   module PolicyBuilder
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb
index 032f34b0a8..0903157ad8 100644
--- a/lib/chef/provider/package/rubygems.rb
+++ b/lib/chef/provider/package/rubygems.rb
@@ -22,7 +22,7 @@ require_relative "../package"
 require_relative "../../resource/package"
 require_relative "../../mixin/get_source_from_package"
 require_relative "../../mixin/which"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 # Class methods on Gem are defined in rubygems
 autoload :Gem, "rubygems"
diff --git a/lib/chef/provider/zypper_repository.rb b/lib/chef/provider/zypper_repository.rb
index fea179e670..1dd3f015be 100644
--- a/lib/chef/provider/zypper_repository.rb
+++ b/lib/chef/provider/zypper_repository.rb
@@ -20,7 +20,7 @@ require_relative "../resource"
 require_relative "../dsl/declare_resource"
 require_relative "noop"
 require "shellwords" unless defined?(Shellwords)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Provider
diff --git a/lib/chef/resource/breakpoint.rb b/lib/chef/resource/breakpoint.rb
index 0e46d485d6..1792da07cf 100644
--- a/lib/chef/resource/breakpoint.rb
+++ b/lib/chef/resource/breakpoint.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/chef_client_cron.rb b/lib/chef/resource/chef_client_cron.rb
index 9f0286c579..1da8aaaabb 100644
--- a/lib/chef/resource/chef_client_cron.rb
+++ b/lib/chef/resource/chef_client_cron.rb
@@ -15,7 +15,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 require_relative "helpers/cron_validations"
 require "digest/md5" unless defined?(Digest::MD5)
 
diff --git a/lib/chef/resource/chef_client_systemd_timer.rb b/lib/chef/resource/chef_client_systemd_timer.rb
index 443d0e6ce8..e1deb5be12 100644
--- a/lib/chef/resource/chef_client_systemd_timer.rb
+++ b/lib/chef/resource/chef_client_systemd_timer.rb
@@ -15,7 +15,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb
index 23e603927d..ba2dae96b9 100644
--- a/lib/chef/resource/chef_gem.rb
+++ b/lib/chef/resource/chef_gem.rb
@@ -18,7 +18,7 @@
 
 require_relative "package"
 require_relative "gem_package"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/chef_handler.rb b/lib/chef/resource/chef_handler.rb
index cceb04249d..eaf6218ae7 100644
--- a/lib/chef/resource/chef_handler.rb
+++ b/lib/chef/resource/chef_handler.rb
@@ -16,7 +16,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/chef_sleep.rb b/lib/chef/resource/chef_sleep.rb
index cb3da0df33..87843aaaef 100644
--- a/lib/chef/resource/chef_sleep.rb
+++ b/lib/chef/resource/chef_sleep.rb
@@ -15,7 +15,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/dnf_package.rb b/lib/chef/resource/dnf_package.rb
index 03523c614d..d3d093e9bd 100644
--- a/lib/chef/resource/dnf_package.rb
+++ b/lib/chef/resource/dnf_package.rb
@@ -18,7 +18,7 @@
 require_relative "package"
 require_relative "../mixin/which"
 require_relative "../mixin/shell_out"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb
index cf35714931..b6b484ff53 100644
--- a/lib/chef/resource/dsc_script.rb
+++ b/lib/chef/resource/dsc_script.rb
@@ -19,7 +19,7 @@
 require_relative "../resource"
 require_relative "../exceptions"
 require_relative "../dsl/powershell"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index a5fc40676e..a385b79123 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -18,7 +18,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/gem_package.rb b/lib/chef/resource/gem_package.rb
index 8832aedd90..63233d5cb6 100644
--- a/lib/chef/resource/gem_package.rb
+++ b/lib/chef/resource/gem_package.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "package"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/homebrew_package.rb b/lib/chef/resource/homebrew_package.rb
index 889a87cd81..88c0fce98f 100644
--- a/lib/chef/resource/homebrew_package.rb
+++ b/lib/chef/resource/homebrew_package.rb
@@ -19,7 +19,7 @@
 
 require_relative "../provider/package"
 require_relative "package"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb
index 25397f0301..021947ffe7 100644
--- a/lib/chef/resource/locale.rb
+++ b/lib/chef/resource/locale.rb
@@ -16,7 +16,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb
index 303e24d94f..06f80b7611 100644
--- a/lib/chef/resource/ohai.rb
+++ b/lib/chef/resource/ohai.rb
@@ -19,7 +19,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 require "ohai" unless defined?(Ohai::System)
 
 class Chef
diff --git a/lib/chef/resource/reboot.rb b/lib/chef/resource/reboot.rb
index 0faaf19462..418a12c183 100644
--- a/lib/chef/resource/reboot.rb
+++ b/lib/chef/resource/reboot.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb
index af98714100..0387e68c4b 100644
--- a/lib/chef/resource/ruby_block.rb
+++ b/lib/chef/resource/ruby_block.rb
@@ -19,7 +19,7 @@
 
 require_relative "../resource"
 require_relative "../provider/ruby_block"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index 73a3c05acd..d2e6c8c701 100644
--- a/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
@@ -20,7 +20,7 @@
 require "chef-utils/dsl/service" unless defined?(ChefUtils::DSL::Service)
 require_relative "../resource"
 require "shellwords" unless defined?(Shellwords)
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb
index 3d812b918b..ad34299aca 100644
--- a/lib/chef/resource/ssh_known_hosts_entry.rb
+++ b/lib/chef/resource/ssh_known_hosts_entry.rb
@@ -18,7 +18,7 @@
 # limitations under the License.
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb
index f62f2b17aa..9287e39afc 100644
--- a/lib/chef/resource/systemd_unit.rb
+++ b/lib/chef/resource/systemd_unit.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 require "iniparse"
 
 class Chef
diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb
index b1f6342ec8..079bb8a8ca 100644
--- a/lib/chef/resource/template.rb
+++ b/lib/chef/resource/template.rb
@@ -20,7 +20,7 @@
 
 require_relative "file"
 require_relative "../mixin/securable"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb
index b86fa57c74..616f7da2cd 100644
--- a/lib/chef/resource/windows_ad_join.rb
+++ b/lib/chef/resource/windows_ad_join.rb
@@ -16,7 +16,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/windows_certificate.rb b/lib/chef/resource/windows_certificate.rb
index 5620176321..4a563e9bc4 100644
--- a/lib/chef/resource/windows_certificate.rb
+++ b/lib/chef/resource/windows_certificate.rb
@@ -23,7 +23,7 @@ module Win32
   autoload :Certstore, "win32-certstore" if Chef::Platform.windows?
 end
 autoload :OpenSSL, "openssl"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/windows_workgroup.rb b/lib/chef/resource/windows_workgroup.rb
index f06dca689b..8bd972e176 100644
--- a/lib/chef/resource/windows_workgroup.rb
+++ b/lib/chef/resource/windows_workgroup.rb
@@ -16,7 +16,7 @@
 #
 
 require_relative "../resource"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/yum_package.rb b/lib/chef/resource/yum_package.rb
index 6ded3d5edb..6d06465c34 100644
--- a/lib/chef/resource/yum_package.rb
+++ b/lib/chef/resource/yum_package.rb
@@ -17,7 +17,7 @@
 #
 
 require_relative "package"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class Resource
diff --git a/lib/chef/shell/ext.rb b/lib/chef/shell/ext.rb
index 2cc4d022ae..5f30491955 100644
--- a/lib/chef/shell/ext.rb
+++ b/lib/chef/shell/ext.rb
@@ -25,7 +25,7 @@ require_relative "shell_session"
 require_relative "model_wrapper"
 require_relative "../server_api"
 require_relative "../json_compat"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 module Shell
   module Extensions
diff --git a/lib/chef/shell/shell_session.rb b/lib/chef/shell/shell_session.rb
index 4042f15ee9..7459be16b0 100644
--- a/lib/chef/shell/shell_session.rb
+++ b/lib/chef/shell/shell_session.rb
@@ -28,7 +28,7 @@ require_relative "../run_list/run_list_expansion"
 require_relative "../formatters/base"
 require_relative "../formatters/doc"
 require_relative "../formatters/minimal"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 module Shell
   class ShellSession
diff --git a/lib/chef/train_transport.rb b/lib/chef/train_transport.rb
index cea51d76c3..fc9ad98fc3 100644
--- a/lib/chef/train_transport.rb
+++ b/lib/chef/train_transport.rb
@@ -17,7 +17,7 @@
 
 require "chef-config/mixin/credentials"
 autoload :Train, "train"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 class Chef
   class TrainTransport
diff --git a/spec/functional/resource/windows_task_spec.rb b/spec/functional/resource/windows_task_spec.rb
index 2347db5af1..97ab66c7f5 100644
--- a/spec/functional/resource/windows_task_spec.rb
+++ b/spec/functional/resource/windows_task_spec.rb
@@ -18,7 +18,7 @@
 
 require "spec_helper"
 require "chef/provider/windows_task"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 describe Chef::Resource::WindowsTask, :windows_only do
   # resource.task.application_name will default to task_name unless resource.command is set
diff --git a/spec/integration/client/exit_code_spec.rb b/spec/integration/client/exit_code_spec.rb
index 4a69d61a53..53a8f1f895 100644
--- a/spec/integration/client/exit_code_spec.rb
+++ b/spec/integration/client/exit_code_spec.rb
@@ -5,7 +5,7 @@ require "chef/mixin/shell_out"
 require "tiny_server"
 require "tmpdir"
 require "chef/platform"
-require "chef-utils/dist/infra"
+require "chef-utils/dist"
 
 describe "chef-client" do
 
diff --git a/spec/unit/cookbook/synchronizer_spec.rb b/spec/unit/cookbook/synchronizer_spec.rb
index 9a2b1448a7..8df5c1d73f 100644
--- a/spec/unit/cookbook/synchronizer_spec.rb
+++ b/spec/unit/cookbook/synchronizer_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 require "chef/cookbook/synchronizer"
 require "chef/cookbook_version"
-require "chef-utils/dist/solo"
+require "chef-utils/dist"
 
 describe Chef::CookbookCacheCleaner do
   describe "when cleaning up unused cookbook components" do