knife-azure 1.9.0 → 2.0.1

data/lib/chef/knife/azure_server_delete.rb

@@ -2,7 +2,7 @@
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright 2009-2018 Chef Software, Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,50 +33,50 @@ class Chef
       banner "knife azure server delete SERVER [SERVER] (options)"
 
       option :preserve_azure_os_disk,
-        :long => "--preserve-azure-os-disk",
-        :boolean => true,
-        :default => false,
-        :description => "Preserve corresponding OS Disk"
+        long: "--preserve-azure-os-disk",
+        boolean: true,
+        default: false,
+        description: "Preserve corresponding OS Disk"
 
       option :preserve_azure_vhd,
-       :long => "--preserve-azure-vhd",
-       :boolean => true,
-       :default => false,
-       :description => "Preserve underlying VHD"
+        long: "--preserve-azure-vhd",
+        boolean: true,
+        default: false,
+        description: "Preserve underlying VHD"
 
       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 Windows Azure 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 Windows Azure node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
 
       option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+        short: "-N NAME",
+        long: "--node-name NAME",
+        description: "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
 
       option :preserve_azure_dns_name,
-        :long => "--preserve-azure-dns-name",
-        :boolean => true,
-        :default => false,
-        :description => "Preserve corresponding cloud service (DNS). If the option is not set, it deletes the service not used by any VMs."
+        long: "--preserve-azure-dns-name",
+        boolean: true,
+        default: false,
+        description: "Preserve corresponding cloud service (DNS). If the option is not set, it deletes the service not used by any VMs."
 
       option :delete_azure_storage_account,
-        :long => "--delete-azure-storage-account",
-        :boolean => true,
-        :default => false,
-        :description => "Delete corresponding storage account. If the option is set, it deletes the storage account not used by any VMs."
+        long: "--delete-azure-storage-account",
+        boolean: true,
+        default: false,
+        description: "Delete corresponding storage account. If the option is set, it deletes the storage account not used by any VMs."
 
       option :azure_dns_name,
-        :long => "--azure-dns-name NAME",
-        :description => "specifies the DNS name (also known as hosted service name)"
+        long: "--azure-dns-name NAME",
+        description: "specifies the DNS name (also known as hosted service name)"
 
       option :wait,
-        :long => "--wait",
-        :boolean => true,
-        :default => false,
-        :description => "Wait for server deletion. Default is false"
+        long: "--wait",
+        boolean: true,
+        default: false,
+        description: "Wait for server deletion. Default is false"
 
       # Extracted from Chef::Knife.delete_object, because it has a
       # confirmation step built in... By specifying the '--purge'

data/lib/chef/knife/azure_server_list.rb

@@ -2,7 +2,7 @@
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2010-2018 Chef Software, Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/azure_server_show.rb

@@ -2,7 +2,7 @@
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2010-2018 Chef Software, Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/azure_vnet_create.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2013-2018 Chef Software, Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,26 +26,22 @@ class Chef
       banner "knife azure vnet create (options)"
 
       option :azure_network_name,
-        :short => "-n NETWORK_NAME",
-        :long => "--azure-network-name NETWORK_NAME",
-        :description =>
-          "Specifies the name of the virtual network to create."
+        short: "-n NETWORK_NAME",
+        long: "--azure-network-name NETWORK_NAME",
+        description:           "Specifies the name of the virtual network to create."
 
       option :azure_affinity_group,
-        :short => "-a GROUP",
-        :long => "--azure-affinity-group GROUP",
-        :description =>
-          "Specifies the affinity group to associate with the vnet."
+        short: "-a GROUP",
+        long: "--azure-affinity-group GROUP",
+        description:           "Specifies the affinity group to associate with the vnet."
 
       option :azure_address_space,
-        :long => "--azure-address-space CIDR",
-        :description =>
-          "Specifies the address space of the vnet using CIDR notation."
+        long: "--azure-address-space CIDR",
+        description:           "Specifies the address space of the vnet using CIDR notation."
 
       option :azure_subnet_name,
