knife-azure 1.8.7 → 1.9.0

data/lib/chef/knife/azurerm_server_delete.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# 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
 #
@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azurerm_base', __FILE__)
+require File.expand_path("../azurerm_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
@@ -57,51 +57,47 @@ class Chef
       # 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!")
-        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!")
       end
 
       def run
-        begin
-          $stdout.sync = true
-          # check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
-          get_azure_cli_version
-          validate_arm_keys!(:azure_resource_group_name)
-          @vm_name = @name_args[0]
+        $stdout.sync = true
+        # check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
+        get_azure_cli_version
+        validate_arm_keys!(:azure_resource_group_name)
+        @vm_name = @name_args[0]
 
-          if locate_config_value(:delete_resource_group)
-            delete_resource_group
-          else
-            service.delete_server(locate_config_value(:azure_resource_group_name), @vm_name)
-          end
+        if locate_config_value(:delete_resource_group)
+          delete_resource_group
+        else
+          service.delete_server(locate_config_value(:azure_resource_group_name), @vm_name)
+        end
 
-          if config[:purge]
-            purge_node
-          else
-            ui.warn("Corresponding node and client for the #{@vm_name} server were not deleted and remain registered with the Chef Server")
-          end
-        rescue => error
-          service.common_arm_rescue_block(error)
+        if config[:purge]
+          purge_node
+        else
+          ui.warn("Corresponding node and client for the #{@vm_name} server were not deleted and remain registered with the Chef Server")
         end
+      rescue => error
+        service.common_arm_rescue_block(error)
       end
 
       def delete_resource_group
         resource_group_name = locate_config_value(:azure_resource_group_name)
         ui.warn "Deleting resource group will delete all the virtual_machines inside it."
         begin
-          ui.confirm('Do you really want to delete resource group')
+          ui.confirm("Do you really want to delete resource group")
         rescue SystemExit   # Need to handle this as confirming with N/n raises SystemExit exception
           server = nil      # Cleanup is implicitly performed in other cloud plugins
           ui.warn "Resource group not deleted. Proceeding for server delete ..."
           service.delete_server(locate_config_value(:azure_resource_group_name), @vm_name)
           exit
         end
-        ui.info 'Deleting Resource Group '+resource_group_name+' and Virtual Machine '+@vm_name+' ..'
+        ui.info "Deleting Resource Group " + resource_group_name + " and Virtual Machine " + @vm_name + " .."
         service.delete_resource_group(locate_config_value(:azure_resource_group_name))
         ui.warn "Deleted resource_group_name #{resource_group_name} and #{@vm_name}"
       end
@@ -109,8 +105,8 @@ class Chef
       def purge_node
         node_to_delete = config[:chef_node_name] || @vm_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

data/lib/chef/knife/azurerm_server_list.rb

@@ -1,42 +1,42 @@
-#
-# Author:: Adam Jacob (<adam@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");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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 File.expand_path('../azurerm_base', __FILE__)
-
-class Chef
-  class Knife
-    class AzurermServerList < Knife
-
-      include Knife::AzurermBase
-
-      banner "knife azurerm server list (options)"
-
-      def run
-        $stdout.sync = true
-        # check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
-        get_azure_cli_version
-        validate_arm_keys!
-        begin
-          service.list_servers(locate_config_value(:azure_resource_group_name))
-        rescue => error
-          service.common_arm_rescue_block(error)
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 File.expand_path("../azurerm_base", __FILE__)
+
+class Chef
+  class Knife
+    class AzurermServerList < Knife
+
+      include Knife::AzurermBase
+
+      banner "knife azurerm server list (options)"
+
+      def run
+        $stdout.sync = true
+        # check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
+        get_azure_cli_version
+        validate_arm_keys!
+        begin
+          service.list_servers(locate_config_value(:azure_resource_group_name))
+        rescue => error
+          service.common_arm_rescue_block(error)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/azurerm_server_show.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path('../azurerm_base', __FILE__)
+require File.expand_path("../azurerm_base", __FILE__)
 
 class Chef
   class Knife

data/lib/chef/knife/bootstrap/bootstrap_options.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
 #
-# Copyright:: Copyright (c) 2016 Opscode, Inc.
+# Copyright:: Copyright 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,8 +23,8 @@
 # choice to bootstrap the target system through cloud-api protocol.
 #
 
-require 'chef/knife/winrm_base'
-require 'chef/knife/bootstrap_windows_base'
+require "chef/knife/winrm_base"
+require "chef/knife/bootstrap_windows_base"
 class Chef
   class Knife
     class Bootstrap
@@ -36,7 +36,7 @@ class Chef
             include Knife::WinrmBase
             include Knife::BootstrapWindowsBase
             deps do
-              require 'chef/knife/bootstrap'
+              require "chef/knife/bootstrap"
               Chef::Knife::Bootstrap.load_deps
             end
 
@@ -97,10 +97,9 @@ class Chef
                                 none - Currently prevents the chef-client service from being configured as a service.
                                 service - Configures the chef-client to run automatically in the background as a service.
                                 task - Configures the chef-client to run automatically in the background as a scheduled task."
-  	  	  end
+          end
         end
-  	  end
-  	end
+      end
+    end
   end
 end
-

data/lib/chef/knife/bootstrap/bootstrapper.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
 #
-# Copyright:: Copyright (c) 2016 Opscode, Inc.
+# Copyright:: Copyright 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,13 +23,13 @@ class Chef
       module Bootstrapper
 
         def load_winrm_deps
-          require 'winrm'
-          require 'chef/knife/winrm'
-          require 'chef/knife/bootstrap_windows_winrm'
+          require "winrm"
+          require "chef/knife/winrm"
+          require "chef/knife/bootstrap_windows_winrm"
         end
 
         def default_bootstrap_template
-          is_image_windows? ? 'windows-chef-client-msi' : 'chef-full'
+          is_image_windows? ? "windows-chef-client-msi" : "chef-full"
         end
 
         def tcp_test_ssh(fqdn, sshport)
@@ -42,67 +42,67 @@ class Chef
           else
             false
           end
-          rescue SocketError
-            sleep 2
-            false
-          rescue Errno::ETIMEDOUT
-            false
-          rescue Errno::EPERM
-            false
-          rescue Errno::ECONNREFUSED
-            sleep 2
-            false
-          rescue Errno::EHOSTUNREACH
-            sleep 2
-            false
-          ensure
-            tcp_socket && tcp_socket.close
+        rescue SocketError
+          sleep 2
+          false
+        rescue Errno::ETIMEDOUT
+          false
+        rescue Errno::EPERM
+          false
+        rescue Errno::ECONNREFUSED
+          sleep 2
+          false
+        rescue Errno::EHOSTUNREACH
+          sleep 2
+          false
+        ensure
+          tcp_socket && tcp_socket.close
         end
 
         def tcp_test_winrm(ip_addr, port)
           hostname = ip_addr
           socket = TCPSocket.new(hostname, port)
-          return true
-          rescue SocketError
-            sleep 2
-            false
-          rescue Errno::ETIMEDOUT
-            false
-          rescue Errno::EPERM
-            false
-          rescue Errno::ECONNREFUSED
-            sleep 2
-            false
-          rescue Errno::EHOSTUNREACH
-            sleep 2
-            false
-          rescue Errno::ENETUNREACH
-            sleep 2
-            false
+          true
+        rescue SocketError
+          sleep 2
+          false
+        rescue Errno::ETIMEDOUT
+          false
+        rescue Errno::EPERM
+          false
+        rescue Errno::ECONNREFUSED
+          sleep 2
+          false
+        rescue Errno::EHOSTUNREACH
+          sleep 2
+          false
+        rescue Errno::ENETUNREACH
+          sleep 2
+          false
         end
 
         def bootstrap_exec(server)
           fqdn = server.publicipaddress
 
           if is_image_windows?
-            if locate_config_value(:bootstrap_protocol) == 'ssh'
+            if locate_config_value(:bootstrap_protocol) == "ssh"
               port = server.sshport
               print "#{ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)}"
 
-              print(".") until tcp_test_ssh(fqdn,port) {
+              print(".") until tcp_test_ssh(fqdn, port) do
                 sleep @initial_sleep_delay ||= 10
                 puts("done")
-              }
+              end
 
-            elsif locate_config_value(:bootstrap_protocol) == 'winrm'
+            elsif locate_config_value(:bootstrap_protocol) == "winrm"
               port = server.winrmport
 
               print "#{ui.color("Waiting for winrm on #{fqdn}:#{port}", :magenta)}"
 
-              print(".") until tcp_test_winrm(fqdn,port) {
+              print(".") until tcp_test_winrm(fqdn, port) do
                 sleep @initial_sleep_delay ||= 10
                 puts("done")
-              }
+              end
             end
 
             puts("\n")
@@ -117,10 +117,10 @@ class Chef
 
             print ui.color("Waiting for sshd on #{fqdn}:#{port}", :magenta)
 
-            print(".") until tcp_test_ssh(fqdn,port) {
+            print(".") until tcp_test_ssh(fqdn, port) do
               sleep @initial_sleep_delay ||= 10
               puts("done")
-            }
+            end
 
             puts("\n")
             bootstrap_for_node(server, fqdn, port).run
@@ -164,16 +164,16 @@ class Chef
         end
 
         def bootstrap_for_windows_node(server, fqdn, port)
-          if locate_config_value(:bootstrap_protocol) == 'winrm'
+          if locate_config_value(:bootstrap_protocol) == "winrm"
 
             load_winrm_deps
             if not Chef::Platform.windows?
-              require 'gssapi'
+              require "gssapi"
             end
 
             bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
 
-            bootstrap.config[:winrm_user] = locate_config_value(:winrm_user) || 'Administrator'
+            bootstrap.config[:winrm_user] = locate_config_value(:winrm_user) || "Administrator"
             bootstrap.config[:winrm_password] = locate_config_value(:winrm_password)
             bootstrap.config[:winrm_transport] = locate_config_value(:winrm_transport)
             bootstrap.config[:winrm_authentication_protocol] = locate_config_value(:winrm_authentication_protocol)
@@ -181,7 +181,7 @@ class Chef
             bootstrap.config[:auth_timeout] = locate_config_value(:auth_timeout)
             # Todo: we should skip cert generate in case when winrm_ssl_verify_mode=verify_none
             bootstrap.config[:winrm_ssl_verify_mode] = locate_config_value(:winrm_ssl_verify_mode)
-          elsif locate_config_value(:bootstrap_protocol) == 'ssh'
+          elsif locate_config_value(:bootstrap_protocol) == "ssh"
             bootstrap = Chef::Knife::BootstrapWindowsSsh.new
             bootstrap.config[:ssh_user] = locate_config_value(:ssh_user)
             bootstrap.config[:ssh_password] = locate_config_value(:ssh_password)
@@ -210,7 +210,7 @@ class Chef
           bootstrap.config[:ssh_port] = port
           bootstrap.config[:identity_file] = locate_config_value(:identity_file)
           bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name) || server.name
