knife-azure 1.8.0 → 1.8.6

data/lib/chef/knife/azurerm_server_create.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
 #
-# Copyright:: Copyright (c) 2016 Opscode, Inc.
+# Copyright:: Copyright 2009-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -192,7 +192,8 @@ class Chef
 
       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!(
           :azure_resource_group_name,
           :azure_vm_name,
@@ -201,11 +202,8 @@ class Chef
 
         begin
           validate_params!
-
           set_default_image_reference!
-
           ssh_override_winrm if !is_image_windows?
-
           vm_details = service.create_server(create_server_def)
         rescue => error
           service.common_arm_rescue_block(error)
@@ -319,61 +317,56 @@ class Chef
       def set_default_image_reference!
         begin
           if locate_config_value(:azure_image_os_type)
-            if (locate_config_value(:azure_image_reference_publisher) || locate_config_value(:azure_image_reference_offer))
-              # if azure_image_os_type is given and any of the other image reference parameters like publisher or offer are also given,
-              # raise error
-              raise ArgumentError, 'Please specify either --azure-image-os-type OR --azure-image-os-type with --azure-image-reference-sku or 4 image reference parameters i.e.
-                --azure-image-reference-publisher, --azure-image-reference-offer, --azure-image-reference-sku, --azure-image-reference-version."'
+            validate_publisher_and_offer
+            ## if azure_image_os_type is given (with or without azure-image-reference-sku) and other image reference parameters are not given,
+            # set default image reference parameters
+            case locate_config_value(:azure_image_os_type)
+            when "ubuntu"
+              set_os_image("Canonical", "UbuntuServer", "14.04.2-LTS")
+            when "centos"
+              set_os_image("OpenLogic", "CentOS", "7.1")
+            when "rhel"
+              set_os_image("RedHat", "RHEL", "7.2")
+            when "debian"
+              set_os_image("credativ", "Debian", "7")
+            when "windows"
+              set_os_image("MicrosoftWindowsServer", "WindowsServer", "2012-R2-Datacenter")
             else
-              ## if azure_image_os_type is given (with or without azure-image-reference-sku) and other image reference parameters are not given,
-              # set default image reference parameters
-              case locate_config_value(:azure_image_os_type)
-              when "ubuntu"
-                config[:azure_image_reference_publisher] = "Canonical"
-                config[:azure_image_reference_offer] = "UbuntuServer"
-                config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : "14.04.2-LTS"
-              when "centos"
-                config[:azure_image_reference_publisher] = "OpenLogic"
-                config[:azure_image_reference_offer] = "CentOS"
-                config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : "7.1"
-              when "rhel"
-                config[:azure_image_reference_publisher] = "RedHat"
-                config[:azure_image_reference_offer] = "RHEL"
-                config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : "7.2"
-              when "debian"
-                config[:azure_image_reference_publisher] = "credativ"
-                config[:azure_image_reference_offer] = "Debian"
-                config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : "7"
-              when "windows"
-                config[:azure_image_reference_publisher] = "MicrosoftWindowsServer"
-                config[:azure_image_reference_offer] = "WindowsServer"
-                config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : "2012-R2-Datacenter"
-              else
-                raise ArgumentError, 'Invalid value of --azure-image-os-type. Accepted values ubuntu|centos|windows'
-              end
+              raise ArgumentError, 'Invalid value of --azure-image-os-type. Accepted values ubuntu|centos|windows'
             end
           else
-            if (locate_config_value(:azure_image_reference_publisher) && locate_config_value(:azure_image_reference_offer) && locate_config_value(:azure_image_reference_sku) && locate_config_value(:azure_image_reference_version))
-              # if azure_image_os_type is not given and other image reference parameters are given,
-              # do nothing
-            else
-              # if azure_image_os_type is not given and other image reference parameters are also not given,
-              # throw error for azure_image_os_type
-              validate_arm_keys!(:azure_image_os_type)
-            end
+            validate_arm_keys!(:azure_image_os_type) unless is_image_os_type?
           end
         rescue => error
           ui.error("#{error.message}")
           Chef::Log.debug("#{error.backtrace.join("\n")}")
           exit
         end
-
         # final verification for image reference parameters
         validate_arm_keys!(:azure_image_reference_publisher,
             :azure_image_reference_offer,
             :azure_image_reference_sku,
             :azure_image_reference_version)
       end
+
+      def set_os_image(publisher, img_offer, default_os_version)
+        config[:azure_image_reference_publisher] = publisher
+        config[:azure_image_reference_offer] = img_offer
+        config[:azure_image_reference_sku] = locate_config_value(:azure_image_reference_sku) ? locate_config_value(:azure_image_reference_sku) : default_os_version
+      end
+
+      def is_image_os_type?
+        locate_config_value(:azure_image_reference_publisher) && locate_config_value(:azure_image_reference_offer) && locate_config_value(:azure_image_reference_sku) && locate_config_value(:azure_image_reference_version)
+      end
+
+      def validate_publisher_and_offer
+        if (locate_config_value(:azure_image_reference_publisher) || locate_config_value(:azure_image_reference_offer))
+          # if azure_image_os_type is given and any of the other image reference parameters like publisher or offer are also given,
+          # raise error
+          raise ArgumentError, 'Please specify either --azure-image-os-type OR --azure-image-os-type with --azure-image-reference-sku or 4 image reference parameters i.e.
+            --azure-image-reference-publisher, --azure-image-reference-offer, --azure-image-reference-sku, --azure-image-reference-version."'
+        end
+      end
     end
   end
 end

data/lib/chef/knife/azurerm_server_delete.rb

@@ -2,7 +2,7 @@
 # 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.
+# Copyright:: Copyright 2009-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('../azurerm_base', __FILE__)
 
 # These two are needed for the '--purge' deletion case
 require 'chef/node'
@@ -69,44 +69,52 @@ class Chef
       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]
