knife-azure 2.0.13 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9baf62dbe0e3f274214deaf426511698b3ed0acbcb5cacbfa2e1d0b7d557a6d2
-  data.tar.gz: 634f4598fbb9b5b65779d211df0de9fa6062635c4b3ebf56d31909547b47980a
+  metadata.gz: '09efc06fd6788aa94f2af8ace7bd411b9d90c4f3df736a0559997bc5298a5336'
+  data.tar.gz: 6cfd515b9371c8d4a7c0c7ed58575f581470c2ecd3ed7604329291c2fb1a1eec
 SHA512:
-  metadata.gz: f15b38070e1a624376327ff112dc753d53d717363b11c60057373ce14e9a3b91bf32264718d44456d3e4b89ca839371d35ac08b9b8bd843c9219c00a84ed8089
-  data.tar.gz: 763b6e6b17c6e14c0ea32e6bcb0a3b79c1c2b37984e0ed25a84f4259eaa56a23ced45eafc46d3d691dbd8dd0e23cbefadf7414acb8baa7ab7fbff0b440a51515
+  metadata.gz: a8e905e8136596fa27fa18898f73dd871138f52118792939df1be75da3f4122bcf358529605793b0a517fb7cf37036bf0b3b7f85ff57ffcec1a8aa1efff45652
+  data.tar.gz: 25b0054daa620887733644c1ad87983fd7e5c325de4781071c81773dee39f83c7a8c2a308c9ee1341220583be9415d8596fa8ac9cf525fd32d0d2facec11c8d0

data/lib/azure/azure_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/custom_errors.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: vasundhara.jagdale@clogeny.com
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/resource_management/ARM_deployment_template.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/resource_management/ARM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -215,7 +215,7 @@ module Azure
         if e.body
           err_json = JSON.parse(e.response.body)
           if err_json["error"]["code"] == "ResourceNotFound"
-            return false
+            false
           else
             raise e
           end
@@ -229,7 +229,7 @@ module Azure
         if e.body
           err_json = JSON.parse(e.response.body)
           if err_json["error"]["code"] == "ResourceNotFound"
-            return false
+            false
           else
             raise e
           end
@@ -323,7 +323,7 @@ module Azure
         else
           ui.log("Creating ResourceGroup....\n\n")
           resource_group = create_resource_group(params)
-          Chef::Log.info("ResourceGroup creation successfull.")
+          Chef::Log.info("ResourceGroup creation successful.")
           Chef::Log.info("Resource Group name is: #{resource_group.name}")
           Chef::Log.info("Resource Group ID is: #{resource_group.id}")
         end
@@ -355,7 +355,7 @@ module Azure
 
           ui.log("Creating Virtual Machine....")
           deployment = create_virtual_machine_using_template(params)
-          ui.log("Virtual Machine creation successfull.") unless deployment.nil?
+          ui.log("Virtual Machine creation successful.") unless deployment.nil?
 
           unless deployment.nil?
             ui.log("Deployment name is: #{deployment.name}")
@@ -422,8 +422,7 @@ module Azure
         deploy_params = Deployment.new
         deploy_params.properties = deploy_prop
 
-        deployment = resource_management_client.deployments.create_or_update(params[:azure_resource_group_name], "#{params[:azure_vm_name]}_deploy", deploy_params)
-        deployment
+        resource_management_client.deployments.create_or_update(params[:azure_resource_group_name], "#{params[:azure_vm_name]}_deploy", deploy_params)
       end
 
       def create_vm_extension(params)
@@ -467,8 +466,7 @@ module Azure
           params[:chef_extension]
         ).last.name
         ext_version_split_values = ext_version.split(".")
-        ext_version = ext_version_split_values[0] + "." + ext_version_split_values[1]
-        ext_version
+        ext_version_split_values[0] + "." + ext_version_split_values[1]
       end
 
       def delete_resource_group(resource_group_name)

data/lib/azure/resource_management/vnet_config.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ module Azure::ARM
       if error.body
         err_json = JSON.parse(error.response.body)
         if err_json["error"]["code"] == "ResourceNotFound"
-          return false
+          false
         else
           raise error
         end

data/lib/azure/resource_management/windows_credentials.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,8 +19,8 @@
 # XPLAT stores the access token and other information in windows credential manager.
 # Using FFI to call CredRead function
 require "chef"
-require "mixlib/shellout"
-require "ffi"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "ffi" unless defined?(FFI)
 require "chef/win32/api"
 
 module Azure
