knife-cloud 1.2.1 → 1.2.3

data/lib/chef/knife/cloud/helpers.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");
@@ -21,7 +21,7 @@ class Chef
       module Helpers
 
         # Additional helpers
-        def msg_pair(label, value, color=:cyan)
+        def msg_pair(label, value, color = :cyan)
           if value && !value.to_s.empty?
             puts "#{ui.color(label, color)}: #{value}"
           end
@@ -36,4 +36,3 @@ class Chef
     end
   end
 end
-

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

@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/command'
+require "chef/knife/cloud/command"
 
 class Chef
   class Knife
     class Cloud
       class ResourceListCommand < Command
 
-        def initialize(argv=[])
+        def initialize(argv = [])
           super argv
           # columns_with_info is array of hash with label, key and attribute extraction callback, ex [{:label => "Label text", :key => 'key', value_callback => callback_method to extract/format the required value}, ...]
           @columns_with_info = []
@@ -40,14 +40,14 @@ class Chef
 
         def query_resource
           # specific resource type must override this.
-          raise Chef::Exceptions::Override, "You must override query_resource in #{self.to_s} to return resources."
+          raise Chef::Exceptions::Override, "You must override query_resource in #{self} to return resources."
         end
 
         def is_resource_filtered?(attribute, value)
           # resource_filters is array of filters in form {:attribute => attribute-name, :regex => 'filter regex value'}
           return false if @resource_filters.nil?
           @resource_filters.each do |filter|
-            if attribute == filter[:attribute] and value =~ filter[:regex]
+            if attribute == filter[:attribute] && value =~ filter[:regex]
               return true
             end
           end
@@ -70,11 +70,11 @@ class Chef
 
         # When @columns_with_info is nil display all
         def list(resources)
-          if(config[:format] == "summary")
+          if config[:format] == "summary"
             # display column wise only if @columns_with_info is specified, else as a json for readable display.
             begin
               resource_list = @columns_with_info.map { |col_info| ui.color(col_info[:label], :bold) } if @columns_with_info.length > 0
-              resources.sort_by{|x| x.send(@sort_by_field).downcase }.each do |resource|
+              resources.sort_by { |x| x.send(@sort_by_field).downcase }.each do |resource|
                 if @columns_with_info.length > 0
                   list = get_resource_col_val(resource)
                   resource_list.concat(list) unless list.nil?
@@ -99,4 +99,3 @@ class Chef
     end
   end
 end
-

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

@@ -8,14 +8,14 @@ class Chef
           includer.class_eval do
 
             option :disable_filter,
-            :long => "--disable-filter",
-            :description => "Disable filtering of the current resource listing.",
-            :boolean => true,
-            :default => false
+            long: "--disable-filter",
+            description: "Disable filtering of the current resource listing.",
+            boolean: true,
+            default: false
           end
         end
 
       end
     end
   end
-end
+end

data/lib/chef/knife/cloud/server/create_command.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");
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/knife/cloud/command'
-require 'chef/knife/cloud/exceptions'
-require 'chef/knife/cloud/chefbootstrap/bootstrapper'
+require "chef/knife/cloud/command"
+require "chef/knife/cloud/exceptions"
+require "chef/knife/cloud/chefbootstrap/bootstrapper"
 
 class Chef
   class Knife
@@ -24,7 +24,7 @@ class Chef
       class ServerCreateCommand < Command
         attr_accessor :server, :create_options
 
-        def initialize(argv=[])
+        def initialize(argv = [])
           super argv
           # columns_with_info is array of hash with label, key and attribute extraction callback, ex [{:label => "Label text", :key => 'key', value_callback => callback_method to extract/format the required value}, ...]
           @columns_with_info = []
@@ -37,11 +37,11 @@ class Chef
           # validate ssh_user, ssh_password, identity_file for ssh bootstrap protocol and winrm_password for winrm bootstrap protocol
           errors = []
 
-          if locate_config_value(:bootstrap_protocol) == 'ssh'
+          if locate_config_value(:bootstrap_protocol) == "ssh"
             if locate_config_value(:identity_file).nil? && locate_config_value(:ssh_password).nil?
               errors << "You must provide either Identity file or SSH Password."
             end