-          resource_group_name = locate_config_value(:azure_resource_group_name)
+          @vm_name = @name_args[0]
 
           if locate_config_value(:delete_resource_group)
-            ui.warn "Deleting resource group will delete all the virtual_machines inside it."
-            begin
-              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+' ..'
-            service.delete_resource_group(locate_config_value(:azure_resource_group_name))
-            ui.warn "Deleted resource_group_name #{resource_group_name} and #{vm_name}"
+            delete_resource_group
           else
-            service.delete_server(locate_config_value(:azure_resource_group_name), vm_name)
+            service.delete_server(locate_config_value(:azure_resource_group_name), @vm_name)
           end
 
           if config[:purge]
-            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')
-            else
-              ui.warn("Node name to purge not provided. Corresponding client node will remain on Chef Server.")
-            end
+            purge_node
           else
-            ui.warn("Corresponding node and client for the #{vm_name} server were not deleted and remain registered with the Chef Server")
+            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
       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')
+        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+' ..'
+        service.delete_resource_group(locate_config_value(:azure_resource_group_name))
+        ui.warn "Deleted resource_group_name #{resource_group_name} and #{@vm_name}"
+      end
+
+      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')
+        else
+          ui.warn("Node name to purge not provided. Corresponding client node will remain on Chef Server.")
+        end
+      end
     end
   end
 end

data/lib/chef/knife/azurerm_server_list.rb

@@ -1,3 +1,21 @@
+#
+# 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
@@ -10,6 +28,8 @@ class Chef
 
       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))

data/lib/chef/knife/azurerm_server_show.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Meera Navale (meera.navale@msystechnologies.com)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,8 @@ class Chef
 
       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!(:azure_resource_group_name)
         begin
           service.show_server(@name_args[0], locate_config_value(:azure_resource_group_name))

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

@@ -275,7 +275,7 @@ class Chef
         def get_chef_extension_public_params
           pub_config = Hash.new
           if(locate_config_value(:azure_extension_client_config))
-            pub_config[:client_rb] = File.read(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}"
           end
@@ -331,7 +331,9 @@ class Chef
           pri_config = Hash.new
 
           # validator less bootstrap support for bootstrap protocol cloud-api
-          if (Chef::Config[:validation_key] && !File.exist?(File.expand_path(Chef::Config[:validation_key])))
+          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.')
               exit 1
@@ -346,16 +348,19 @@ class Chef
               config[:chef_node_name] = node_name
             else
               key_path = create_node_and_client_pem
-              pri_config[:client_pem] = File.read(key_path)
+              if File.exist?(key_path)
+                pri_config[:client_pem] = File.read(key_path)
+              else
+                ui.error('Unable to find client.pem at given path #{key_path}')
+                exit 1
+              end
             end
-          else
-            pri_config[:validation_key] = File.read(Chef::Config[:validation_key])
           end
 
           # SSL cert bootstrap support
           if locate_config_value(:cert_path)
             if File.exist?(File.expand_path(locate_config_value(:cert_path)))
-              pri_config[:chef_server_crt] = File.read(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.')
               exit 1

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.8.0"
+    VERSION = "1.8.6"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-azure
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.6
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -151,20 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.2.1
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A plugin to the Chef knife tool for creating instances on the Microsoft Azure