knife-azure 2.0.11 → 3.0.4

data/lib/chef/knife/{azurerm_base.rb → helpers/azurerm_base.rb}

@@ -1,7 +1,7 @@
 #
 # 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");
@@ -24,7 +24,7 @@ class Chef
     module AzurermBase
       include Chef::Mixin::ShellOut
 
-      ## azure-xplat-cli versio that introduced deprecation of Windows Credentials
+      ## azure-xplat-cli version that introduced deprecation of Windows Credentials
       ## Manager (WCM) usage for authentication credentials storage purpose ##
       XPLAT_VERSION_WITH_WCM_DEPRECATED ||= "0.10.5".freeze
 
@@ -33,7 +33,7 @@ class Chef
           deps do
             require "readline"
             require "chef/json_compat"
-            require_relative "../../azure/resource_management/ARM_interface"
+            require_relative "../../../azure/resource_management/ARM_interface"
             require "chef/mixin/shell_out"
             require "time"
             require "json"
@@ -53,26 +53,18 @@ class Chef
 
       def service
         details = authentication_details
-        details.update(azure_subscription_id: locate_config_value(:azure_subscription_id))
+        details.update(azure_subscription_id: config[:azure_subscription_id])
         @service ||= begin
+                      require_relative "../../../azure/resource_management/ARM_interface"
                       service = Azure::ResourceManagement::ARMInterface.new(details)
                     end
         @service.ui = ui
         @service
       end
 
-      def locate_config_value(key)
-        key = key.to_sym
-        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
       def validate_arm_keys!(*keys)
-        parse_publish_settings_file(locate_config_value(:azure_publish_settings_file)) unless locate_config_value(:azure_publish_settings_file).nil?
+        parse_publish_settings_file(config[:azure_publish_settings_file]) unless config[:azure_publish_settings_file].nil?
         keys.push(:azure_subscription_id)
 
         if azure_cred?
@@ -83,7 +75,7 @@ class Chef
 
         errors = []
         keys.each do |k|
-          if locate_config_value(k).nil?
+          if config[k].nil?
             errors << "You did not provide a valid '#{pretty_key(k)}' value. Please set knife[:#{k}] in your knife.rb."
           end
         end
@@ -94,20 +86,19 @@ 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: config[:azure_tenant_id], azure_client_id: config[:azure_client_id], azure_client_secret: config[:azure_client_secret] }
         elsif Chef::Platform.windows?
           token_details = token_details_for_windows
         else
           token_details = token_details_for_linux
         end
 
-        token_details = check_token_validity(token_details)
-        token_details
+        check_token_validity(token_details)
       end
 
       def get_azure_cli_version
         if @azure_version != ""
-          get_version = shell_out!("azure -v || az -v | grep azure-cli", { returns: [0] }).stdout
+          get_version = shell_out!("azure -v || az -v | grep azure-cli", returns: [0]).stdout
           @azure_version = get_version.gsub(/[^0-9.]/, "")
         end
         @azure_prefix = @azure_version.to_i < 2 ? "azure" : "az"
@@ -130,19 +121,18 @@ 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"] }
       end
 
       def is_token_valid?(token_details)
         time_difference = Time.parse(token_details[:expiry_time]) - Time.now.utc
         if time_difference <= 0
-          return false
+          false
         elsif time_difference <= 600 # 600sec = 10min
           # This is required otherwise a long running command may fail inbetween if the token gets expired.
           raise "Token will expire within 10 minutes. Please run '#{@azure_prefix} login' command"
         else
-          return true
+          true
         end
       end
 
@@ -175,8 +165,7 @@ class Chef
           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
+          if !File.exist?(home_dir + "/.azure/accessTokens.json") || ( File.size?(home_dir + "/.azure/accessTokens.json") <= 2 )
             raise login_message
           end
         end
@@ -194,15 +183,15 @@ class Chef
           # 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
+            config[:azure_api_host_name] = URI(profile.attribute("Url").value).host
           elsif profile.attribute("SchemaVersion").value == "2.0"
             management_cert = OpenSSL::PKCS12.new(Base64.decode64(subscription.attribute("ManagementCertificate").value))
-            Chef::Config[:knife][:azure_api_host_name] = URI(subscription.attribute("ServiceManagementUrl").value).host
+            config[:azure_api_host_name] = URI(subscription.attribute("ServiceManagementUrl").value).host
           else
             ui.error("Publish settings file Schema not supported - " + filename)
           end
-          Chef::Config[:knife][:azure_mgmt_cert] = management_cert.certificate.to_pem + management_cert.key.to_pem
-          Chef::Config[:knife][:azure_subscription_id] = doc.at_css("Subscription").attribute("Id").value
+          config[:azure_mgmt_cert] = management_cert.certificate.to_pem + management_cert.key.to_pem
+          config[:azure_subscription_id] = doc.at_css("Subscription").attribute("Id").value
         rescue => error
           puts "#{error.class} and #{error.message}"
           exit 1
@@ -228,7 +217,7 @@ class Chef
       def msg_server_summary(server)
         puts "\n\n"
         if server.provisioningstate == "Succeeded"
-          Chef::Log.info("Server creation went successfull.")
+          Chef::Log.info("Server creation went successful.")
           puts "\nServer Details are:\n"
 
           msg_pair("Server ID", server.id)
@@ -249,7 +238,7 @@ class Chef
         puts "\n\n"
 
         if server.resources.provisioning_state == "Succeeded"
-          Chef::Log.info("Server Extension creation went successfull.")
+          Chef::Log.info("Server Extension creation went successful.")
           puts "\nServer Extension Details are:\n"
 
           msg_pair("Server Extension ID", server.resources.id)