-          elsif locate_config_value(:bootstrap_protocol) == 'winrm'
+          elsif locate_config_value(:bootstrap_protocol) == "winrm"
             if locate_config_value(:winrm_password).nil?
               errors << "You must provide Winrm Password."
             end
@@ -49,18 +49,16 @@ class Chef
             errors << "You must provide a valid bootstrap protocol. options [ssh/winrm]. For linux type images, options [ssh]"
           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 before_exec_command
-          begin
-            post_connection_validations
-            service.create_server_dependencies
-          rescue CloudExceptions::ServerCreateDependenciesError => e
-            ui.fatal(e.message)
-            service.delete_server_dependencies
-            raise e
-          end
+          post_connection_validations
+          service.create_server_dependencies
+        rescue CloudExceptions::ServerCreateDependenciesError => e
+          ui.fatal(e.message)
+          service.delete_server_dependencies
+          raise e
         end
 
         def execute_command
@@ -77,19 +75,17 @@ class Chef
 
         # Derived classes can override after_exec_command and also call cleanup_on_failure if any exception occured.
         def after_exec_command
-          begin
             # bootstrap the server
-            bootstrap
-          rescue CloudExceptions::BootstrapError => e
-            ui.fatal(e.message)
-            cleanup_on_failure
-            raise e
-          rescue => e
-            error_message = "Check if --bootstrap-protocol and --image-os-type is correct. #{e.message}"
-            ui.fatal(error_message)
-            cleanup_on_failure
-            raise e, error_message
-          end
+          bootstrap
+        rescue CloudExceptions::BootstrapError => e
+          ui.fatal(e.message)
+          cleanup_on_failure
+          raise e
+        rescue => e
+          error_message = "Check if --bootstrap-protocol and --image-os-type is correct. #{e.message}"
+          ui.fatal(error_message)
+          cleanup_on_failure
+          raise e, error_message
         end
 
         def cleanup_on_failure
@@ -111,7 +107,7 @@ class Chef
 
         # any cloud specific initializations/cleanup we want to do around bootstrap.
         def before_bootstrap
-          ssh_override_winrm if locate_config_value(:bootstrap_protocol) == 'ssh'
+          ssh_override_winrm if locate_config_value(:bootstrap_protocol) == "ssh"
         end
 
         def after_bootstrap
@@ -120,14 +116,14 @@ class Chef
 
         # knife-plugin can override set_default_config to set default config by using their own mechanism.
         def set_default_config
-          config[:image_os_type] = 'windows' if config[:bootstrap_protocol] == 'winrm'
+          config[:image_os_type] = "windows" if config[:bootstrap_protocol] == "winrm"
         end
 
-        #generate a random name if chef_node_name is empty
+        # generate a random name if chef_node_name is empty
         def get_node_name(chef_node_name, prefix)
           return chef_node_name unless chef_node_name.nil?
-          #lazy uuids, 15 chars cause windows has limits
-          chef_node_name = ("#{prefix}-"+rand.to_s.split('.')[1]).slice(0,14)
+          # lazy uuids, 15 chars cause windows has limits
+          ("#{prefix}-" + rand.to_s.split(".")[1]).slice(0, 14)
         end
 
         def post_connection_validations
@@ -156,10 +152,9 @@ class Chef
           if locate_config_value(:identity_file).nil? &&
               !locate_config_value(:kerberos_keytab_file).nil?
             config[:identity_file] = locate_config_value(:kerberos_keytab_file)
-          end          
+          end
         end
       end # class ServerCreateCommand
     end
   end
 end
-

data/lib/chef/knife/cloud/server/create_options.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");
@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/chefbootstrap/bootstrap_options'
-require 'chef/knife/cloud/server/options'
+require "chef/knife/cloud/chefbootstrap/bootstrap_options"
+require "chef/knife/cloud/server/options"
 
 class Chef
   class Knife
@@ -28,47 +28,47 @@ class Chef
             include ServerOptions
             include BootstrapOptions
             option :image,