-          bootstrap.config[:use_sudo] = true unless locate_config_value(:ssh_user) == 'root'
+          bootstrap.config[:use_sudo] = true unless locate_config_value(:ssh_user) == "root"
           bootstrap.config[:use_sudo_password] = true if bootstrap.config[:use_sudo]
           bootstrap.config[:environment] = locate_config_value(:environment)
           # may be needed for vpc_mode
@@ -253,20 +253,20 @@ class Chef
         end
 
         def default_hint_options
-          [
-            'vm_name',
-            'public_fqdn',
-            'platform'
-          ]
+          %w{
+            vm_name
+            public_fqdn
+            platform
+          }
         end
 
         def ohai_hints
           hint_values = locate_config_value(:ohai_hints)
 
-          if hint_values.casecmp('default').zero?
+          if hint_values.casecmp("default").zero?
             hints = default_hint_options
           else
-            hints = hint_values.split(',')
+            hints = hint_values.split(",")
           end
 
           hints
@@ -274,7 +274,7 @@ class Chef
 
         def get_chef_extension_public_params
           pub_config = Hash.new
-          if(locate_config_value(:azure_extension_client_config))
+          if locate_config_value(:azure_extension_client_config)
             pub_config[:client_rb] = File.read(File.expand_path(locate_config_value(:azure_extension_client_config)))
           else
             pub_config[:client_rb] = "chef_server_url \t #{Chef::Config[:chef_server_url].to_json}\nvalidation_client_name\t#{Chef::Config[:validation_client_name].to_json}"
