knife-azure 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e88a7081dafbf64000602515bbcf0d7a94626b01b10b0eeceacfc9422af357a
-  data.tar.gz: 1b5bcb5fa0b5d4b714786960a31dec0227341dffaa78912d659f815333c07f57
+  metadata.gz: ba6a2397f4641337ac1c0e35e060bdec8878111da9ca1d41d5207e15a0209b71
+  data.tar.gz: fb2691f81f0ba4c79d3dd86e7d04ff1ec92b85da1dfda35641b8b65d8b8f1025
 SHA512:
-  metadata.gz: 1fc54ec3e79cc6334b5a2963474864be613e4b181ce5bab21a95773b0dea1de5a3ea3aab1dada8650df5c1f339e99973ac857d0d5e2870fc98cdbd164199744b
-  data.tar.gz: 1580127f2c555cd0112b18acb703114a9c5ebf6fbfe596573a3411540dc9982d54edc668fc6fd0b4190fb6dbbf9e378f8a9426945538a909c5036c0555d7232a
+  metadata.gz: c9f8f4ba4b588eeca8037853e842cae06e7cb699fc758fbe83c3e0e7b6d05ae67319a65bb85e4a97fc34c28c5590dad65980856052883be1becf2bd4bbf7d9b9
+  data.tar.gz: c7f1e891b81df8dc594a349ddffb61b9fb0fb6d8cc90ff3d6a972b82b1e2a199fa2b8a89631f86cf41678d9ae5dd8949806d21a0c76365d1e57db6d7750f3d5c

data/lib/azure/custom_errors.rb

