knife-cloud 1.2.1 → 1.2.3

data/lib/chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol.rb

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,9 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/chefbootstrap/bootstrap_protocol'
-require 'chef/knife/core/windows_bootstrap_context'
-require 'chef/knife/bootstrap'
-
+require "chef/knife/cloud/chefbootstrap/bootstrap_protocol"
+require "chef/knife/core/windows_bootstrap_context"
+require "chef/knife/bootstrap"
 
 class Chef
   class Knife
@@ -28,7 +27,7 @@ class Chef
       class SshBootstrapProtocol < BootstrapProtocol
 
         def initialize(config)
-          @bootstrap = (config[:image_os_type] == 'linux') ? Chef::Knife::Bootstrap.new : Chef::Knife::BootstrapWindowsSsh.new
+          @bootstrap = (config[:image_os_type] == "linux") ? Chef::Knife::Bootstrap.new : Chef::Knife::BootstrapWindowsSsh.new
           super
         end
 
@@ -38,8 +37,8 @@ class Chef
           bootstrap.config[:ssh_port] = locate_config_value(:ssh_port)
           bootstrap.config[:identity_file] = @config[:identity_file]
           bootstrap.config[:host_key_verify] = @config[:host_key_verify]
-          bootstrap.config[:use_sudo] = true unless @config[:ssh_user] == 'root'
-          bootstrap.config[:template_file] =  @config[:template_file]
+          bootstrap.config[:use_sudo] = true unless @config[:ssh_user] == "root"
+          bootstrap.config[:template_file] = @config[:template_file]
           bootstrap.config[:ssh_gateway] = locate_config_value(:ssh_gateway)
           bootstrap.config[:forward_agent] = locate_config_value(:forward_agent)
           bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
@@ -53,17 +52,17 @@ class Chef
 
           # The ssh_gateway & subnet_id are currently supported only in EC2.
           if ssh_gateway
-            print(".") until tunnel_test_ssh(ssh_gateway, @config[:bootstrap_ip_address]) {
+            print(".") until tunnel_test_ssh(ssh_gateway, @config[:bootstrap_ip_address]) do
               @initial_sleep_delay = !!locate_config_value(:subnet_id) ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
-            }
+            end
           else
-            print(".") until tcp_test_ssh(@config[:bootstrap_ip_address], locate_config_value(:ssh_port)) {
+            print(".") until tcp_test_ssh(@config[:bootstrap_ip_address], locate_config_value(:ssh_port)) do
               @initial_sleep_delay = !!locate_config_value(:subnet_id) ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
-            }
+            end
           end
         end
 
@@ -99,58 +98,54 @@ class Chef
         end
 
         def tcp_test_ssh(hostname, ssh_port)