@@ -123,8 +123,8 @@ module Azure
       def target_name
         # cmdkey command is used for accessing windows credential manager.
         # Multiple credentials get created in windows credential manager for a single Azure account in xplat-cli
-        # One of them is for common tanent id, which can't be used
-        # Others end with --0-x,--1-x,--2-x etc, where x represents the total no. of credentails across which the token is divided
+        # One of them is for common tenant id, which can't be used
+        # Others end with --0-x,--1-x,--2-x etc, where x represents the total no. of credentials across which the token is divided
         # The one ending with --0-x has the complete accessToken in the credentialBlob.
         # Refresh Token is split across both credentials (ending with --0-x and --1-x).
         # Xplat splits the credentials based on the number of bytes of the tokens.
@@ -150,8 +150,7 @@ module Azure
 
         # If "azure login" is run for multiple users, there will be multiple credentials
         # Picking up the latest logged in user's credentials
-        latest_target = latest_credential_target target_names
-        latest_target
+        latest_credential_target target_names
       end
 
       def latest_credential_target(targets)

data/lib/azure/service_management/ASM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/ag.rb

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

data/lib/azure/service_management/certificate.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Mukta Aphale (mukta.aphale@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,7 +85,7 @@ module Azure
       ca.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true))
       ca.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
       ca.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
-      ca.sign(key, OpenSSL::Digest::SHA256.new)
+      ca.sign(key, OpenSSL::Digest.new("SHA256"))
       # Generate the SHA1 fingerprint of the der format of the X 509 certificate
       @fingerprint = OpenSSL::Digest::SHA1.new(ca.to_der)
       # Create the pfx format of the certificate
@@ -142,7 +142,7 @@ module Azure
       puts "Certificate Thumbprint: #{@thumbprint.to_s.upcase}"
       puts "*" * 70
 
-      Chef::Config[:knife][:ca_trust_file] = file_path + ".pem" if Chef::Config[:knife][:ca_trust_file].nil?
+      config[:ca_trust_file] = file_path + ".pem" if config[:ca_trust_file].nil?
       cert_data = File.read (file_path + ".b64")
       add_certificate cert_data, @winrm_cert_passphrase, "pfx", cert_params[:azure_dns_name]
       @thumbprint
@@ -216,7 +216,7 @@ module Azure
       cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
       cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
       cert.add_extension(ef.create_extension("extendedKeyUsage", "1.3.6.1.5.5.7.3.1", false))
-      cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
+      cert.sign(rsa_key, OpenSSL::Digest.new("SHA1"))
       @thumbprint = OpenSSL::Digest::SHA1.new(cert.to_der)
       cert
     end

data/lib/azure/service_management/connection.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/deploy.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/disk.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/host.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/image.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/loadbalancer.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/rest.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,10 @@
 # limitations under the License.
 #
 
-require "net/https"
-require "uri"
-require "nokogiri"
+require "net/http" unless defined?(Net::HTTP)
+require "openssl" unless defined?(OpenSSL)
+require "uri" unless defined?(URI)
+require "nokogiri" unless defined?(Nokogiri)
 
 module AzureAPI
 

data/lib/azure/service_management/role.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 require_relative "utility"
 
 module Azure

data/lib/azure/service_management/storageaccount.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/utility.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/vnet.rb

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

data/lib/chef/knife/azure_ag_create.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,9 +50,9 @@ class Chef
           :azure_service_location)
 
         params = {
-          azure_ag_name: locate_config_value(:azure_affinity_group),
-          azure_ag_desc: locate_config_value(:azure_ag_desc),
-          azure_location: locate_config_value(:azure_service_location),
+          azure_ag_name: config[:azure_affinity_group],
+          azure_ag_desc: config[:azure_ag_desc],
+          azure_location: config[:azure_service_location],
         }
 
         rsp = service.create_affinity_group(params)

data/lib/chef/knife/azure_ag_list.rb

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

data/lib/chef/knife/azure_image_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-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,7 @@ class Chef
         validate_asm_keys!
         items = service.list_images
 
