knife-azure 1.8.7 → 1.9.0

data/lib/chef/knife/azure_image_list.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2010-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azure_base', __FILE__)
+require File.expand_path("../azure_base", __FILE__)
 
 class Chef
   class Knife
@@ -34,24 +34,22 @@ class Chef
         :boolean => true,
         :description => "Show all the fields of the images"
 
-
       def run
         $stdout.sync = true
 
         validate_asm_keys!
         items = service.list_images
 
-        image_labels = !locate_config_value(:show_all_fields) ? ['Name', 'OS', 'Location'] : ['Name', 'Category', 'Label', 'OS', 'Location']
-        image_list =  image_labels.map {|label| ui.color(label, :bold)}
+        image_labels = !locate_config_value(:show_all_fields) ? %w{Name OS Location} : %w{Name Category Label OS Location}
+        image_list =  image_labels.map { |label| ui.color(label, :bold) }
 
-        image_items = image_labels.map {|item| item.downcase }
+        image_items = image_labels.map { |item| item.downcase }
         items.each do |image|
-         image_items.each {|item| image_list << image.send(item).to_s }
+          image_items.each { |item| image_list << image.send(item).to_s }
         end
 
         puts "\n"
         puts ui.list(image_list, :uneven_columns_across, !locate_config_value(:show_all_fields) ? 3 : 5)
-
       end
     end
   end

data/lib/chef/knife/azure_internal-lb_create.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,28 +16,28 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azure_base', __FILE__)
+require File.expand_path("../azure_base", __FILE__)
 
 class Chef
   class Knife
     class AzureInternalLbCreate < Knife
       include Knife::AzureBase
 
-      banner 'knife azure internal lb create (options)'
+      banner "knife azure internal lb create (options)"
 
       option :azure_load_balancer,
-        :short => '-n NAME',
-        :long => '--azure-load-balancer NAME',
-        :description => 'Required. Specifies new load balancer name.'
+        :short => "-n NAME",
+        :long => "--azure-load-balancer NAME",
+        :description => "Required. Specifies new load balancer name."
 
       option :azure_lb_static_vip,
-        :long => '--azure-lb-static-vip VIP',
-        :description => 'Optional. The Virtual IP that will be used for the load balancer.'
+        :long => "--azure-lb-static-vip VIP",
+        :description => "Optional. The Virtual IP that will be used for the load balancer."
 
       option :azure_subnet_name,
-        :long => '--azure-subnet-name SUBNET_NAME',
-        :description => 'Required if static VIP is set. Specifies the subnet name '\
-                        'the load balancer is located in.'
+        :long => "--azure-subnet-name SUBNET_NAME",
+        :description => "Required if static VIP is set. Specifies the subnet name "\
+                        "the load balancer is located in."
 
       option :azure_dns_name,
         :long => "--azure-dns-name DNS_NAME",
@@ -46,7 +46,7 @@ class Chef
       def run
         $stdout.sync = true
 