-        :long => "--azure-subnet-name CIDR",
-        :description =>
-          "Specifies the Subnet Name."
+        long: "--azure-subnet-name CIDR",
+        description:           "Specifies the Subnet Name."
 
       def run
         $stdout.sync = true
@@ -57,7 +53,7 @@ class Chef
           azure_vnet_name: locate_config_value(:azure_network_name),
           azure_ag_name: locate_config_value(:azure_affinity_group),
           azure_address_space: locate_config_value(:azure_address_space),
-          azure_subnet_name: locate_config_value(:azure_subnet_name) || "Subnet-#{Random.rand(10)}"
+          azure_subnet_name: locate_config_value(:azure_subnet_name) || "Subnet-#{Random.rand(10)}",
         }
 
         rsp = service.create_vnet(params)
@@ -66,11 +62,11 @@ class Chef
           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}"
+            puts "#{rsp.at_css("Code").content}: "\
+                 "#{rsp.at_css("Message").content}"
           end
         else
-          puts "Creation status: #{rsp.at_css('Status').content}"
+          puts "Creation status: #{rsp.at_css("Status").content}"
         end
       end
     end

data/lib/chef/knife/azure_vnet_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2013-2018 Chef Software, Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/azurerm_base.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
 #
-# Copyright:: Copyright 2009-2018, Chef Software Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@ class Chef
 
       ## azure-xplat-cli versio that introduced deprecation of Windows Credentials
       ## Manager (WCM) usage for authentication credentials storage purpose ##
-      XPLAT_VERSION_WITH_WCM_DEPRECATED ||= "0.10.5"
+      XPLAT_VERSION_WITH_WCM_DEPRECATED ||= "0.10.5".freeze
 
       if Chef::Platform.windows?
         require "azure/resource_management/windows_credentials"
@@ -46,15 +46,15 @@ class Chef
           end
 
           option :azure_resource_group_name,
-            :short => "-r RESOURCE_GROUP_NAME",
-            :long => "--azure-resource-group-name RESOURCE_GROUP_NAME",
-            :description => "The Resource Group name."
+            short: "-r RESOURCE_GROUP_NAME",
+            long: "--azure-resource-group-name RESOURCE_GROUP_NAME",
+            description: "The Resource Group name."
         end
       end
 
       def service
         details = authentication_details
-        details.update(:azure_subscription_id => locate_config_value(:azure_subscription_id))
+        details.update(azure_subscription_id: locate_config_value(:azure_subscription_id))
         @service ||= begin
                       service = Azure::ResourceManagement::ARMInterface.new(details)
                     end
@@ -64,7 +64,11 @@ class Chef
 
       def locate_config_value(key)
         key = key.to_sym
-        config[key] || Chef::Config[:knife][key] || default_config[key]
+        if defined?(config_value) # Inherited by bootstrap
+          config_value(key) || default_config[key]
+        else
+          config[key] || Chef::Config[:knife][key] || default_config[key]
+        end
       end
 
       # validates ARM mandatory keys
@@ -75,7 +79,7 @@ class Chef
         if azure_cred?
           validate_azure_login
         else
-          keys.concat([:azure_tenant_id, :azure_client_id, :azure_client_secret])
+          keys.concat(%i{azure_tenant_id azure_client_id azure_client_secret})
         end
 
         errors = []
@@ -91,12 +95,13 @@ class Chef
 
       def authentication_details
         if is_azure_cred?
-          return { :azure_tenant_id => locate_config_value(:azure_tenant_id), :azure_client_id => locate_config_value(:azure_client_id), :azure_client_secret => locate_config_value(:azure_client_secret) }
+          return { azure_tenant_id: locate_config_value(:azure_tenant_id), azure_client_id: locate_config_value(:azure_client_id), azure_client_secret: locate_config_value(:azure_client_secret) }
         elsif Chef::Platform.windows?
-          token_details = token_details_for_windows()
+          token_details = token_details_for_windows
         else