-        image_labels = !locate_config_value(:show_all_fields) ? %w{Name OS Location} : %w{Name Category Label OS Location}
+        image_labels = !config[: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(&:downcase)
@@ -49,7 +49,7 @@ class Chef
         end
 
         puts "\n"
-        puts ui.list(image_list, :uneven_columns_across, !locate_config_value(:show_all_fields) ? 3 : 5)
+        puts ui.list(image_list, :uneven_columns_across, !config[: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 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,10 +50,10 @@ class Chef
         validate_asm_keys!(:azure_load_balancer)
 
         params = {
-          azure_load_balancer: locate_config_value(:azure_load_balancer),
-          azure_lb_static_vip: locate_config_value(:azure_lb_static_vip),
-          azure_subnet_name: locate_config_value(:azure_subnet_name),
-          azure_dns_name: locate_config_value(:azure_dns_name),
+          azure_load_balancer: config[:azure_load_balancer],
+          azure_lb_static_vip: config[:azure_lb_static_vip],
+          azure_subnet_name: config[:azure_subnet_name],
+          azure_dns_name: config[:azure_dns_name],
         }
 
         rsp = service.create_internal_lb(params)

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

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) 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_create.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 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
         require "readline"
         require "chef/json_compat"
         require "chef/knife/bootstrap"
@@ -196,7 +196,7 @@ class Chef
 
         config[:connection_port] = server_def[:port]
         config[:connection_protocol] = server_def[:connection_protocol]
-        config[:chef_node_name] = locate_config_value(:chef_node_name) || server_name
+        config[:chef_node_name] = config[:chef_node_name] || server_name
       rescue => error
         ui.error("Something went wrong. Please use -VV option for more details.")
         Chef::Log.debug(error.backtrace.join("\n").to_s)
@@ -216,7 +216,7 @@ class Chef
       alias host_descriptor server_name
 
       def plugin_finalize
-        if locate_config_value(:connection_protocol) == "cloud-api" && locate_config_value(:extended_logs)
+        if config[:connection_protocol] == "cloud-api" && config[:extended_logs]
           print "\nWaiting for the first chef-client run"
           fetch_chef_client_logs(Time.now, 30)
         end
@@ -228,8 +228,8 @@ class Chef
       def wait_until_virtual_machine_ready(retry_interval_in_seconds = 30)
         vm_status = nil
         begin
-          azure_vm_startup_timeout = locate_config_value(:azure_vm_startup_timeout).to_i
-          azure_vm_ready_timeout = locate_config_value(:azure_vm_ready_timeout).to_i
+          azure_vm_startup_timeout = config[:azure_vm_startup_timeout].to_i
+          azure_vm_ready_timeout = config[:azure_vm_ready_timeout].to_i
           vm_status = wait_for_virtual_machine_state(:vm_status_provisioning, azure_vm_startup_timeout, retry_interval_in_seconds)
           if vm_status != :vm_status_ready
             begin
@@ -242,7 +242,7 @@ class Chef
 
           msg_server_summary(@server)
 
-          if locate_config_value(:connection_protocol) == "cloud-api"
+          if config[:connection_protocol] == "cloud-api"
             extension_status = wait_for_resource_extension_state(:wagent_provisioning, 5, retry_interval_in_seconds)
 
             if extension_status != :extension_installing
@@ -323,7 +323,7 @@ class Chef
       end
 
       def get_virtual_machine_status
-        @server = service.get_role_server(locate_config_value(:azure_dns_name), locate_config_value(:azure_vm_name))
+        @server = service.get_role_server(config[:azure_dns_name], config[:azure_vm_name])
         if @server.nil?
           :vm_status_not_detected
         else
@@ -340,14 +340,14 @@ class Chef
       end
 
       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}")
+        deployment_name = service.deployment_name(config[:azure_dns_name])
+        deployment = service.deployment("hostedservices/#{config[:azure_dns_name]}/deployments/#{deployment_name}")
         extension_status = {}
 
         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)
+            if role.at_css("RoleName").text == config[:azure_vm_name]
               lnx_waagent_fail_msg = "Failed to deserialize the status reported by the Guest Agent"
               waagent_status_msg = role.at_css("GuestAgentStatus FormattedMessage Message").text
               if role.at_css("GuestAgentStatus Status").text == "Ready"
