Merge pull request #8454 from chef/more_branding

Update more brand names to current

5 files changed, 16 insertions, 14 deletions

diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb
index 1294231e24..66853c58fb 100644
--- a/lib/chef/data_collector.rb
+++ b/lib/chef/data_collector.rb
@@ -26,6 +26,7 @@ require "chef/data_collector/run_end_message"
 require "chef/data_collector/run_start_message"
 require "chef/data_collector/config_validation"
 require "chef/data_collector/error_handlers"
+require "chef/dist"
 
 class Chef
   class DataCollector
@@ -303,7 +304,7 @@ class Chef
           return false
         when running_mode == :client && Chef::Config[:data_collector][:token]
           Chef::Log.warn("Data collector token authentication is not recommended for client-server mode. " \
-                         "Please upgrade Chef Server to 12.11.0 and remove the token from your config file " \
+                         "Please upgrade #{Chef::Dist::SERVER_PRODUCT} to 12.11 or later and remove the token from your config file " \
                          "to use key based authentication instead")
           return true
         when Chef::Config[:data_collector][:output_locations] && Chef::Config[:data_collector][:output_locations][:files] && !Chef::Config[:data_collector][:output_locations][:files].empty?
@@ -311,7 +312,7 @@ class Chef
           return true
         when running_mode == :solo && !Chef::Config[:data_collector][:token]
           # we are in solo mode and are not logging to a file, so must have a token
-          Chef::Log.trace("Data collector token must be configured to use Chef Automate data collector with Chef Solo")
+          Chef::Log.trace("Data collector token must be configured to use Chef Automate data collector with #{Chef::Dist::PRODUCT} Solo")
           return false
         else
           return true
diff --git a/lib/chef/formatters/error_inspectors/api_error_formatting.rb b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
index b94545ab48..6dd6ed292f 100644
--- a/lib/chef/formatters/error_inspectors/api_error_formatting.rb
+++ b/lib/chef/formatters/error_inspectors/api_error_formatting.rb
@@ -130,7 +130,7 @@ class Chef
       end
 
       def describe_503_error(error_description)
-        error_description.section("Server Unavailable", "The Chef Server is temporarily unavailable")
+        error_description.section("Server Unavailable", "The #{Chef::Dist::SERVER_PRODUCT} is temporarily unavailable")
         error_description.section("Server Response:", format_rest_error)
       end
 
diff --git a/lib/chef/formatters/error_inspectors/registration_error_inspector.rb b/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
index 5ba5eba39d..7ab309be70 100644
--- a/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/registration_error_inspector.rb
@@ -107,7 +107,7 @@ class Chef
             E
             error_description.section("Server Response:", format_rest_error)
           when Net::HTTPBadGateway, Net::HTTPServiceUnavailable
-            error_description.section("Server Unavailable", "The Chef Server is temporarily unavailable")
+            error_description.section("Server Unavailable", "The #{Chef::Dist::SERVER_PRODUCT} is temporarily unavailable")
             error_description.section("Server Response:", format_rest_error)
           else
             error_description.section("Unexpected API Request Failure:", format_rest_error)
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 3efb1d4d45..d6fe3564f7 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,6 +18,7 @@
 #
 
 require "chef/formatters/error_inspectors/api_error_formatting"
+require "chef/dist"
 
 class Chef
   module Formatters
@@ -77,7 +78,7 @@ class Chef
           case response
           when Net::HTTPUnauthorized
             error_description.section("Authentication Error:", <<~E)
-              Failed to authenticate to the chef server (http 401).
+              Failed to authenticate to the #{Chef::Dist::SERVER_PRODUCT} (http 401).
             E
 
             error_description.section("Server Response:", format_rest_error)
@@ -108,7 +109,7 @@ class Chef
             E
             error_description.section("Server Response:", format_rest_error)
           when Net::HTTPBadGateway, Net::HTTPServiceUnavailable
-            error_description.section("Server Unavailable", "The Chef Server is temporarily unavailable")
+            error_description.section("Server Unavailable", "The #{Chef::Dist::SERVER_PRODUCT} is temporarily unavailable")
             error_description.section("Server Response:", format_rest_error)
           else
             error_description.section("Unexpected API Request Failure:", format_rest_error)
diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb
index b1204aeb09..6054743106 100644
--- a/lib/chef/knife/core/windows_bootstrap_context.rb
+++ b/lib/chef/knife/core/windows_bootstrap_context.rb
@@ -347,7 +347,7 @@ class Chef
           <<~EOH
             @set MSIERRORCODE=!ERRORLEVEL!
             @if ERRORLEVEL 1 (
-                @echo WARNING: Failed to install Chef Client MSI package in remote context with status code !MSIERRORCODE!.
+                @echo WARNING: Failed to install #{Chef::Dist::PRODUCT} MSI package in remote context with status code !MSIERRORCODE!.
                 @echo WARNING: This may be due to a defect in operating system update KB2918614: http://support.microsoft.com/kb/2918614
                 @set OLDLOGLOCATION="%CHEF_CLIENT_MSI_LOG_PATH%-fail.log"
                 @move "%CHEF_CLIENT_MSI_LOG_PATH%" "!OLDLOGLOCATION!" > NUL
@@ -356,26 +356,26 @@ class Chef
                 @schtasks /create /f  /sc once /st 00:00:00 /tn chefclientbootstraptask /ru SYSTEM /rl HIGHEST /tr \"cmd /c #{command} & sleep 2 & waitfor /s %computername% /si chefclientinstalldone\"
 
                 @if ERRORLEVEL 1 (
-                    @echo ERROR: Failed to create Chef Client installation scheduled task with status code !ERRORLEVEL! > "&2"
+                    @echo ERROR: Failed to create #{Chef::Dist::PRODUCT} installation scheduled task with status code !ERRORLEVEL! > "&2"
                 ) else (
-                    @echo Successfully created scheduled task to install Chef Client.
+                    @echo Successfully created scheduled task to install #{Chef::Dist::PRODUCT}.
                     @schtasks /run /tn chefclientbootstraptask
                     @if ERRORLEVEL 1 (
-                        @echo ERROR: Failed to execut Chef Client installation scheduled task with status code !ERRORLEVEL!. > "&2"
+                        @echo ERROR: Failed to execut #{Chef::Dist::PRODUCT} installation scheduled task with status code !ERRORLEVEL!. > "&2"
                     ) else (
-                        @echo Successfully started Chef Client installation scheduled task.
+                        @echo Successfully started #{Chef::Dist::PRODUCT} installation scheduled task.
                         @echo Waiting for installation to complete -- this may take a few minutes...
                         waitfor chefclientinstalldone /t 600
                         if ERRORLEVEL 1 (
-                            @echo ERROR: Timed out waiting for Chef Client package to install
+                            @echo ERROR: Timed out waiting for #{Chef::Dist::PRODUCT} package to install
                         ) else (
-                            @echo Finished waiting for Chef Client package to install.
+                            @echo Finished waiting for #{Chef::Dist::PRODUCT} package to install.
                         )
                         @schtasks /delete /f /tn chefclientbootstraptask > NUL
                     )
                 )
             ) else (
-                @echo Successfully installed Chef Client package.
+                @echo Successfully installed #{Chef::Dist::PRODUCT} package.
             )
           EOH
         end