-          token_details = token_details_for_linux()
+          token_details = token_details_for_linux
         end
+
         token_details = check_token_validity(token_details)
         token_details
       end
@@ -126,7 +131,7 @@ class Chef
         home_dir = File.expand_path("~")
         file = File.read(home_dir + "/.azure/accessTokens.json")
         file = JSON.parse(file)
-        token_details = { :tokentype => file[-1]["tokenType"], :user => file[-1]["userId"], :token => file[-1]["accessToken"], :clientid => file[-1]["_clientId"], :expiry_time => file[-1]["expiresOn"], :refreshtoken => file[-1]["refreshToken"] }
+        token_details = { tokentype: file[-1]["tokenType"], user: file[-1]["userId"], token: file[-1]["accessToken"], clientid: file[-1]["_clientId"], expiry_time: file[-1]["expiresOn"], refreshtoken: file[-1]["refreshToken"] }
         token_details
       end
 
@@ -144,12 +149,12 @@ class Chef
 
       def refresh_token
         azure_authentication
-        token_details = Chef::Platform.windows? ? token_details_for_windows() : token_details_for_linux()
+        token_details = Chef::Platform.windows? ? token_details_for_windows : token_details_for_linux
       end
 
       def azure_authentication
         ui.log("Authenticating...")
-        Mixlib::ShellOut.new("#{@azure_prefix} vm show 'knifetest@resourcegroup' testvm", :timeout => 30).run_command
+        Mixlib::ShellOut.new("#{@azure_prefix} vm show 'knifetest@resourcegroup' testvm", timeout: 30).run_command
       rescue Mixlib::ShellOut::CommandTimeout
       rescue Exception
         raise_azure_status
@@ -158,9 +163,7 @@ class Chef
       def check_token_validity(token_details)
         unless is_token_valid?(token_details)
           token_details = refresh_token
-          unless is_token_valid?(token_details)
-            raise_azure_status
-          end
+          raise_azure_status unless is_token_valid?(token_details)
         end
         token_details
       end
@@ -170,11 +173,10 @@ class Chef
           # cmdkey command is used for accessing windows credential manager
           xplat_creds_cmd = Mixlib::ShellOut.new("cmdkey /list | findstr AzureXplatCli")
           result = xplat_creds_cmd.run_command
-          if result.stdout.nil? || result.stdout.empty?
-            raise login_message
-          end
+          raise login_message if result.stdout.nil? || result.stdout.empty?
         else
           home_dir = File.expand_path("~")
+          puts "File.exist? = #{File.exist?("a")}"
           if !File.exist?(home_dir + "/.azure/accessTokens.json") || File.size?(home_dir + "/.azure/accessTokens.json") <= 2
             raise login_message
           end
@@ -190,7 +192,7 @@ class Chef
           doc = Nokogiri::XML(File.open(find_file(filename)))
           profile = doc.at_css("PublishProfile")
           subscription = profile.at_css("Subscription")
-          #check given PublishSettings XML file format.Currently PublishSettings file have two different XML format
+          # check given PublishSettings XML file format.Currently PublishSettings file have two different XML format
           if profile.attribute("SchemaVersion").nil?
             management_cert = OpenSSL::PKCS12.new(Base64.decode64(profile.attribute("ManagementCertificate").value))
             Chef::Config[:knife][:azure_api_host_name] = URI(profile.attribute("Url").value).host
@@ -264,6 +266,14 @@ class Chef
       end
 
       def validate_params!
+        if locate_config_value(:connection_user).nil?
+          raise ArgumentError, "Please provide --connection-user option for authentication."
+        end
+
+        unless locate_config_value(:connection_password).nil? ^ locate_config_value(:ssh_public_key).nil?
+          raise ArgumentError, "Please specify either --connection-password or --ssh-public-key option for authentication."
+        end
+
         if locate_config_value(:azure_vnet_subnet_name) && !locate_config_value(:azure_vnet_name)
           raise ArgumentError, "When --azure-vnet-subnet-name is specified, the --azure-vnet-name must also be specified."
         end