@@ -384,32 +384,32 @@ class Chef
 
       def create_server_def
         server_def = {
-          azure_storage_account: locate_config_value(:azure_storage_account),
-          azure_api_host_name: locate_config_value(:azure_api_host_name),
-          azure_dns_name: locate_config_value(:azure_dns_name),
-          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_source_image: locate_config_value(:azure_source_image),
-          azure_vm_size: locate_config_value(:azure_vm_size),
-          tcp_endpoints: locate_config_value(:tcp_endpoints),
-          udp_endpoints: locate_config_value(:udp_endpoints),
-          connection_protocol: locate_config_value(:connection_protocol),
-          azure_connect_to_existing_dns: locate_config_value(:azure_connect_to_existing_dns),
-          connection_user: locate_config_value(:connection_user),
-          azure_availability_set: locate_config_value(:azure_availability_set),
-          azure_affinity_group: locate_config_value(:azure_affinity_group),
-          azure_network_name: locate_config_value(:azure_network_name),
-          azure_subnet_name: locate_config_value(:azure_subnet_name),
-          ssl_cert_fingerprint: locate_config_value(:thumbprint),
-          cert_path: locate_config_value(:cert_path),
-          cert_password: locate_config_value(:cert_passphrase),
-          winrm_ssl: locate_config_value(:winrm_ssl),
-          winrm_max_timeout: locate_config_value(:winrm_max_timeout).to_i * 60 * 1000, # converting minutes to milliseconds
-          winrm_max_memory_per_shell: locate_config_value(:winrm_max_memory_per_shell),
+          azure_storage_account: config[:azure_storage_account],
+          azure_api_host_name: config[:azure_api_host_name],
+          azure_dns_name: config[:azure_dns_name],
+          azure_vm_name: config[:azure_vm_name],
+          azure_service_location: config[:azure_service_location],
+          azure_os_disk_name: config[:azure_os_disk_name],
+          azure_source_image: config[:azure_source_image],
+          azure_vm_size: config[:azure_vm_size],
+          tcp_endpoints: config[:tcp_endpoints],
+          udp_endpoints: config[:udp_endpoints],
+          connection_protocol: config[:connection_protocol],
+          azure_connect_to_existing_dns: config[:azure_connect_to_existing_dns],
+          connection_user: config[:connection_user],
+          azure_availability_set: config[:azure_availability_set],
+          azure_affinity_group: config[:azure_affinity_group],
+          azure_network_name: config[:azure_network_name],
+          azure_subnet_name: config[:azure_subnet_name],
+          ssl_cert_fingerprint: config[:thumbprint],
+          cert_path: config[:cert_path],
+          cert_password: config[:cert_passphrase],
+          winrm_ssl: config[:winrm_ssl],
+          winrm_max_timeout: config[:winrm_max_timeout].to_i * 60 * 1000, # converting minutes to milliseconds
+          winrm_max_memory_per_shell: config[:winrm_max_memory_per_shell],
         }
 
