Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chefstyle fixes #113

Merged
merged 1 commit into from
Jan 17, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/chef/knife/cloud/fog/service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ def connection
def network
@network ||= begin
Fog::Network.new(@auth_params)
rescue Excon::Error::Unauthorized => e
error_message = "Connection failure, please check your username and password."
ui.fatal(error_message)
raise CloudExceptions::ServiceConnectionError, "#{e.message}. #{error_message}"
rescue Excon::Error::Socket => e
error_message = "Connection failure, please check your authentication URL."
ui.fatal(error_message)
raise CloudExceptions::ServiceConnectionError, "#{e.message}. #{error_message}"
rescue Fog::Errors::NotFound => e
error_message = "No Network service found. This command is unavailable with current cloud."
ui.fatal(error_message)
raise CloudExceptions::NetworkNotFoundError, "#{e.message}. #{error_message}"
rescue Excon::Error::Unauthorized => e
error_message = "Connection failure, please check your username and password."
ui.fatal(error_message)
raise CloudExceptions::ServiceConnectionError, "#{e.message}. #{error_message}"
rescue Excon::Error::Socket => e
error_message = "Connection failure, please check your authentication URL."
ui.fatal(error_message)
raise CloudExceptions::ServiceConnectionError, "#{e.message}. #{error_message}"
rescue Fog::Errors::NotFound => e
error_message = "No Network service found. This command is unavailable with current cloud."
ui.fatal(error_message)
raise CloudExceptions::NetworkNotFoundError, "#{e.message}. #{error_message}"
end
end

Expand Down