@@ -276,12 +286,6 @@ class Chef
           raise ArgumentError, "Invalid value '#{locate_config_value(:node_ssl_verify_mode)}' for --node-ssl-verify-mode. Use Valid values i.e 'none', 'peer'."
         end
 
-        if is_image_windows?
-          if locate_config_value(:winrm_user).nil? || locate_config_value(:winrm_password).nil?
-            raise ArgumentError, "Please provide --winrm-user and --winrm-password options for Windows option."
-          end
-        end
-
         if !is_image_windows?
           if (locate_config_value(:azure_vm_name).match /^(?=.*[a-zA-Z-])([a-zA-z0-9-]{1,64})$/).nil?
             raise ArgumentError, "VM name can only contain alphanumeric and hyphen(-) characters and maximun length cannot exceed 64 charachters."
@@ -304,8 +308,14 @@ class Chef
           end
         end
 
+        if locate_config_value(:azure_image_os_type)
+          unless %w{ubuntu centos rhel debian windows}.include?(locate_config_value(:azure_image_os_type))
+            raise ArgumentError, "Invalid value of --azure-image-os-type. Accepted values ubuntu|centos|rhel|debian|windows"
+          end
+        end
+
         config[:ohai_hints] = format_ohai_hints(locate_config_value(:ohai_hints))
-        validate_ohai_hints if ! locate_config_value(:ohai_hints).casecmp("default").zero?
+        validate_ohai_hints unless locate_config_value(:ohai_hints).casecmp("default").zero?
       end
 
       private
@@ -334,6 +344,7 @@ class Chef
 
       def is_old_xplat?
         return true unless @azure_version
+
         Gem::Version.new(@azure_version) < Gem::Version.new(XPLAT_VERSION_WITH_WCM_DEPRECATED)
       end
 

data/lib/chef/knife/azurerm_server_create.rb

@@ -1,7 +1,6 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
-#
-# Copyright:: Copyright 2009-2018, Chef Software Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,12 +18,14 @@
 
 require "chef/knife/azurerm_base"
 require "securerandom"
+require "chef/knife/bootstrap"
+require "chef/knife/bootstrap/client_builder"
 require "chef/knife/bootstrap/common_bootstrap_options"
 require "chef/knife/bootstrap/bootstrapper"
 
 class Chef
   class Knife
-    class AzurermServerCreate < Knife
+    class AzurermServerCreate < Knife::Bootstrap
 
       include Knife::AzurermBase
       include Knife::Bootstrap::CommonBootstrapOptions
@@ -34,122 +35,51 @@ class Chef
 
       attr_accessor :initial_sleep_delay
 
-      option :ssh_user,
-        :short => "-x USERNAME",
-        :long => "--ssh-user USERNAME",
-        :description => "The ssh username",
-        :default => "root"
-
-      option :ssh_password,
-        :short => "-P PASSWORD",
-        :long => "--ssh-password PASSWORD",
-        :description => "The ssh password"
-
-      option :ssh_port,
-        :long => "--ssh-port PORT",
-        :description => "The ssh port. Default is 22."
-
-      option :node_ssl_verify_mode,
-        :long        => "--node-ssl-verify-mode [peer|none]",
-        :description => "Whether or not to verify the SSL cert for all HTTPS requests."
-
-      option :winrm_user,
-        :short => "-x USERNAME",
-        :long => "--winrm-user USERNAME",
-        :description => "The WinRM username",
-        :default => "Administrator",
-        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_user] = key }
-
-      option :winrm_password,
-        :short => "-P PASSWORD",
-        :long => "--winrm-password PASSWORD",
-        :description => "The WinRM password",
-        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_password] = key }
-
-      option :azure_storage_account,
-        :short => "-a NAME",
-        :long => "--azure-storage-account NAME",
-        :description => "Required for advanced server-create option.
-                                      A name for the storage account that is unique within Windows Azure. Storage account names must be
-                                      between 3 and 24 characters in length and use numbers and lower-case letters only.
-                                      This name is the DNS prefix name and can be used to access blobs, queues, and tables in the storage account.
-                                      For example: http://ServiceName.blob.core.windows.net/mycontainer/"
-
       option :azure_storage_account_type,