-        if locate_config_value(:connection_protocol) == "cloud-api"
+        if config[:connection_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
@@ -420,20 +420,20 @@ class Chef
             # We can specify the AdminUsername after API version 2013-03-01. However, in this API version,
             # the AdminUsername is a required parameter.
             # Also, the user name cannot be Administrator, Admin, Admin1 etc, for enhanced security (provided by Azure)
-            if locate_config_value(:connection_user).nil? || locate_config_value(:connection_user).downcase =~ /admin*/
+            if config[:connection_user].nil? || config[:connection_user].downcase =~ /admin*/
               ui.error("Connection User is compulsory parameter and it cannot be named 'admin*'")
               exit 1
             # take cares of when user name contains domain
             # azure add role api doesn't support '\\' in user name
-            elsif locate_config_value(:connection_user).split('\\').length.eql?(2)
-              server_def[:connection_user] = locate_config_value(:connection_user).split('\\')[1]
+            elsif config[:connection_user].split('\\').length.eql?(2)
+              server_def[:connection_user] = config[:connection_user].split('\\')[1]
             end
           else
-            unless locate_config_value(:connection_user)
+            unless config[:connection_user]
               ui.error("Connection User is compulsory parameter")
               exit 1
             end
-            unless locate_config_value(:connection_password) || locate_config_value(:ssh_identity_file)
+            unless config[:connection_password] || config[:ssh_identity_file]
               ui.error("Specify either SSH Key or SSH Password")
               exit 1
             end
@@ -442,52 +442,52 @@ class Chef
 
         if is_image_windows?
           server_def[:os_type] = "Windows"
-          server_def[:admin_password] = locate_config_value(:connection_password)
-          server_def[:connection_protocol] = locate_config_value(:connection_protocol) || "winrm"
+          server_def[:admin_password] = config[:connection_password]
+          server_def[:connection_protocol] = config[:connection_protocol] || "winrm"
         else
           server_def[:os_type] = "Linux"
-          server_def[:connection_protocol] = locate_config_value(:connection_protocol).nil? || locate_config_value(:connection_protocol) == "winrm" ? "ssh" : locate_config_value(:connection_protocol)
-          server_def[:connection_user] = locate_config_value(:connection_user)
-          server_def[:connection_password] = locate_config_value(:connection_password)
-          server_def[:ssh_identity_file] = locate_config_value(:ssh_identity_file)
-          server_def[:identity_file_passphrase] = locate_config_value(:identity_file_passphrase)
+          server_def[:connection_protocol] = config[:connection_protocol].nil? || config[:connection_protocol] == "winrm" ? "ssh" : config[:connection_protocol]
+          server_def[:connection_user] = config[:connection_user]
+          server_def[:connection_password] = config[:connection_password]
+          server_def[:ssh_identity_file] = config[:ssh_identity_file]
+          server_def[:identity_file_passphrase] = config[:identity_file_passphrase]
         end
 
-        azure_connect_to_existing_dns = locate_config_value(:azure_connect_to_existing_dns)
+        azure_connect_to_existing_dns = config[:azure_connect_to_existing_dns]
         if is_image_windows? && server_def[:connection_protocol] == "winrm"
-          port = locate_config_value(:connection_port) || "5985"
-          port = locate_config_value(:connection_port) || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
+          port = config[:connection_port] || "5985"
+          port = config[:connection_port] || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
         elsif server_def[:connection_protocol] == "ssh"
-          port = locate_config_value(:connection_port) || "22"
-          port = locate_config_value(:connection_port) || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
+          port = config[:connection_port] || "22"
+          port = config[:connection_port] || Random.rand(64000) + 1000 if azure_connect_to_existing_dns
         end
 
         server_def[:port] = port
 
-        server_def[:is_vm_image] = service.vm_image?(locate_config_value(:azure_source_image))
-        server_def[:azure_domain_name] = locate_config_value(:azure_domain_name) if locate_config_value(:azure_domain_name)
+        server_def[:is_vm_image] = service.vm_image?(config[:azure_source_image])
+        server_def[:azure_domain_name] = config[:azure_domain_name] if config[:azure_domain_name]
 
-        if locate_config_value(:azure_domain_user)
+        if config[:azure_domain_user]
           # extract domain name since it should be part of username
-          case locate_config_value(:azure_domain_user)
+          case config[:azure_domain_user]
           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_domain_name] = $1 if config[: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
-            server_def[:azure_domain_name] = $2 if locate_config_value(:azure_domain_name).nil?
+            server_def[:azure_domain_name] = $2 if config[:azure_domain_name].nil?
             server_def[:azure_user_domain_name] = $2
             server_def[:azure_domain_user] = $1
           else
-            if locate_config_value(:azure_domain_name).nil?
+            if config[:azure_domain_name].nil?
               ui.error('--azure-domain-name should be specified if --azure-domain-user is not in one of the following formats: fully-qualified-DNS-domain\username, user@fully-qualified-DNS-domain')
               exit 1
             end
-            server_def[:azure_domain_user] = locate_config_value(:azure_domain_user)
+            server_def[:azure_domain_user] = config[:azure_domain_user]
           end
         end
-        server_def[:azure_domain_passwd] = locate_config_value(:azure_domain_passwd)
-        server_def[:azure_domain_ou_dn] = locate_config_value(:azure_domain_ou_dn)
+        server_def[:azure_domain_passwd] = config[:azure_domain_passwd]
+        server_def[:azure_domain_ou_dn] = config[:azure_domain_ou_dn]
 
         server_def
       end
@@ -499,17 +499,17 @@ class Chef
       end
 
       def set_configs
-        unless locate_config_value(:connection_user).nil?
-          config[:connection_user] = locate_config_value(:connection_user)
+        unless config[:connection_user].nil?
+          config[:connection_user] = config[:connection_user]
         end
 
-        unless locate_config_value(:connection_password).nil?
-          config[:connection_password] = locate_config_value(:connection_password)
+        unless config[:connection_password].nil?
+          config[:connection_password] = config[:connection_password]
         end
 
-        config[:azure_dns_name] = get_dns_name(locate_config_value(:azure_dns_name))
-        config[:azure_vm_name] = locate_config_value(:azure_dns_name) unless locate_config_value(:azure_vm_name)
-        config[:chef_node_name] = locate_config_value(:azure_vm_name) unless locate_config_value(:chef_node_name)
+        config[:azure_dns_name] = get_dns_name(config[:azure_dns_name])
+        config[:azure_vm_name] = config[:azure_dns_name] unless config[:azure_vm_name]
+        config[:chef_node_name] = config[:azure_vm_name] unless config[:chef_node_name]
       end
 
       # This is related to Windows VM's specifically and computer name
@@ -520,10 +520,10 @@ 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?
+        if config[:azure_vm_name].nil?
           (prefix + SecureRandom.hex((MAX_VM_NAME_CHARACTERS - prefix.length) / 2))
         else
-          locate_config_value(:azure_vm_name)
+          config[:azure_vm_name]
         end
       end
     end