@@ -311,8 +311,8 @@ class Chef
           cli_secret_file = nil if cli_secret_file == knife_secret_file
           cli_secret = nil if cli_secret == knife_secret
 
-          cli_secret_file = Chef::EncryptedDataBagItem.load_secret(cli_secret_file) if cli_secret_file != nil
-          knife_secret_file = Chef::EncryptedDataBagItem.load_secret(knife_secret_file) if knife_secret_file != nil
+          cli_secret_file = Chef::EncryptedDataBagItem.load_secret(cli_secret_file) if !cli_secret_file.nil?
+          knife_secret_file = Chef::EncryptedDataBagItem.load_secret(knife_secret_file) if !knife_secret_file.nil?
 
           cli_secret_file || cli_secret || knife_secret_file || knife_secret
         end
@@ -321,7 +321,7 @@ class Chef
           client_builder = Chef::Knife::Bootstrap::ClientBuilder.new(
             chef_config: Chef::Config,
             knife_config: config,
-            ui: ui,
+            ui: ui
           )
           client_builder.run
           client_builder.client_path
@@ -334,13 +334,13 @@ class Chef
           if Chef::Config[:validation_key] && File.exist?(File.expand_path(Chef::Config[:validation_key]))
             pri_config[:validation_key] = File.read(File.expand_path(Chef::Config[:validation_key]))
           else
-            if Chef::VERSION.split('.').first.to_i == 11
-              ui.error('Unable to find validation key. Please verify your configuration file for validation_key config value.')
+            if Chef::VERSION.split(".").first.to_i == 11
+              ui.error("Unable to find validation key. Please verify your configuration file for validation_key config value.")
               exit 1
             end
             if config[:server_count].to_i > 1
               node_name = config[:chef_node_name]
-              0.upto (config[:server_count].to_i-1) do |count|
+              0.upto (config[:server_count].to_i - 1) do |count|
                 config[:chef_node_name] = node_name + count.to_s
                 key_path = create_node_and_client_pem
                 pri_config[("client_pem" + count.to_s).to_sym] = File.read(key_path)
@@ -362,7 +362,7 @@ class Chef
             if File.exist?(File.expand_path(locate_config_value(:cert_path)))
               pri_config[:chef_server_crt] = File.read(File.expand_path(locate_config_value(:cert_path)))
             else
-              ui.error('Specified SSL certificate does not exist.')
+              ui.error("Specified SSL certificate does not exist.")
               exit 1
             end
           end