-        :long => "--azure-storage-account-type TYPE",
-        :description => "Optional. One of the following account types (case-sensitive):
+        long: "--azure-storage-account-type TYPE",
+        description: "Optional. One of the following account types (case-sensitive):
                                       Standard_LRS (Standard Locally-redundant storage)
                                       Standard_ZRS (Standard Zone-redundant storage)
                                       Standard_GRS (Standard Geo-redundant storage)
                                       Standard_RAGRS (Standard Read access geo-redundant storage)
                                       Premium_LRS (Premium Locally-redundant storage)",
-        :default => "Standard_GRS"
-
-      option :azure_vm_name,
-        :long => "--azure-vm-name NAME",
-        :description => "Required. Specifies the name for the virtual machine.
-                        The name must be unique within the ResourceGroup.
-                        The azure vm name cannot be more than 15 characters long"
-
-      option :azure_service_location,
-        :short => "-m LOCATION",
-        :long => "--azure-service-location LOCATION",
-        :description => "Required if not using an Affinity Group. Specifies the geographic location - the name of the data center location that is valid for your subscription.
-                                      Eg: westus, eastus, eastasia, southeastasia, northeurope, westeurope",
-        :proc        => Proc.new { |lo| Chef::Config[:knife][:azure_service_location] = lo }
-
-      option :azure_os_disk_name,
-        :short => "-o DISKNAME",
-        :long => "--azure-os-disk-name DISKNAME",
-        :description => "Optional. Specifies the friendly name of the disk containing the guest OS image in the image repository."
+        default: "Standard_GRS"
 
       option :azure_image_reference_publisher,
-        :long => "--azure-image-reference-publisher PUBLISHER_NAME",
-        :description => "Optional. Specifies the publisher of the image used to create the virtual machine.
+        long: "--azure-image-reference-publisher PUBLISHER_NAME",
+        description: "Optional. Specifies the publisher of the image used to create the virtual machine.
                           eg. OpenLogic, Canonical, MicrosoftWindowsServer"
 
       option :azure_image_reference_offer,
-        :long => "--azure-image-reference-offer OFFER",
-        :description => "Optional. Specifies the offer of the image used to create the virtual machine.
+        long: "--azure-image-reference-offer OFFER",
+        description: "Optional. Specifies the offer of the image used to create the virtual machine.
                           eg. CentOS, UbuntuServer, WindowsServer"
 
       option :azure_image_reference_sku,
-        :long => "--azure-image-reference-sku SKU",
-        :description => "Optional. Specifies the SKU of the image used to create the virtual machine."
+        long: "--azure-image-reference-sku SKU",
+        description: "Optional. Specifies the SKU of the image used to create the virtual machine."
 
       option :azure_image_reference_version,
-        :long => "--azure-image-reference-version VERSION",
-        :description => "Optional. Specifies the version of the image used to create the virtual machine.
+        long: "--azure-image-reference-version VERSION",
+        description: "Optional. Specifies the version of the image used to create the virtual machine.
                           Default value is 'latest'",
-        :default => "latest"
+        default: "latest"
 
       option :azure_image_os_type,