@@ -29,6 +29,6 @@ module CustomErrors
       caller.first =~ /in \`(.+)\'/
       method_name = $1
       raise CustomErrors::InterfaceNotImplementedError.new("#{klass.class.name} needs to implement '#{method_name}' for interface #{name}!")
-   end
+    end
   end
 end

data/lib/azure/resource_management/ARM_deployment_template.rb

@@ -51,7 +51,7 @@ module Azure::ARM
       # Security Rule priority can be set between 100 and 4096
       rule_no = 300
       incremental = 0
-      for port in tcp_ports
+      tcp_ports.each do |port|
         rule_no += 2
         sec_grp_json["properties"]["securityRules"].push(
           "name" => vm_name + "_rule_" + incremental.to_s,
@@ -510,7 +510,7 @@ module Azure::ARM
         }
 
         length = template["resources"].length.to_i - 1
-        for i in 0..length do
+        (0..length).each do |i|
           if template["resources"][i]["type"] == "Microsoft.Compute/virtualMachines"
             template["resources"][i]["dependsOn"] << "[concat('Microsoft.Compute/availabilitySets/', parameters('availabilitySetName'))]"
             template["resources"][i]["properties"]["availabilitySet"] = { "id" => "[resourceId('Microsoft.Compute/availabilitySets', parameters('availabilitySetName'))]" }
@@ -523,7 +523,7 @@ module Azure::ARM
         sec_grp_json = tcp_ports(params[:tcp_endpoints], params[:azure_vm_name])
         template["resources"].insert(1, sec_grp_json)
         length = template["resources"].length.to_i - 1
-        for i in 0..length do
+        (0..length).each do |i|
           if template["resources"][i]["type"] == "Microsoft.Network/virtualNetworks"
             template["resources"][i] = template["resources"][i].merge({ "dependsOn" => [sec_grp] })
           end
@@ -558,7 +558,7 @@ module Azure::ARM
       end
       if params[:server_count].to_i > 1 && params[:chef_extension_private_param][:validation_key].nil?
         template["resources"].last["properties"]["protectedSettings"]["client_pem"] = "[parameters(concat('client_pem',copyIndex()))]"
-        0.upto (params[:server_count].to_i - 1) do |count|
+        0.upto(params[:server_count].to_i - 1) do |count|
           template["parameters"]["client_pem" + count.to_s] = {
             "type" => "string",
             "metadata" => {
@@ -658,7 +658,7 @@ module Azure::ARM
         },
       }
       if params[:server_count].to_i > 1 && params[:chef_extension_private_param][:validation_key].nil?
-        0.upto (params[:server_count].to_i - 1) do |count|
+        0.upto(params[:server_count].to_i - 1) do |count|
           parameters["client_pem#{count}"] = {
               "value" => "#{params[:chef_extension_private_param][("client_pem" + count.to_s).to_sym]}",
             }

data/lib/azure/resource_management/ARM_interface.rb

@@ -307,7 +307,7 @@ module Azure
             ## chef-client run did not complete within maximum timeout of 30 minutes ##
             ## fetch whatever logs available under the chef-client.log file ##
             color = :yellow
-            end
+          end
           puts ui.color(status, color, :bold).to_s
           puts "----> chef-client run logs: "
           puts "\n#{message}\n" ## message field of substatus contains the chef-client run logs ##
@@ -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)
@@ -486,11 +484,9 @@ module Azure
           err_details = err_json["error"]["details"] if err_json["error"]
           if err_details
             err_details.each do |err|
-              begin
-                ui.error(JSON.parse(err["message"])["error"]["message"])
-              rescue JSON::ParserError => e
-                ui.error(err["message"])
-              end
+              ui.error(JSON.parse(err["message"])["error"]["message"])
+            rescue JSON::ParserError => e
+              ui.error(err["message"])
             end
           else
             ui.error(err_json["error"]["message"])

data/lib/azure/resource_management/windows_credentials.rb

@@ -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
@@ -66,7 +66,7 @@ module Azure
           :Attributes, CREDENTIAL_ATTRIBUTE,
           :TargetAlias, :LPTSTR,
           :UserName, :LPTSTR
-        end
+      end
 
       # Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa374804(v=vs.85).aspx
       safe_attach_function :CredReadW, %i{LPCTSTR DWORD DWORD pointer}, :BOOL
@@ -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)
@@ -179,5 +178,5 @@ module Azure
         end
       end
     end
-end
+  end
 end

data/lib/chef/knife/azurerm_server_create.rb

@@ -31,7 +31,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
         include Knife::AzurermBase
       end
 
@@ -292,7 +292,7 @@ class Chef
       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] = config[:azure_image_reference_sku] ? config[:azure_image_reference_sku] : default_os_version
+        config[:azure_image_reference_sku] = config[:azure_image_reference_sku] || default_os_version
       end
 
       def is_image_os_type?

data/lib/chef/knife/azurerm_server_delete.rb

@@ -51,7 +51,7 @@ class Chef
         long: "--delete-resource-group",
         boolean: true,
         default: false,
-        description: "Deletes corresponding resource group along with Vitual Machine."
+        description: "Deletes corresponding resource group along with Virtual Machine."
 
       # Extracted from Chef::Knife.delete_object, because it has a
       # confirmation step built in... By specifying the '--purge'

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

@@ -16,7 +16,11 @@
 # limitations under the License.
 #
 
-require_relative "../../../azure/resource_management/ARM_interface"
+module Azure
+  class ResourceManagement
+    autoload :ARMInterface, "azure/resource_management/ARM_interface"
+  end
+end
 
 class Chef
   class Knife
@@ -45,16 +49,11 @@ class Chef
             config[:azure_chef_extension_version]
           else
             chef_extension_name ||= get_chef_extension_name
-            if @service.instance_of? Azure::ResourceManagement::ARMInterface
-              service.get_latest_chef_extension_version(
-                azure_service_location: config[:azure_service_location],
-                chef_extension_publisher: get_chef_extension_publisher,
-                chef_extension: chef_extension_name
-              )
-            elsif @service.instance_of? Azure::ServiceManagement::ASMInterface
-              extensions = service.get_extension(chef_extension_name, get_chef_extension_publisher)
-              extensions.css("Version").max.text.split(".").first + ".*"
-            end
+            service.get_latest_chef_extension_version(
+              azure_service_location: config[:azure_service_location],
+              chef_extension_publisher: get_chef_extension_publisher,
+              chef_extension: chef_extension_name
+            )
           end
         end
 

data/lib/chef/knife/bootstrap_azurerm.rb

@@ -29,7 +29,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "time"
+        require "time" unless defined?(Time)
         include Knife::AzurermBase
       end
 

data/lib/chef/knife/helpers/azurerm_base.rb

@@ -35,8 +35,8 @@ class Chef
             require "chef/json_compat"
             require_relative "../../../azure/resource_management/ARM_interface"
             require "chef/mixin/shell_out"
-            require "time"
-            require "json"
+            require "time" unless defined?(Time)
+            require "json" unless defined?(JSON)
 
             if Chef::Platform.windows?
               require_relative "../../azure/resource_management/windows_credentials"
@@ -76,7 +76,7 @@ class Chef
         errors = []
         keys.each do |k|
           if config[k].nil?
-            errors << "You did not provide a valid '#{pretty_key(k)}' value. Please set knife[:#{k}] in your knife.rb."
+            errors << "You did not provide a valid '#{pretty_key(k)}' value. Please set knife[:#{k}] in your config.rb (knife.rb)."
           end
         end
         if errors.each { |e| ui.error(e) }.any?
@@ -93,13 +93,12 @@ class Chef
           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"
@@ -122,8 +121,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"] }
       end
 
       def is_token_valid?(token_details)
@@ -174,10 +172,10 @@ class Chef
       end
 
       def parse_publish_settings_file(filename)
-        require "nokogiri"
-        require "base64"
-        require "openssl"
-        require "uri"
+        require "nokogiri" unless defined?(Nokogiri)
+        require "base64" unless defined?(Base64)
+        require "openssl" unless defined?(OpenSSL)
+        require "uri" unless defined?(URI)
         begin
           doc = Nokogiri::XML(File.open(find_file(filename)))
           profile = doc.at_css("PublishProfile")
@@ -219,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)
@@ -240,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)
@@ -277,11 +275,11 @@ class Chef
         end
 
         if !is_image_windows?
-          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 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 (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 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 config[:server_count].to_i > 5
@@ -351,7 +349,7 @@ class Chef
         ## in Windows Credentails Manager (WCM).
         ## Newer versions use the same pattern across platforms where credentials gets
         ## stored in ~/.azure/accessTokens.json file.
-        "Please run XPLAT's '#{@azure_prefix} login' command OR specify azure_tenant_id, azure_subscription_id, azure_client_id, azure_client_secret in your knife.rb"
+        "Please run XPLAT's '#{@azure_prefix} login' command OR specify azure_tenant_id, azure_subscription_id, azure_client_id, azure_client_secret in your config.rb (knife.rb)."
       end
     end
   end

data/lib/knife-azure/version.rb

@@ -17,7 +17,7 @@
 
 module Knife
   module Azure
-    VERSION = "3.0.0".freeze
+    VERSION = "4.0.0".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: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Barry Davis
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 15.10.21
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 15.10.21
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -83,22 +83,22 @@ dependencies:
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A plugin to the Chef knife tool for creating instances on the Microsoft
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A plugin to the Chef Infra knife tool for creating instances on the Microsoft
   Azure platform
 email: oss@chef.io
 executables: []
@@ -177,40 +191,13 @@ files:
 - lib/azure/resource_management/ARM_interface.rb
 - lib/azure/resource_management/vnet_config.rb
 - lib/azure/resource_management/windows_credentials.rb
-- lib/azure/service_management/ASM_interface.rb
-- lib/azure/service_management/ag.rb
-- lib/azure/service_management/certificate.rb
-- lib/azure/service_management/connection.rb
-- lib/azure/service_management/deploy.rb
-- lib/azure/service_management/disk.rb
-- lib/azure/service_management/host.rb
-- lib/azure/service_management/image.rb
-- lib/azure/service_management/loadbalancer.rb
-- lib/azure/service_management/rest.rb
-- lib/azure/service_management/role.rb
-- lib/azure/service_management/storageaccount.rb
-- lib/azure/service_management/utility.rb
-- lib/azure/service_management/vnet.rb
-- lib/chef/knife/azure_ag_create.rb
-- lib/chef/knife/azure_ag_list.rb
-- lib/chef/knife/azure_image_list.rb
-- lib/chef/knife/azure_internal-lb_create.rb
-- lib/chef/knife/azure_internal-lb_list.rb
-- lib/chef/knife/azure_server_create.rb
-- lib/chef/knife/azure_server_delete.rb
-- lib/chef/knife/azure_server_list.rb
-- 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_server_create.rb
 - lib/chef/knife/azurerm_server_delete.rb
 - lib/chef/knife/azurerm_server_list.rb
 - lib/chef/knife/azurerm_server_show.rb
 - lib/chef/knife/bootstrap/bootstrapper.rb
 - 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
@@ -225,16 +212,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: A plugin to the Chef knife tool for creating instances on the Microsoft Azure
-  platform
+summary: A plugin to the Chef Infra knife tool for creating instances on the Microsoft
+  Azure platform
 test_files: []