-        Chef::Log.info('validating...')
+        Chef::Log.info("validating...")
         validate_asm_keys!(:azure_load_balancer)
 
         params = {
@@ -58,9 +58,9 @@ class Chef
 
         rsp = service.create_internal_lb(params)
         print "\n"
-        if rsp.at_css('Status').nil?
-          if rsp.at_css('Code').nil? || rsp.at_css('Message').nil?
-            puts 'Unknown Error. try -VV'
+        if rsp.at_css("Status").nil?
+          if rsp.at_css("Code").nil? || rsp.at_css("Message").nil?
+            puts "Unknown Error. try -VV"
           else
             puts "#{rsp.at_css('Code').content}: "\
                  "#{rsp.at_css('Message').content}"

data/lib/chef/knife/azure_internal-lb_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azure_base', __FILE__)
+require File.expand_path("../azure_base", __FILE__)
 
 class Chef
   class Knife
     class AzureInternalLbList < Knife
       include Knife::AzureBase
 
-      banner 'knife azure internal lb list (options)'
+      banner "knife azure internal lb list (options)"
 
       def run
         $stdout.sync = true

data/lib/chef/knife/azure_server_create.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2010-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require 'chef/knife/azure_base'
-require 'chef/knife/winrm_base'
-require 'securerandom'
-require 'chef/knife/bootstrap/bootstrap_options'
-require 'chef/knife/bootstrap/bootstrapper'
+require "chef/knife/azure_base"
+require "chef/knife/winrm_base"
+require "securerandom"
+require "chef/knife/bootstrap/bootstrap_options"
+require "chef/knife/bootstrap/bootstrapper"
 
 class Chef
   class Knife
@@ -34,11 +34,11 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        require 'chef/knife/bootstrap_windows_ssh'
-        require 'chef/knife/core/windows_bootstrap_context'
+        require "readline"
+        require "chef/json_compat"
+        require "chef/knife/bootstrap"
+        require "chef/knife/bootstrap_windows_ssh"
+        require "chef/knife/core/windows_bootstrap_context"
         Chef::Knife::Bootstrap.load_deps
       end
 
@@ -46,7 +46,6 @@ class Chef
 
       attr_accessor :initial_sleep_delay
 
-
       option :bootstrap_protocol,
         :long => "--bootstrap-protocol protocol",
         :description => "Protocol to bootstrap windows servers. options: 'winrm' or 'ssh' or 'cloud-api'.",
@@ -71,7 +70,7 @@ class Chef
         :long        => "--node-ssl-verify-mode [peer|none]",
         :description => "Whether or not to verify the SSL cert for all HTTPS requests.",
         :proc        => Proc.new { |v|
-          valid_values = ["none", "peer"]
+          valid_values = %w{none peer}
           unless valid_values.include?(v)
             raise "Invalid value '#{v}' for --node-ssl-verify-mode. Valid values are: #{valid_values.join(", ")}"
           end
@@ -131,8 +130,9 @@ class Chef
       option :azure_vm_size,
         :short => "-z SIZE",
         :long => "--azure-vm-size SIZE",
-        :description => "Optional. Size of virtual machine (ExtraSmall, Small, Medium, Large, ExtraLarge)",
-        :default => 'Small',
+        :description => "Optional. Size of virtual machine. Default is Standard_A1_v2.
+                        Eg: Standard_A1_v2, Standard_F2, Standard_G1 etc.",
+        :default => "Standard_A1_v2",
         :proc => Proc.new { |si| Chef::Config[:knife][:azure_vm_size] = si }
 
       option :azure_availability_set,
@@ -263,14 +263,14 @@ class Chef
             end
           end
         rescue Exception => e
-          Chef::Log.error("#{e.to_s}")
-          raise 'Verify connectivity to Azure and subscription resource limit compliance (e.g. maximum CPU core limits) and try again.'
+          Chef::Log.error("#{e}")
+          raise "Verify connectivity to Azure and subscription resource limit compliance (e.g. maximum CPU core limits) and try again."
         end
       end
 
       def wait_for_virtual_machine_state(vm_status_goal, total_wait_time_in_minutes, retry_interval_in_seconds)
-        vm_status_ordering = {:vm_status_not_detected => 0, :vm_status_provisioning => 1, :vm_status_ready => 2}
-        vm_status_description = {:vm_status_not_detected => 'any', :vm_status_provisioning => 'provisioning', :vm_status_ready => 'ready'}
+        vm_status_ordering = { :vm_status_not_detected => 0, :vm_status_provisioning => 1, :vm_status_ready => 2 }
+        vm_status_description = { :vm_status_not_detected => "any", :vm_status_provisioning => "provisioning", :vm_status_ready => "ready" }
 
         print ui.color("Waiting for virtual machine to reach status '#{vm_status_description[vm_status_goal]}'", :magenta)
 
@@ -283,7 +283,7 @@ class Chef
         begin
           vm_status = get_virtual_machine_status()
           vm_ready = vm_status_ordering[vm_status] >= vm_status_ordering[vm_status_goal]
-          print '.'
+          print "."
           sleep retry_interval_in_seconds if !vm_ready
           polling_attempts += 1
         end until vm_ready || polling_attempts >= max_polling_attempts
@@ -298,10 +298,9 @@ class Chef
       end
 
       def wait_for_resource_extension_state(extension_status_goal, total_wait_time_in_minutes, retry_interval_in_seconds)
+        extension_status_ordering = { :extension_status_not_detected => 0, :wagent_provisioning => 1, :extension_installing => 2, :extension_provisioning => 3, :extension_ready => 4 }
 
-        extension_status_ordering = {:extension_status_not_detected => 0, :wagent_provisioning => 1, :extension_installing => 2, :extension_provisioning => 3, :extension_ready => 4}
-
-        status_description = {:extension_status_not_detected => 'any', :wagent_provisioning => 'wagent provisioning', :extension_installing => "installing", :extension_provisioning => "provisioning", :extension_ready => "ready" }
+        status_description = { :extension_status_not_detected => "any", :wagent_provisioning => "wagent provisioning", :extension_installing => "installing", :extension_provisioning => "provisioning", :extension_ready => "ready" }
 
         print ui.color("Waiting for Resource Extension to reach status '#{status_description[extension_status_goal]}'", :magenta)
 
@@ -313,7 +312,7 @@ class Chef
         begin
           extension_status = get_extension_status()
           extension_ready = extension_status_ordering[extension_status[:status]] >= extension_status_ordering[extension_status_goal]
-          print '.'
+          print "."
           sleep retry_interval_in_seconds if !extension_ready
           polling_attempts += 1
         end until extension_ready || polling_attempts >= max_polling_attempts
@@ -328,11 +327,11 @@ class Chef
         extension_status[:status]
       end
 
-      def get_virtual_machine_status()
+      def get_virtual_machine_status
         role = service.get_role_server(locate_config_value(:azure_dns_name), locate_config_value(:azure_vm_name))
         unless role.nil?
-          Chef::Log.debug("Role status is #{role.status.to_s}")
-          if  "ReadyRole".eql? role.status.to_s
+          Chef::Log.debug("Role status is #{role.status}")
+          if "ReadyRole".eql? role.status.to_s
             return :vm_status_ready
           elsif "Provisioning".eql? role.status.to_s
             return :vm_status_provisioning
@@ -340,16 +339,16 @@ class Chef
             return :vm_status_not_detected
           end
         end
-        return :vm_status_not_detected
+        :vm_status_not_detected
       end
 
-      def get_extension_status()
+      def get_extension_status
         deployment_name = service.deployment_name(locate_config_value(:azure_dns_name))
         deployment = service.deployment("hostedservices/#{locate_config_value(:azure_dns_name)}/deployments/#{deployment_name}")
         extension_status = Hash.new
 
-        if deployment.at_css('Deployment Name') != nil
-          role_list_xml =  deployment.css('RoleInstanceList RoleInstance')
+        if deployment.at_css("Deployment Name") != nil
+          role_list_xml = deployment.css("RoleInstanceList RoleInstance")
           role_list_xml.each do |role|
             if role.at_css("RoleName").text == locate_config_value(:azure_vm_name)
               lnx_waagent_fail_msg = "Failed to deserialize the status reported by the Guest Agent"
@@ -370,7 +369,7 @@ class Chef
                   extension_status[:status] = :extension_status_not_detected
                 end
               # This fix is for linux waagent issue: api unable to deserialize the waagent status.
-              elsif (role.at_css('GuestAgentStatus Status').text == 'NotReady') && (waagent_status_msg == lnx_waagent_fail_msg)
+              elsif (role.at_css("GuestAgentStatus Status").text == "NotReady") && (waagent_status_msg == lnx_waagent_fail_msg)
                 extension_status[:status] = :extension_ready
               else
                 extension_status[:status] = :wagent_provisioning
@@ -383,7 +382,7 @@ class Chef
         else
           extension_status[:status] = :extension_status_not_detected
         end
-        return extension_status
+        extension_status
       end
 
       def run
@@ -399,14 +398,14 @@ class Chef
         config[:chef_node_name] = locate_config_value(:azure_vm_name) unless locate_config_value(:chef_node_name)
         service.create_server(create_server_def)
         wait_until_virtual_machine_ready()
-        if locate_config_value(:bootstrap_protocol) == 'cloud-api' && locate_config_value(:extended_logs)
+        if locate_config_value(:bootstrap_protocol) == "cloud-api" && locate_config_value(:extended_logs)
           print "\n\nWaiting for the first chef-client run"
           fetch_chef_client_logs(Time.now, 30)
         end
         server = service.get_role_server(locate_config_value(:azure_dns_name), locate_config_value(:azure_vm_name))
         msg_server_summary(server)
 
-        bootstrap_exec(server) unless locate_config_value(:bootstrap_protocol) == 'cloud-api'
+        bootstrap_exec(server) unless locate_config_value(:bootstrap_protocol) == "cloud-api"
       end
 
       def create_server_def
@@ -436,7 +435,7 @@ class Chef
           :winrm_max_memoryPerShell => locate_config_value(:winrm_max_memory_per_shell)
         }
 
-        if locate_config_value(:bootstrap_protocol) == 'cloud-api'
+        if locate_config_value(:bootstrap_protocol) == "cloud-api"
           server_def[:chef_extension] = get_chef_extension_name
           server_def[:chef_extension_publisher] = get_chef_extension_publisher
           server_def[:chef_extension_version] = get_chef_extension_version
@@ -444,7 +443,7 @@ class Chef
           server_def[:chef_extension_private_param] = get_chef_extension_private_params
         else
           if is_image_windows?
-            if not locate_config_value(:winrm_password) or not locate_config_value(:bootstrap_protocol)
+            if (not locate_config_value(:winrm_password)) || (not locate_config_value(:bootstrap_protocol))
               ui.error("WinRM Password and Bootstrapping Protocol are compulsory parameters")
               exit 1
             end
@@ -465,7 +464,7 @@ class Chef
               ui.error("SSH User is compulsory parameter")
               exit 1
             end
-            unless locate_config_value(:ssh_password) or locate_config_value(:identity_file)
+            unless locate_config_value(:ssh_password) || locate_config_value(:identity_file)
               ui.error("Specify either SSH Key or SSH Password")
               exit 1
             end
@@ -473,12 +472,12 @@ class Chef
         end
 
         if is_image_windows?
-          server_def[:os_type] = 'Windows'
+          server_def[:os_type] = "Windows"
           server_def[:admin_password] = locate_config_value(:winrm_password)
           server_def[:bootstrap_proto] = locate_config_value(:bootstrap_protocol)
         else
-          server_def[:os_type] = 'Linux'
-          server_def[:bootstrap_proto] = (locate_config_value(:bootstrap_protocol) == 'winrm') ? 'ssh' : locate_config_value(:bootstrap_protocol)
+          server_def[:os_type] = "Linux"
+          server_def[:bootstrap_proto] = (locate_config_value(:bootstrap_protocol) == "winrm") ? "ssh" : locate_config_value(:bootstrap_protocol)
           server_def[:ssh_user] = locate_config_value(:ssh_user)
           server_def[:ssh_password] = locate_config_value(:ssh_password)
           server_def[:identity_file] = locate_config_value(:identity_file)
@@ -486,11 +485,11 @@ class Chef
         end
 
         azure_connect_to_existing_dns = locate_config_value(:azure_connect_to_existing_dns)
-        if is_image_windows? && server_def[:bootstrap_proto] == 'winrm'
-          port = locate_config_value(:winrm_port) || '5985'
+        if is_image_windows? && server_def[:bootstrap_proto] == "winrm"
+          port = locate_config_value(:winrm_port) || "5985"
           port = locate_config_value(:winrm_port) || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
-        elsif server_def[:bootstrap_proto] == 'ssh'
-          port = locate_config_value(:ssh_port) || '22'
+        elsif server_def[:bootstrap_proto] == "ssh"
+          port = locate_config_value(:ssh_port) || "22"
           port = locate_config_value(:ssh_port) || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
         end
 
@@ -502,11 +501,11 @@ class Chef
         if locate_config_value(:azure_domain_user)
           # extract domain name since it should be part of username
           case locate_config_value(:azure_domain_user)
-          when /(\S+)\\(.+)/  # format - fully-qualified-DNS-domain\username
+          when /(\S+)\\(.+)/ # format - fully-qualified-DNS-domain\username
             server_def[:azure_domain_name] = $1 if locate_config_value(:azure_domain_name).nil?
             server_def[:azure_user_domain_name] = $1
             server_def[:azure_domain_user] = $2
-          when /(.+)@(\S+)/  # format - user@fully-qualified-DNS-domain
+          when /(.+)@(\S+)/ # format - user@fully-qualified-DNS-domain
             server_def[:azure_domain_name] = $2 if locate_config_value(:azure_domain_name).nil?
             server_def[:azure_user_domain_name] = $2
             server_def[:azure_domain_user] = $1
@@ -557,7 +556,7 @@ class Chef
       def get_dns_name(azure_dns_name, prefix = "az-")
         return azure_dns_name unless azure_dns_name.nil?
         if locate_config_value(:azure_vm_name).nil?
-          azure_dns_name = prefix + SecureRandom.hex(( MAX_VM_NAME_CHARACTERS - prefix.length)/2)
+          azure_dns_name = prefix + SecureRandom.hex(( MAX_VM_NAME_CHARACTERS - prefix.length) / 2)
         else
           azure_dns_name = locate_config_value(:azure_vm_name)
         end

data/lib/chef/knife/azure_server_delete.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2009-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azure_base', __FILE__)
+require File.expand_path("../azure_base", __FILE__)
 
 # 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
@@ -84,22 +84,20 @@ 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
-          ui.warn("Could not find a #{type_name} named #{name} to delete. Please provide --node-name option and it's value")
-        end
+        object = klass.load(name)
+        object.destroy
+        ui.warn("Deleted #{type_name} #{name}")
+      rescue Net::HTTPServerException
+        ui.warn("Could not find a #{type_name} named #{name} to delete. Please provide --node-name option and it's value")
       end
 
       def validate_disk_and_storage
-         if locate_config_value(:preserve_azure_os_disk) && locate_config_value(:delete_azure_storage_account)
-            ui.warn("Cannot delete storage account while keeping OS Disk. Please set any one option.")
-            exit
-          else
-            true
-          end
+        if locate_config_value(:preserve_azure_os_disk) && locate_config_value(:delete_azure_storage_account)
+          ui.warn("Cannot delete storage account while keeping OS Disk. Please set any one option.")
+          exit
+        else
+          true
+         end
       end
 
       def run
@@ -108,16 +106,16 @@ class Chef
         @name_args.each do |name|
           begin
             service.delete_server( { name: name, preserve_azure_os_disk: locate_config_value(:preserve_azure_os_disk),
-                                    preserve_azure_vhd: locate_config_value(:preserve_azure_vhd),
-                                    preserve_azure_dns_name: locate_config_value(:preserve_azure_dns_name),
-                                    delete_azure_storage_account: locate_config_value(:delete_azure_storage_account),
+                                     preserve_azure_vhd: locate_config_value(:preserve_azure_vhd),
+                                     preserve_azure_dns_name: locate_config_value(:preserve_azure_dns_name),
+                                     delete_azure_storage_account: locate_config_value(:delete_azure_storage_account),
                                      wait: locate_config_value(:wait) } )
 
             if config[:purge]
               node_to_delete = config[:chef_node_name] || name
               if node_to_delete
-                destroy_item(Chef::Node, node_to_delete, 'node')
-                destroy_item(Chef::ApiClient, node_to_delete, 'client')
+                destroy_item(Chef::Node, node_to_delete, "node")
+                destroy_item(Chef::ApiClient, node_to_delete, "client")
               else
                 ui.warn("Node name to purge not provided. Corresponding client node will remain on Chef Server.")
               end