-          begin
-            tcp_socket = TCPSocket.new(hostname, ssh_port)
-            readable = IO.select([tcp_socket], nil, nil, 5)
-            if readable
-              ssh_banner = tcp_socket.gets
-              if ssh_banner.nil? or ssh_banner.empty?
-                false
-              else
-                Chef::Log.debug("ssh accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
-                yield
-                true
-              end
-            else
+          tcp_socket = TCPSocket.new(hostname, ssh_port)
+          readable = IO.select([tcp_socket], nil, nil, 5)
+          if readable
+            ssh_banner = tcp_socket.gets
+            if ssh_banner.nil? || ssh_banner.empty?
               false
+            else
+              Chef::Log.debug("ssh accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+              yield
+              true
             end
-          rescue Errno::EPERM, Errno::ETIMEDOUT
-            Chef::Log.debug("ssh timed out: #{hostname}")
-            false
-          rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
-            Chef::Log.debug("ssh failed to connect: #{hostname}")
-            sleep 2
-            false
-           # This happens on some mobile phone networks
-          rescue Errno::ECONNRESET
-             Chef::Log.debug("ssh reset its connection: #{hostname}")
-            sleep 2
+          else
             false
-          ensure
-            tcp_socket && tcp_socket.close
           end
+        rescue Errno::EPERM, Errno::ETIMEDOUT
+          Chef::Log.debug("ssh timed out: #{hostname}")
+          false
+        rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
+          Chef::Log.debug("ssh failed to connect: #{hostname}")
+          sleep 2
+          false
+         # This happens on some mobile phone networks
+        rescue Errno::ECONNRESET
+          Chef::Log.debug("ssh reset its connection: #{hostname}")
+          sleep 2
+          false
+        ensure
+          tcp_socket && tcp_socket.close
         end
 
         def tunnel_test_ssh(ssh_gateway, hostname, &block)
-          begin
-            status = false
-            gateway = configure_ssh_gateway(ssh_gateway)
-            gateway.open(hostname, locate_config_value(:ssh_port)) do |local_tunnel_port|
-              status = tcp_test_ssh('localhost', local_tunnel_port, &block)
-            end
-            status
-          rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
-            sleep 2
-            false
-          rescue Errno::EPERM, Errno::ETIMEDOUT
-            false
+          status = false
+          gateway = configure_ssh_gateway(ssh_gateway)
+          gateway.open(hostname, locate_config_value(:ssh_port)) do |local_tunnel_port|
+            status = tcp_test_ssh("localhost", local_tunnel_port, &block)
           end
+          status
+        rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
+          sleep 2
+          false
+        rescue Errno::EPERM, Errno::ETIMEDOUT
+          false
         end
 
         def configure_ssh_gateway(ssh_gateway)
-          gw_host, gw_user = ssh_gateway.split('@').reverse
-          gw_host, gw_port = gw_host.split(':')
-          gateway_options = { :port => gw_port || 22 }
+          gw_host, gw_user = ssh_gateway.split("@").reverse
+          gw_host, gw_port = gw_host.split(":")
+          gateway_options = { port: gw_port || 22 }
 
           # Load the SSH config for the SSH gateway host.
           # Set the gateway user if it was not part of the
@@ -160,7 +155,7 @@ class Chef
           gw_user ||= ssh_gateway_config[:user]
 
           # Always use the gateway keys from the SSH Config
-          gateway_keys = ssh_gateway_config[:keys]        
+          gateway_keys = ssh_gateway_config[:keys]
 
           # Use the keys specificed on the command line if available (overrides SSH Config)
           if locate_config_value(:ssh_gateway_identity)

data/lib/chef/knife/cloud/chefbootstrap/unix_distribution.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@
 # 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 'chef/knife/cloud/chefbootstrap/bootstrap_distribution'
+require "chef/knife/cloud/chefbootstrap/bootstrap_distribution"
 
 class Chef
   class Knife
@@ -23,7 +23,7 @@ class Chef
 
         def initialize(config)
           super
-          config[:distro] =  config[:distro] || "chef-full"
+          config[:distro] = config[:distro] || "chef-full"
         end
       end
     end

data/lib/chef/knife/cloud/chefbootstrap/windows_distribution.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/knife/cloud/chefbootstrap/bootstrap_distribution'
-require 'chef/knife/bootstrap_windows_base'
+require "chef/knife/cloud/chefbootstrap/bootstrap_distribution"
+require "chef/knife/bootstrap_windows_base"
 
 class Chef
   class Knife

data/lib/chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol.rb

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/chefbootstrap/bootstrap_protocol'
+require "chef/knife/cloud/chefbootstrap/bootstrap_protocol"
 
 class Chef
   class Knife
@@ -31,33 +31,33 @@ class Chef
         end
 
         def load_winrm_deps
-          require 'winrm'
-          require 'chef/knife/bootstrap_windows_winrm'
-          require 'chef/knife/core/windows_bootstrap_context'
-          require 'chef/knife/winrm'
+          require "winrm"
+          require "chef/knife/bootstrap_windows_winrm"
+          require "chef/knife/core/windows_bootstrap_context"
+          require "chef/knife/winrm"
         end
 
         def init_bootstrap_options
-          bootstrap.config[:winrm_user] = @config[:winrm_user] || 'Administrator'
+          bootstrap.config[:winrm_user] = @config[:winrm_user] || "Administrator"
           bootstrap.config[:winrm_password] = @config[:winrm_password]
           bootstrap.config[:winrm_transport] = @config[:winrm_transport]
           bootstrap.config[:winrm_port] = @config[:winrm_port]
-          bootstrap.config[:auth_timeout] =  @config[:auth_timeout]
+          bootstrap.config[:auth_timeout] = @config[:auth_timeout]
           bootstrap.config[:winrm_ssl_verify_mode] = @config[:winrm_ssl_verify_mode]
           super
         end
 
         def wait_for_server_ready
           print "\n#{ui.color("Waiting for winrm to host (#{@config[:bootstrap_ip_address]})", :magenta)}"
-          print(".") until tcp_test_winrm(@config[:bootstrap_ip_address], @config[:winrm_port]){
+          print(".") until tcp_test_winrm(@config[:bootstrap_ip_address], @config[:winrm_port]) do
             sleep @initial_sleep_delay ||= 10
             puts("done")
-          }
+          end
         end
 
         def tcp_test_winrm(hostname, port)
           tcp_socket = TCPSocket.new(hostname, port)
-          return true
+          true
         rescue SocketError
           sleep 2
           false
@@ -82,4 +82,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/cloud/command.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 require "chef/knife/cloud/helpers"
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
@@ -29,41 +29,39 @@ class Chef
         attr_accessor :service, :custom_arguments
 
         def run
-          begin
             # Set dafult config
-            set_default_config
+          set_default_config
 
-            # validate compulsory params
-            validate!
+          # validate compulsory params
+          validate!
 
-            # validate command pre-requisites (cli options)
-            validate_params!
+          # validate command pre-requisites (cli options)
+          validate_params!
 
-            # setup the service
-            @service = create_service_instance
+          # setup the service
+          @service = create_service_instance
 
-            service.ui = ui # for interactive user prompts/messages
+          service.ui = ui # for interactive user prompts/messages
 
-            # Perform any steps before handling the command
-            before_exec_command
+          # Perform any steps before handling the command
+          before_exec_command
 
-            # exec the actual cmd
-            execute_command
+          # exec the actual cmd
+          execute_command
 
-            # Perform any steps after handling the command
-            after_exec_command
-          rescue CloudExceptions::KnifeCloudError => e
-            Chef::Log.debug(e.message)
-            exit 1
-          end
+          # Perform any steps after handling the command
+          after_exec_command
+        rescue CloudExceptions::KnifeCloudError => e
+          Chef::Log.debug(e.message)
+          exit 1
         end
 
         def create_service_instance
-          raise Chef::Exceptions::Override, "You must override create_service_instance in #{self.to_s} to create cloud specific service"
+          raise Chef::Exceptions::Override, "You must override create_service_instance in #{self} to create cloud specific service"
         end
 
         def execute_command
-          raise Chef::Exceptions::Override, "You must override execute_command in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override execute_command in #{self}"
         end
 
         # Derived classes can override before_exec_command and after_exec_command
@@ -84,18 +82,17 @@ class Chef
             errors << "You did not provide a valid '#{pretty_key(k)}' value." if locate_config_value(k).nil?
           end
           error_message = ""
-          raise CloudExceptions::ValidationError, error_message if errors.each{|e| ui.error(e); error_message = "#{error_message} #{e}."}.any?
+          raise CloudExceptions::ValidationError, error_message if errors.each { |e| ui.error(e); error_message = "#{error_message} #{e}." }.any?
         end
 
         def validate_params!
         end
 
         def pretty_key(key)
-          key.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
+          key.to_s.tr("_", " ").gsub(/\w+/) { |w| (w =~ /(ssh)|(aws)/i) ? w.upcase : w.capitalize }
         end
 
       end # class Command
     end
   end
 end
-

data/lib/chef/knife/cloud/exceptions.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,4 +36,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/cloud/fog/options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 #
 
 class Chef
@@ -11,15 +11,15 @@ class Chef
         def self.included(includer)
           includer.instance_eval do
             option :fog_version,
-              :long => "--fog-version version",
-              :description => "Fog gem version to use. Use the ruby gem version strings",
-              :default => "",
-              :proc => Proc.new { |v| Chef::Config[:knife][:cloud_fog_version] = v}
+              long: "--fog-version version",
+              description: "Fog gem version to use. Use the ruby gem version strings",
+              default: "",
+              proc: Proc.new { |v| Chef::Config[:knife][:cloud_fog_version] = v }
 
             option :api_endpoint,
-              :long => "--api-endpoint ENDPOINT",
-              :description => "Your API endpoint. Eg, for Eucalyptus it can be 'http://ecc.eucalyptus.com:8773/services/Eucalyptus'",
-              :proc => Proc.new { |endpoint| Chef::Config[:knife][:api_endpoint] = endpoint }
+              long: "--api-endpoint ENDPOINT",
+              description: "Your API endpoint. Eg, for Eucalyptus it can be 'http://ecc.eucalyptus.com:8773/services/Eucalyptus'",
+              proc: Proc.new { |endpoint| Chef::Config[:knife][:api_endpoint] = endpoint }
 
           end
         end

data/lib/chef/knife/cloud/fog/service.rb

@@ -1,11 +1,11 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 #
 
-require 'chef/knife/cloud/service'
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/cloud/service"
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
@@ -18,26 +18,24 @@ class Chef
         end
 
         def load_fog_gem
-          begin
             # Load specific version of fog. Any other classes/modules using fog are loaded after this.
-            gem "fog", Chef::Config[:knife][:cloud_fog_version]
-            require 'fog'
-            Chef::Log.debug("Using fog version: #{Gem.loaded_specs["fog"].version}")
-          rescue Exception => e
-            Chef::Log.error "Error loading fog gem."
-            exit 1
-          end
+          gem "fog", Chef::Config[:knife][:cloud_fog_version]
+          require "fog"
+          Chef::Log.debug("Using fog version: #{Gem.loaded_specs["fog"].version}")
+        rescue Exception
+          Chef::Log.error "Error loading fog gem."
+          exit 1
         end
 
         def connection
           add_api_endpoint
           @connection ||= begin
-            connection  = Fog::Compute.new(@auth_params)
-                          rescue Excon::Errors::Unauthorized => e
+                            Fog::Compute.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::Errors::SocketError => e
+                          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}"
@@ -46,12 +44,12 @@ class Chef
 
         def network
           @network ||= begin
-            network = Fog::Network.new(@auth_params)
-                      rescue Excon::Errors::Unauthorized => e
+                        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::Errors::SocketError => e
+                      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}"
@@ -67,9 +65,9 @@ class Chef
           begin
             add_custom_attributes(options[:server_def])
             server = connection.servers.create(options[:server_def])
-          rescue Excon::Errors::BadRequest => e
+          rescue Excon::Error::BadRequest => e
             response = Chef::JSONCompat.from_json(e.response.body)
-            if response['badRequest']['code'] == 400
+            if response["badRequest"]["code"] == 400
               message = "Bad request (400): #{response['badRequest']['message']}"
               ui.fatal(message)
             else
@@ -91,26 +89,24 @@ class Chef
         end
 
         def delete_server(server_name)
-          begin
-            server = get_server(server_name)
-            msg_pair("Instance Name", get_server_name(server))
-            msg_pair("Instance ID", server.id)
+          server = get_server(server_name)
+          msg_pair("Instance Name", get_server_name(server))
+          msg_pair("Instance ID", server.id)
 
-            puts "\n"
-            ui.confirm("Do you really want to delete this server")
+          puts "\n"
+          ui.confirm("Do you really want to delete this server")
 
-            # delete the server
-            server.destroy
-          rescue NoMethodError
-            error_message = "Could not locate server '#{server_name}'."
-            ui.error(error_message)
-            raise CloudExceptions::ServerDeleteError, error_message
-          rescue Excon::Errors::BadRequest => e
-            handle_excon_exception(CloudExceptions::ServerDeleteError, e)
-          end
+          # delete the server
+          server.destroy
+        rescue NoMethodError
+          error_message = "Could not locate server '#{server_name}'."
+          ui.error(error_message)
+          raise CloudExceptions::ServerDeleteError, error_message
+        rescue Excon::Error::BadRequest => e
+          handle_excon_exception(CloudExceptions::ServerDeleteError, e)
         end
 
-        ["servers", "images", "networks"].each do |resource_type|
+        %w{servers images networks}.each do |resource_type|
           define_method("list_#{resource_type}") do
             begin
               case resource_type
@@ -119,7 +115,7 @@ class Chef
               else
                 connection.method(resource_type).call.all
               end
-            rescue Excon::Errors::BadRequest => e
+            rescue Excon::Error::BadRequest => e
               handle_excon_exception(CloudExceptions::CloudAPIException, e)
             end
           end
@@ -137,40 +133,38 @@ class Chef
         end
 
         def list_resource_configurations
-          begin
-            connection.flavors.all
-          rescue Excon::Errors::BadRequest => e
-            handle_excon_exception(CloudExceptions::CloudAPIException, e)
-          end
+          connection.flavors.all
+        rescue Excon::Error::BadRequest => e
+          handle_excon_exception(CloudExceptions::CloudAPIException, e)
         end
 
         def list_addresses
           connection.addresses.all
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::CloudAPIException, e)
         end
 
         def release_address(address_id)
           response = get_address(address_id)