-              :short => "-I IMAGE",
-              :long => "--image IMAGE",
-              :description => "A regexp matching an image name or an image ID for the server",
-              :proc => Proc.new { |i| Chef::Config[:knife][:image] = i }
+              short: "-I IMAGE",
+              long: "--image IMAGE",
+              description: "A regexp matching an image name or an image ID for the server",
+              proc: Proc.new { |i| Chef::Config[:knife][:image] = i }
 
             option :image_os_type,
-              :short => "-T IMAGE_OS_TYPE",
-              :long => "--image-os-type IMAGE_OS_TYPE",
-              :description => "The image os type. options [windows/linux]. Only required when cloud does not provide a way to identify image os",
-              :default => "linux",
-              :proc => Proc.new { |i| Chef::Config[:knife][:image_os_type] = i }
+              short: "-T IMAGE_OS_TYPE",
+              long: "--image-os-type IMAGE_OS_TYPE",
+              description: "The image os type. options [windows/linux]. Only required when cloud does not provide a way to identify image os",
+              default: "linux",
+              proc: Proc.new { |i| Chef::Config[:knife][:image_os_type] = i }
 
             option :flavor,
-              :short => "-f FLAVOR_ID",
-              :long => "--flavor FLAVOR_ID",
-              :description => "The flavor name or ID of server",
-              :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f }
+              short: "-f FLAVOR_ID",
+              long: "--flavor FLAVOR_ID",
+              description: "The flavor name or ID of server",
+              proc: Proc.new { |f| Chef::Config[:knife][:flavor] = f }
 
             option :bootstrap_protocol,
-              :long => "--bootstrap-protocol protocol",
-              :description => "Protocol to bootstrap servers. options: winrm/ssh. For linux servers always use ssh.",
-              :default => 'ssh',
-              :proc => Proc.new { |b| Chef::Config[:knife][:bootstrap_protocol] = b}
+              long: "--bootstrap-protocol protocol",
+              description: "Protocol to bootstrap servers. options: winrm/ssh. For linux servers always use ssh.",
+              default: "ssh",
+              proc: Proc.new { |b| Chef::Config[:knife][:bootstrap_protocol] = b }
 
             option :server_create_timeout,
-              :long => "--server-create-timeout timeout",
-              :description => "How long to wait until the server is ready; default is 600 seconds",
-              :default => 600,
-              :proc => Proc.new { |v| Chef::Config[:knife][:server_create_timeout] = v}
-            
+              long: "--server-create-timeout timeout",
+              description: "How long to wait until the server is ready; default is 600 seconds",
+              default: 600,
+              proc: Proc.new { |v| Chef::Config[:knife][:server_create_timeout] = v }
+
             option :delete_server_on_failure,
-              :long => "--delete-server-on-failure",
-              :boolean => true,
-              :default => false,
-              :description => "Destroy corresponding server in case of failure"
+              long: "--delete-server-on-failure",
+              boolean: true,
+              default: false,
+              description: "Destroy corresponding server in case of failure"
 
             option :chef_node_name_prefix,
-              :long => "--chef-node-name-prefix PREFIX_FOR_NODE_NAME",
-              :description => "The prefix for chef node name",
-              :default => includer.snake_case_name.split('_').first,
-              :proc => Proc.new { |key| Chef::Config[:knife][:chef_node_name_prefix] = key }
+              long: "--chef-node-name-prefix PREFIX_FOR_NODE_NAME",
+              description: "The prefix for chef node name",
+              default: includer.snake_case_name.split("_").first,
+              proc: Proc.new { |key| Chef::Config[:knife][:chef_node_name_prefix] = key }
 
           end
         end
@@ -77,4 +77,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/cloud/server/delete_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,10 +16,10 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/command'
+require "chef/knife/cloud/command"
 # These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
+require "chef/node"
+require "chef/api_client"
 
 class Chef
   class Knife
@@ -41,7 +41,7 @@ class Chef
             destroy_item(Chef::ApiClient, thing_to_delete, "client")
           else
             ui.warn("Corresponding node and client for the #{server_name} server were not deleted and remain registered with the Chef Server")
-            end
+          end
         end
 
         # Extracted from Chef::Knife.delete_object, because it has a
@@ -50,19 +50,16 @@ class Chef
         # the user is already making their intent known.  It is not
         # necessary to make them confirm two more times.
         def destroy_item(klass, name, type_name)
