knife-azure 3.0.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0134b6b6ce8f4a5ce3e7097fdcf9c04f83259427e8201b3282a29823184d0ccf
-  data.tar.gz: bb831d03702e772f831909c4b644ed3c3b937cf7e5eef32b4f7e837b3be2e371
+  metadata.gz: 17210f56bc1b6b7efd7152512c8ee5c416d0eb6afed2139f757bbd96f20baaa8
+  data.tar.gz: 3cba997f30e540035c9b4495326c09e70d45a3c0d7c9f84d01377168bf73837f
 SHA512:
-  metadata.gz: 5c225c2e51196e543ca85f71b54bf3bb35cbf51dc4078f16e2f2b665118c630cbade53f677b1591698acdbc39a6456927845362c8d8d29b587456c6dc58d684a
-  data.tar.gz: fa4ddcb03f10e04a7ad44b20c9fc1072a54a36d03469d4245495914444fedab3853d8f4f1e98409edda6752370c3d191f28dd09e0a5c7fe67a87cac112ba4c27
+  metadata.gz: 884f5d06b3ad5159a97a81434e508185c64c0850f135b2b71094f70076aeecc0b7670f58d83215531344b903820caefeacec85aee53f7d254cbbbe22eca21548
+  data.tar.gz: f57c4e8b5cad7a9437a4292c1c41b2ff668d9c42f32c322ef1f1ac7fe87d735b8fff7c8d2859500958f3e11616487e0606960f75d39c7948fbdc0fdb46723924

data/lib/azure/resource_management/ARM_interface.rb

@@ -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/windows_credentials.rb

@@ -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/certificate.rb

@@ -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
@@ -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/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_azure.rb

@@ -139,10 +139,10 @@ class Chef
         ext_params
       end
 
-      def wait_until_extension_available(extension_deploy_start_time, extension_availaibility_wait_timeout)
-        extension_availaibility_wait_time = ((Time.now - extension_deploy_start_time) / 60).round
-        if extension_availaibility_wait_time <= extension_availaibility_wait_timeout
-          ## extension availaibility wait time has not exceeded the maximum threshold set for the wait timeout ##
+      def wait_until_extension_available(extension_deploy_start_time, extension_availability_wait_timeout)
+        extension_availability_wait_time = ((Time.now - extension_deploy_start_time) / 60).round
+        if extension_availability_wait_time <= extension_availability_wait_timeout
+          ## extension availability wait time has not exceeded the maximum threshold set for the wait timeout ##
           my_role = nil
           sleep_and_wait = false
           deployment = fetch_deployment
@@ -178,12 +178,12 @@ class Chef
             sleep 30
             wait_until_extension_available(
               extension_deploy_start_time,
-              extension_availaibility_wait_timeout
+              extension_availability_wait_timeout
             )
           end
         else
-          ## extension availaibility wait time exceeded maximum threshold set for the wait timeout ##
-          raise "\nUnable to fetch chef-client run logs as Chef Extension seems to be unavailable even after #{extension_availaibility_wait_timeout} minutes of its deployment.\n"
+          ## extension availability wait time exceeded maximum threshold set for the wait timeout ##
+          raise "\nUnable to fetch chef-client run logs as Chef Extension seems to be unavailable even after #{extension_availability_wait_timeout} minutes of its deployment.\n"
         end
       end
     end

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

@@ -292,9 +292,7 @@ class Chef
 
       def fetch_deployment
         deployment_name = service.deployment_name(config[:azure_dns_name])
-        deployment = service.deployment("hostedservices/#{config[:azure_dns_name]}/deployments/#{deployment_name}")
-
-        deployment
+        service.deployment("hostedservices/#{config[:azure_dns_name]}/deployments/#{deployment_name}")
       end
 
       def fetch_role

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

@@ -93,8 +93,7 @@ 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
@@ -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)
@@ -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)
@@ -278,10 +276,10 @@ class Chef
 
         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."
+            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."
+          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

data/lib/knife-azure/version.rb

@@ -17,7 +17,7 @@
 
 module Knife
   module Azure
-    VERSION = "3.0.1".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: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef