summaryrefslogtreecommitdiff
path: root/lib/chef/formatters
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-05-03 10:12:06 -0700
committerTim Smith <tsmith@chef.io>2019-05-03 10:13:22 -0700
commita1ead9b142b74e579bd64efba9989b69afbfe61a (patch)
treecd74040416a1c2000dff709e3118facd9315f836 /lib/chef/formatters
parent50e700570b11558c57a1559e5af35b5e636ecfe2 (diff)
downloadchef-a1ead9b142b74e579bd64efba9989b69afbfe61a.tar.gz
Update more brand names to current
Update Chef Client and Chef Server brand names to current. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/formatters')
-rw-r--r--lib/chef/formatters/error_inspectors/api_error_formatting.rb2
-rw-r--r--lib/chef/formatters/error_inspectors/registration_error_inspector.rb2
-rw-r--r--lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb5
3 files changed, 5 insertions, 4 deletions
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)