-          msg_pair('IP address', get_address_ip(response))
+          msg_pair("IP address", get_address_ip(response))
           puts
-          ui.confirm('Do you really want to delete this ip')
+          ui.confirm("Do you really want to delete this ip")
           connection.release_address(address_id)
         rescue Fog::Compute::OpenStack::NotFound => e
-          error_message = 'Floating ip not found.'
+          error_message = "Floating ip not found."
           ui.error(error_message)
           raise CloudExceptions::NotFoundError, "#{e.message}"
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
         def get_address_ip(response)
-          response.body['floating_ip']['ip'] if response.body['floating_ip']
+          response.body["floating_ip"]["ip"] if response.body["floating_ip"]
         end
 
         def get_address(address_id)
           connection.get_address(address_id)
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
@@ -178,29 +172,29 @@ class Chef
           response = connection.allocate_address(pool)
           response.body
         rescue Fog::Compute::OpenStack::NotFound => e
-          error_message = 'Floating ip pool not found.'
+          error_message = "Floating ip pool not found."
           ui.error(error_message)
           raise CloudExceptions::NotFoundError, "#{e.message}"
-        rescue Excon::Errors::Forbidden => e
+        rescue Excon::Error::Forbidden => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
         def associate_address(*args)
           connection.associate_address(*args)
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
         def disassociate_address(*args)
           connection.disassociate_address(*args)
         rescue Fog::Compute::OpenStack::NotFound