-        :long => "--azure-image-os-type OSTYPE",
-        :description => "Optional. Specifies the image OS Type for which server needs to be created. Accepted values ubuntu|centos|rhel|debian|windows"
-
-      option :azure_vm_size,
-        :short => "-z SIZE",
-        :long => "--azure-vm-size SIZE",
-        :description => "Optional. Size of virtual machine. Default is Standard_A1_v2.
-                        Eg: Standard_A2, Standard_F2, Standard_G1 etc.",
-        :default => "Standard_A1_v2",
-        :proc => Proc.new { |si| Chef::Config[:knife][:azure_vm_size] = si }
-
-      option :azure_availability_set,
-             :long => "--azure-availability-set NAME",
-             :description => "Optional. Name of availability set to add virtual machine into."
+        long: "--azure-image-os-type OSTYPE",
+        description: "Optional. Specifies the image OS Type for which server needs to be created. Accepted values ubuntu|centos|rhel|debian|windows"
 
       option :azure_vnet_name,
-        :long => "--azure-vnet-name VNET_NAME",
-        :description => "Optional. Specifies the virtual network name.
+        long: "--azure-vnet-name VNET_NAME",
+        description: "Optional. Specifies the virtual network name.
                          This may be the name of an existing vnet present under the given resource group
                          or this may be the name of a new vnet to be added in the given resource group.
                          If not specified then azure-vm-name will be taken as the default name for vnet name as well.
                          Along with this option azure-vnet-subnet-name option can also be specified or it can also be skipped."
 
       option :azure_vnet_subnet_name,
-        :long => "--azure-vnet-subnet-name VNET_SUBNET_NAME",
-        :description => "Optional. Specifies the virtual network subnet name.
+        long: "--azure-vnet-subnet-name VNET_SUBNET_NAME",
+        description: "Optional. Specifies the virtual network subnet name.
                          Must be specified only with azure-vnet-name option.
                          This may be the name of an existing subnet present under the given virtual network
                          or this may be the name of a new subnet to be added in the given virtual network.
@@ -157,85 +87,92 @@ class Chef
                          Value as 'GatewaySubnet' cannot be used as the name for the --azure-vnet-subnet-name option."
 
       option :ssh_public_key,
-        :long => "--ssh-public-key FILENAME",
-        :description => "It is the ssh-rsa public key path. Specify either ssh-password or ssh-public-key"
-
-      option :thumbprint,
-        :long => "--thumbprint THUMBPRINT",
-        :description => "The thumprint of the ssl certificate"
-
-      option :cert_passphrase,
-        :long => "--cert-passphrase PASSWORD",
-        :description => "SSL Certificate Password"
-
-      option :cert_path,
-        :long => "--cert-path PATH",
-        :description => "SSL Certificate Path"
-
-      option :tcp_endpoints,
-        :short => "-t PORT_LIST",
-        :long => "--tcp-endpoints PORT_LIST",
-        :description => "Comma-separated list of TCP ports to open e.g. '80,433'"
+        long: "--ssh-public-key FILENAME",
+        description: "It is the ssh-rsa public key path. Specify either connection-password or ssh-public-key"
 
       option :server_count,
-        :long => "--server-count COUNT",
-        :description => "Number of servers to create with same configuration.
+        long: "--server-count COUNT",
+        description: "Number of servers to create with same configuration.
                                     Maximum count is 5. Default value is 1.",
-        :default => 1
+        default: 1
 
       option :ohai_hints,
-        :long => "--ohai-hints HINT_OPTIONS",
-        :description => "Hint option names to be set in Ohai configuration of the target node.
+        long: "--ohai-hints HINT_OPTIONS",
+        description: "Hint option names to be set in Ohai configuration of the target node.
                                      Supported values are: vm_name, public_fqdn and platform.
                                      User can pass any comma separated combination of these values like 'vm_name,public_fqdn'.
                                      Default value is 'default' which corresponds to the supported values list mentioned here.",
-        :default => "default"
+        default: "default"
 
-      def run
-        $stdout.sync = true
-        # check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
+      # run() would be executing from parent class
+      # Chef::Knife::Bootstrap, defined in core.
+      # Required methods have been overridden here
+      #### run() execution begins ####
+
+      def plugin_setup!
+        # Check azure cli version due to azure changed `azure` to `az` in azure-cli2.0
         get_azure_cli_version