-          begin
-            object = klass.load(name)
-            object.destroy
-            ui.warn("Deleted #{type_name} #{name}")
-          rescue Net::HTTPServerException => e
-            error_message = "#{e.message}. Could not find a #{type_name} named #{name} to delete!"
-            ui.warn(error_message)
-            raise CloudExceptions::ServerDeleteError, error_message
-          end
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException => e
+          error_message = "#{e.message}. Could not find a #{type_name} named #{name} to delete!"
+          ui.warn(error_message)
+          raise CloudExceptions::ServerDeleteError, error_message
         end
 
       end # class ServerDeleteCommand
     end
   end
 end
-

data/lib/chef/knife/cloud/server/delete_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.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cloud/server/options'
+require "chef/knife/cloud/server/options"
 
 class Chef
   class Knife
@@ -27,11 +27,11 @@ class Chef
             include ServerOptions
 
             option :purge,
-              :short => "-P",
-              :long => "--purge",
-              :boolean => true,
-              :default => false,
-              :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Cloud node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+              short: "-P",
+              long: "--purge",
+              boolean: true,
+              default: false,
+              description: "Destroy corresponding node and client on the Chef Server, in addition to destroying the Cloud node itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
 
           end
         end
@@ -39,4 +39,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/cloud/server/list_command.rb

@@ -1,11 +1,11 @@
-require 'chef/knife/cloud/list_resource_command'
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/cloud/list_resource_command"
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
     class Cloud
       class ServerListCommand < ResourceListCommand
-        
+
         def before_exec_command
           if config[:chef_data]
             begin
@@ -16,18 +16,18 @@ class Chef
               ui.warn(error_message)
               raise CloudExceptions::ChefServerError, error_message
             end
-            
+
             @chef_data_col_info = [
-              {:label => 'Chef Node Name', :key => 'name'},
-              {:label => 'Environment', :key => 'chef_environment'},
-              {:label => 'FQDN', :key => 'fqdn'},
-              {:label => 'Runlist', :key => 'run_list'},
-              {:label => 'Tags', :key => 'tags'},
-              {:label => 'Platform', :key => 'platform'},
+              { label: "Chef Node Name", key: "name" },
+              { label: "Environment", key: "chef_environment" },
+              { label: "FQDN", key: "fqdn" },
+              { label: "Runlist", key: "run_list" },
+              { label: "Tags", key: "tags" },
+              { label: "Platform", key: "platform" },
             ]
 
             if config[:chef_node_attribute]
-              @chef_data_col_info << {:label => "#{config[:chef_node_attribute]}", :key => "#{config[:chef_node_attribute]}"}
+              @chef_data_col_info << { label: "#{config[:chef_node_attribute]}", key: "#{config[:chef_node_attribute]}" }
             end
             @columns_with_info.concat(@chef_data_col_info)
           end
@@ -40,7 +40,7 @@ class Chef
             if config[:chef_data] && @chef_data_col_info.include?(col_info)
               server_name = service.get_server_name(server)
               if @node_list.include?(server_name)
-                node =  @node_list[server_name]
+                node = @node_list[server_name]
                 # Raise serverlisting error on invalid chef_node_attribute.
                 if col_info[:key] == config[:chef_node_attribute] && ! node.attribute?(col_info[:key])
                   error_message = "The Node does not have a #{col_info[:key]} attribute."
@@ -66,16 +66,16 @@ class Chef
         end
 
         def format_server_state(state)
-           state = state.to_s.downcase
-           state_color =  case state
-                          when 'shutting-down','terminated','stopping','stopped','error','shutoff'
-                            :red
-                          when 'pending','build','paused','suspended','hard_reboot'
-                            :yellow
-                          else
-                            :green
-                          end
-            ui.color(state, state_color)              
+          state = state.to_s.downcase
+          state_color =  case state
+                         when "shutting-down", "terminated", "stopping", "stopped", "error", "shutoff"
+                           :red
+                         when "pending", "build", "paused", "suspended", "hard_reboot"
+                           :yellow
+                         else
+                           :green
+                         end
+          ui.color(state, state_color)
         end
 
       end # class ServerListCommand