-          error_message = 'Floating ip not found.'
+          error_message = "Floating ip not found."
           ui.error(error_message)
-        rescue Excon::Errors::UnprocessableEntity => e
+        rescue Excon::Error::UnprocessableEntity => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
@@ -209,7 +203,7 @@ class Chef
         end
 
         def add_api_endpoint
-          raise Chef::Exceptions::Override, "You must override add_api_endpoint in #{self.to_s} to add endpoint in auth_params for connection"
+          raise Chef::Exceptions::Override, "You must override add_api_endpoint in #{self} to add endpoint in auth_params for connection"
         end
 
         def get_server_name(server)
@@ -218,16 +212,16 @@ class Chef
 
         def get_server(instance_id)
           connection.servers.get(instance_id)
-        rescue Excon::Errors::BadRequest => e
+        rescue Excon::Error::BadRequest => e
           handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
 
         def get_image(name_or_id)
-          connection.images.find{|img| img.name =~ /#{name_or_id}/ || img.id == name_or_id }
+          connection.images.find { |img| img.name =~ /#{name_or_id}/ || img.id == name_or_id }
         end
 
         def get_flavor(name_or_id)
-          connection.flavors.find{|f| f.name == name_or_id || f.id == name_or_id }
+          connection.flavors.find { |f| f.name == name_or_id || f.id == name_or_id }
         end
 
         def server_summary(server, columns_with_info = [])
@@ -249,7 +243,7 @@ class Chef
 
         def is_image_windows?(image)
           image_info = connection.images.get(image)
-          !image_info.nil? ? image_info.platform == 'windows' : false
+          !image_info.nil? ? image_info.platform == "windows" : false
         end
       end
     end