+        set_default_image_reference!
+      end
+
+      def validate_name_args!; end
+
+      def plugin_validate_options!
         validate_arm_keys!(
           :azure_resource_group_name,
           :azure_vm_name,
           :azure_service_location
         )
+        validate_params!
+      end
 
-        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)
-          exit
-        end
+      def plugin_create_instance!
+        set_defaults
+        vm_details = service.create_server(create_server_def)
+      rescue => error
+        service.common_arm_rescue_block(error)
+        exit
       end
 
+      def plugin_finalize; end
+
+      # Following methods are not required for ARM
+      #
+      def connect!; end
+
+      def register_client; end
+
+      def render_template; end
+
+      def upload_bootstrap(content); end
+
+      def perform_bootstrap(bootstrap_path); end
+
+      #### run() execution ends ####
+
       def create_server_def
         server_def = {
-          :azure_resource_group_name => locate_config_value(:azure_resource_group_name),
-          :azure_storage_account => locate_config_value(:azure_storage_account),
-          :azure_storage_account_type => locate_config_value(:azure_storage_account_type),
-          :azure_vm_name => locate_config_value(:azure_vm_name),
-          :azure_service_location => locate_config_value(:azure_service_location),
-          :azure_os_disk_name => locate_config_value(:azure_os_disk_name),
-          :azure_os_disk_caching => locate_config_value(:azure_os_disk_caching),
-          :azure_os_disk_create_option => locate_config_value(:azure_os_disk_create_option),
-          :azure_vm_size => locate_config_value(:azure_vm_size),
-          :azure_image_reference_publisher => locate_config_value(:azure_image_reference_publisher),
-          :azure_image_reference_offer => locate_config_value(:azure_image_reference_offer),
-          :azure_image_reference_sku => locate_config_value(:azure_image_reference_sku),
-          :azure_image_reference_version => locate_config_value(:azure_image_reference_version),
-          :winrm_user => locate_config_value(:winrm_user),
-          :azure_availability_set => locate_config_value(:azure_availability_set),
-          :azure_vnet_name => locate_config_value(:azure_vnet_name),
-          :azure_vnet_subnet_name => locate_config_value(:azure_vnet_subnet_name),
-          :ssl_cert_fingerprint => locate_config_value(:thumbprint),
-          :cert_path => locate_config_value(:cert_path),
-          :cert_password => locate_config_value(:cert_passphrase),
-          :vnet_subnet_address_prefix => locate_config_value(:vnet_subnet_address_prefix),
-          :server_count => locate_config_value(:server_count)
+          azure_resource_group_name: locate_config_value(:azure_resource_group_name),
+          azure_storage_account: locate_config_value(:azure_storage_account),
+          azure_storage_account_type: locate_config_value(:azure_storage_account_type),
+          azure_vm_name: locate_config_value(:azure_vm_name),
+          azure_service_location: locate_config_value(:azure_service_location),
+          azure_os_disk_name: locate_config_value(:azure_os_disk_name),
+          azure_os_disk_caching: locate_config_value(:azure_os_disk_caching),
+          azure_os_disk_create_option: locate_config_value(:azure_os_disk_create_option),
+          azure_vm_size: locate_config_value(:azure_vm_size),
+          azure_image_reference_publisher: locate_config_value(:azure_image_reference_publisher),
+          azure_image_reference_offer: locate_config_value(:azure_image_reference_offer),
+          azure_image_reference_sku: locate_config_value(:azure_image_reference_sku),
+          azure_image_reference_version: locate_config_value(:azure_image_reference_version),
+          azure_availability_set: locate_config_value(:azure_availability_set),
+          azure_vnet_name: locate_config_value(:azure_vnet_name),
+          azure_vnet_subnet_name: locate_config_value(:azure_vnet_subnet_name),
+          ssl_cert_fingerprint: locate_config_value(:thumbprint),
+          cert_path: locate_config_value(:cert_path),
+          cert_password: locate_config_value(:cert_passphrase),
+          vnet_subnet_address_prefix: locate_config_value(:vnet_subnet_address_prefix),
+          server_count: locate_config_value(:server_count),
         }
 
         server_def[:tcp_endpoints] = locate_config_value(:tcp_endpoints) if locate_config_value(:tcp_endpoints)