@@ -265,56 +254,56 @@ class Chef
       end
 
       def validate_params!
-        if locate_config_value(:connection_user).nil?
+        if config[: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?
+        unless config[:connection_password].nil? ^ config[: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)
+        if config[:azure_vnet_subnet_name] && !config[:azure_vnet_name]
           raise ArgumentError, "When --azure-vnet-subnet-name is specified, the --azure-vnet-name must also be specified."
         end
 
-        if locate_config_value(:azure_vnet_subnet_name) == "GatewaySubnet"
+        if config[:azure_vnet_subnet_name] == "GatewaySubnet"
           raise ArgumentError, "GatewaySubnet cannot be used as the name for --azure-vnet-subnet-name option. GatewaySubnet can only be used for virtual network gateways."
         end
 
-        if locate_config_value(:node_ssl_verify_mode) && !%w{none peer}.include?(locate_config_value(:node_ssl_verify_mode))
-          raise ArgumentError, "Invalid value '#{locate_config_value(:node_ssl_verify_mode)}' for --node-ssl-verify-mode. Use Valid values i.e 'none', 'peer'."
+        if config[:node_ssl_verify_mode] && !%w{none peer}.include?(config[:node_ssl_verify_mode])
+          raise ArgumentError, "Invalid value '#{config[: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(: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."
+          if (config[: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 maximum length cannot exceed 64 characters."
           end
-        elsif (locate_config_value(:azure_vm_name).match /^(?=.*[a-zA-Z-])([a-zA-z0-9-]{1,15})$/).nil?
-          raise ArgumentError, "VM name can only contain alphanumeric and hyphen(-) characters and maximun length cannot exceed 15 charachters."
+        elsif (config[:azure_vm_name].match /^(?=.*[a-zA-Z-])([a-zA-z0-9-]{1,15})$/).nil?
+          raise ArgumentError, "VM name can only contain alphanumeric and hyphen(-) characters and maximum length cannot exceed 15 characters."
         end
 
-        if locate_config_value(:server_count).to_i > 5
+        if config[:server_count].to_i > 5
           raise ArgumentError, "Maximum allowed value of --server-count is 5."
         end
 
-        if locate_config_value(:daemon)
+        if config[:daemon]
           unless is_image_windows?
             raise ArgumentError, "The daemon option is only support for Windows nodes."
           end
 
-          unless %w{none service task}.include?(locate_config_value(:daemon))
+          unless %w{none service task}.include?(config[:daemon])
             raise ArgumentError, "Invalid value for --daemon option. Use valid daemon values i.e 'none', 'service' and 'task'."
           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))
+        if config[:azure_image_os_type]
+          unless %w{ubuntu centos rhel debian windows}.include?(config[: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 unless locate_config_value(:ohai_hints).casecmp("default").zero?
+        config[:ohai_hints] = format_ohai_hints(config[:ohai_hints])
+        validate_ohai_hints unless config[:ohai_hints].casecmp("default").zero?
       end
 
       private
@@ -330,15 +319,15 @@ class Chef
       end
 
       def is_image_windows?
-        locate_config_value(:azure_image_reference_offer) =~ /WindowsServer.*/
+        config[:azure_image_reference_offer] =~ /WindowsServer.*/
       end
 
       def is_azure_cred?
-        locate_config_value(:azure_tenant_id) && locate_config_value(:azure_client_id) && locate_config_value(:azure_client_secret)
+        config[:azure_tenant_id] && config[:azure_client_id] && config[:azure_client_secret]
       end
 
       def azure_cred?
-        locate_config_value(:azure_tenant_id).nil? || locate_config_value(:azure_client_id).nil? || locate_config_value(:azure_client_secret).nil?
+        config[:azure_tenant_id].nil? || config[:azure_client_id].nil? || config[:azure_client_secret].nil?
       end
 
       def is_old_xplat?

data/lib/knife-azure/version.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");
@@ -17,7 +17,7 @@
 
 module Knife
   module Azure
-    VERSION = "2.0.11".freeze
+    VERSION = "3.0.4".freeze
     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: 2.0.11
+  version: 3.0.4
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.1'
+        version: 15.10.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.1'
-- !ruby/object:Gem::Dependency
-  name: chef-bin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '15.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '15.1'
+        version: 15.10.21
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -97,22 +83,22 @@ dependencies:
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 0.20.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.3
+        version: 0.20.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +193,6 @@ files:
 - lib/azure/service_management/vnet.rb
 - lib/chef/knife/azure_ag_create.rb
 - lib/chef/knife/azure_ag_list.rb
-- lib/chef/knife/azure_base.rb
 - lib/chef/knife/azure_image_list.rb
 - lib/chef/knife/azure_internal-lb_create.rb
 - lib/chef/knife/azure_internal-lb_list.rb
@@ -217,7 +202,6 @@ files:
 - lib/chef/knife/azure_server_show.rb
 - lib/chef/knife/azure_vnet_create.rb
 - lib/chef/knife/azure_vnet_list.rb
-- lib/chef/knife/azurerm_base.rb
 - lib/chef/knife/azurerm_server_create.rb
 - lib/chef/knife/azurerm_server_delete.rb
 - lib/chef/knife/azurerm_server_list.rb
@@ -226,6 +210,8 @@ files:
 - lib/chef/knife/bootstrap/common_bootstrap_options.rb
 - lib/chef/knife/bootstrap_azure.rb
 - lib/chef/knife/bootstrap_azurerm.rb
+- lib/chef/knife/helpers/azure_base.rb
+- lib/chef/knife/helpers/azurerm_base.rb
 - lib/knife-azure/version.rb
 homepage: https://github.com/chef/knife-azure
 licenses:
@@ -239,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="