@@ -258,18 +195,14 @@ class Chef
         server_def[:chef_extension_public_param] = get_chef_extension_public_params
         server_def[:chef_extension_private_param] = get_chef_extension_private_params
         server_def[:auto_upgrade_minor_version] = false
-
-        if is_image_windows?
-          server_def[:admin_password] = locate_config_value(:winrm_password)
-        else
-          server_def[:ssh_user] = locate_config_value(:ssh_user)
-          server_def[:ssh_password] = locate_config_value(:ssh_password)
-          server_def[:disablePasswordAuthentication] = "false"
-          if locate_config_value(:ssh_public_key)
-            server_def[:disablePasswordAuthentication] = "true"
-            server_def[:ssh_key] = File.read(locate_config_value(:ssh_public_key))
-          end
-        end
+        server_def[:connection_user] = locate_config_value(:connection_user)
+        server_def[:disablePasswordAuthentication] = if locate_config_value(:ssh_public_key)
+                                                       server_def[:ssh_public_key] = File.read(locate_config_value(:ssh_public_key))
+                                                       "true"
+                                                     else
+                                                       server_def[:connection_password] = locate_config_value(:connection_password)
+                                                       "false"
+                                                     end
 
         server_def
       end
@@ -283,7 +216,7 @@ class Chef
       end
 
       def format_ohai_hints(ohai_hints)
-        ohai_hints = ohai_hints.split(",").each { |hint| hint.strip! }
+        ohai_hints = ohai_hints.split(",").each(&:strip!)
         ohai_hints.join(",")
       end
 
@@ -294,7 +227,7 @@ class Chef
       def validate_ohai_hints
         hint_values = locate_config_value(:ohai_hints).split(",")
         hint_values.each do |hint|
-          if ! is_supported_ohai_hint?(hint)
+          unless is_supported_ohai_hint?(hint)
             raise ArgumentError, "Ohai Hint name #{hint} passed is not supported. Please run the command help to see the list of supported values."
           end
         end
@@ -302,16 +235,18 @@ class Chef
 
       private
 
-      def ssh_override_winrm
-        # unchanged ssh_user and changed winrm_user, override ssh_user
-        if locate_config_value(:ssh_user).eql?(options[:ssh_user][:default]) &&
-            !locate_config_value(:winrm_user).eql?(options[:winrm_user][:default])
-          config[:ssh_user] = locate_config_value(:winrm_user)
+      def set_defaults
+        # set_default_image_reference!
+        set_configs
+      end
+
+      def set_configs
+        unless locate_config_value(:connection_user).nil?
+          config[:connection_user] = locate_config_value(:connection_user)
         end
 
-        if locate_config_value(:ssh_password).nil? &&
-            !locate_config_value(:winrm_password).nil?
-          config[:ssh_password] = locate_config_value(:winrm_password)
+        unless locate_config_value(:connection_password).nil?
+          config[:connection_password] = locate_config_value(:connection_password)
         end
       end
 
@@ -333,7 +268,7 @@ class Chef
             when "windows"
               set_os_image("MicrosoftWindowsServer", "WindowsServer", "2012-R2-Datacenter")
             else
-              raise ArgumentError, "Invalid value of --azure-image-os-type. Accepted values ubuntu|centos|windows"
+              raise ArgumentError, "Invalid value of --azure-image-os-type. Accepted values ubuntu|centos|rhel|debian|windows"
             end
           else
             validate_arm_keys!(:azure_image_os_type) unless is_image_os_type?
@@ -345,9 +280,9 @@ class Chef
         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)
+          :azure_image_reference_offer,
+          :azure_image_reference_sku,
+          :azure_image_reference_version)
       end
 
       def set_os_image(publisher, img_offer, default_os_version)