knife-azure 1.9.0 → 2.0.1

data/lib/azure/resource_management/ARM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 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");
@@ -86,15 +86,14 @@ module Azure
         end
       end
 
-      def list_images
-      end
+      def list_images; end
 
       def list_servers(resource_group_name = nil)
-        if resource_group_name.nil?
-          servers = compute_management_client.virtual_machines.list_all
-        else
-          servers = compute_management_client.virtual_machines.list(resource_group_name)
-        end
+        servers = if resource_group_name.nil?
+                    compute_management_client.virtual_machines.list_all
+                  else
+                    compute_management_client.virtual_machines.list(resource_group_name)
+                  end
 
         cols = ["VM Name", "Resource Group Name", "Location", "Provisioning State", "OS Type"]
         rows = []
@@ -152,14 +151,14 @@ module Azure
           network_interface_name = server.network_profile.network_interfaces[0].id.split("/")[-1]
           network_interface_data = network_resource_client.network_interfaces.get(resource_group, network_interface_name)
           public_ip_id_data = network_interface_data.ip_configurations[0].public_ipaddress
-          unless public_ip_id_data.nil?
+          if public_ip_id_data.nil?
+            public_ip_data = nil
+          else
             public_ip_name = public_ip_id_data.id.split("/")[-1]
             public_ip_data = network_resource_client.public_ipaddresses.get(resource_group, public_ip_name)
-          else
-            public_ip_data = nil
           end
 
-          details = Array.new
+          details = []
           details << ui.color("Server Name", :bold, :cyan)
           details << server.name
 
@@ -188,18 +187,18 @@ module Azure
           details << server.storage_profile.os_disk.os_type
 
           details << ui.color("Public IP address", :bold, :cyan)
-          unless public_ip_data.nil?
-            details << public_ip_data.ip_address
-          else
-            details << " -- "
-          end
+          details << if public_ip_data.nil?
+                       " -- "
+                     else
+                       public_ip_data.ip_address
+                     end
 
           details << ui.color("FQDN", :bold, :cyan)
-          unless public_ip_data.nil? || public_ip_data.dns_settings.nil?
-            details << public_ip_data.dns_settings.fqdn
-          else
-            details << " -- "
-          end
+          details << if public_ip_data.nil? || public_ip_data.dns_settings.nil?
+                       " -- "
+                     else
+                       public_ip_data.dns_settings.fqdn
+                     end
 
           puts ui.list(details, :columns_across, 2)
         end
@@ -243,11 +242,11 @@ module Azure
 
       def platform(image_reference)
         @platform ||= begin
-          if image_reference =~ /WindowsServer.*/
-            platform = "Windows"
-          else
-            platform = "Linux"
-          end
+          platform = if image_reference =~ /WindowsServer.*/
+                       "Windows"
+                     else
+                       "Linux"
+                     end
           platform
         end
       end
@@ -279,7 +278,18 @@ module Azure
         ## fetch substatus field which contains the chef-client run logs ##
         substatus = fetch_substatus(resource_group_name, virtual_machine_name, chef_extension_name)
 
-        unless substatus.nil?
+        if substatus.nil?
+          ## unavailability of the substatus field indicates that chef-client run is not completed yet on the server ##
+          fetch_process_wait_time = ((Time.now - fetch_process_start_time) / 60).round
+          if fetch_process_wait_time <= fetch_process_wait_timeout
+            print ui.color(".", :bold).to_s
+            sleep 30
+            fetch_chef_client_logs(resource_group_name, virtual_machine_name, chef_extension_name, fetch_process_start_time, fetch_process_wait_timeout)
+          else
+            ## wait time exceeded 30 minutes timeout ##
+            ui.error "\nchef-client run logs could not be fetched since fetch process exceeded wait timeout of #{fetch_process_wait_timeout} minutes.\n"
+          end
+        else
           ## chef-client run logs becomes available ##
           status = parse_substatus_code(substatus.code, 2)
           message = substatus.message
@@ -287,31 +297,20 @@ module Azure
           puts "\n\n******** Please find the chef-client run details below ********\n\n"
           print "----> chef-client run status: "
           case status
-            when "succeeded"
-              ## chef-client run succeeded ##
-              color = :green
-            when "failed"
-              ## chef-client run failed ##
-              color = :red
-            when "transitioning"
-              ## chef-client run did not complete within maximum timeout of 30 minutes ##
-              ## fetch whatever logs available under the chef-client.log file ##
-              color = :yellow
+          when "succeeded"
+            ## chef-client run succeeded ##
+            color = :green
+          when "failed"
+            ## chef-client run failed ##
+            color = :red
+          when "transitioning"
+            ## 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
-          puts "#{ui.color(status, color, :bold)}"
+          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 ##
-        else
-          ## unavailability of the substatus field indicates that chef-client run is not completed yet on the server ##
-          fetch_process_wait_time = ((Time.now - fetch_process_start_time) / 60).round
-          if fetch_process_wait_time <= fetch_process_wait_timeout
-            print "#{ui.color('.', :bold)}"
-            sleep 30
-            fetch_chef_client_logs(resource_group_name, virtual_machine_name, chef_extension_name, fetch_process_start_time, fetch_process_wait_timeout)
-          else
-            ## wait time exceeded 30 minutes timeout ##
-            ui.error "\nchef-client run logs could not be fetched since fetch process exceeded wait timeout of #{fetch_process_wait_timeout} minutes.\n"
-          end
         end
       end
 
@@ -341,11 +340,11 @@ module Azure
             params[:azure_vnet_subnet_name]
           )
           if params[:tcp_endpoints]
-            if @platform == "Windows"
-              params[:tcp_endpoints] = params[:tcp_endpoints] + ",3389"
-            else
-              params[:tcp_endpoints] = params[:tcp_endpoints] + ",22,16001"
-            end
+            params[:tcp_endpoints] = if @platform == "Windows"
+                                       params[:tcp_endpoints] + ",3389"
+                                     else
+                                       params[:tcp_endpoints] + ",22,16001"
+                                     end
             random_no = rand(100..1000)
             params[:azure_sec_group_name] = params[:azure_vm_name] + "_sec_grp_" + random_no.to_s
             if security_group_exist?(params[:azure_resource_group_name], params[:azure_sec_group_name])
@@ -362,22 +361,21 @@ module Azure
             ui.log("Deployment name is: #{deployment.name}")
             ui.log("Deployment ID is: #{deployment.id}")
             deployment.properties.dependencies.each do |deploy|
-              if deploy.resource_type == "Microsoft.Compute/virtualMachines"
-                if params[:chef_extension_public_param][:extendedLogs] == "true"
-                  print "\n\nWaiting for the first chef-client run on virtual machine #{deploy.resource_name}"
-                  fetch_chef_client_logs(params[:azure_resource_group_name],
-                    deploy.resource_name,
-                    params[:chef_extension],
-                    Time.now
-                  )
-                end
-
-                ui.log("VM Details ...")
-                ui.log("-------------------------------")
-                ui.log("Virtual Machine name is: #{deploy.resource_name}")
-                ui.log("Virtual Machine ID is: #{deploy.id}")
-                show_server(deploy.resource_name, params[:azure_resource_group_name])
+              next unless deploy.resource_type == "Microsoft.Compute/virtualMachines"
+
+              if params[:chef_extension_public_param][:extendedLogs] == "true"
+                print "\n\nWaiting for the first chef-client run on virtual machine #{deploy.resource_name}"
+                fetch_chef_client_logs(params[:azure_resource_group_name],
+                  deploy.resource_name,
+                  params[:chef_extension],
+                  Time.now)
               end
+
+              ui.log("VM Details ...")
+              ui.log("-------------------------------")
+              ui.log("Virtual Machine name is: #{deploy.resource_name}")
+              ui.log("Virtual Machine ID is: #{deploy.id}")
+              show_server(deploy.resource_name, params[:azure_resource_group_name])
             end
           end
         end
@@ -398,7 +396,7 @@ module Azure
       end
 
       def create_resource_group(params = {})
-        resource_group = ResourceGroup.new()
+        resource_group = ResourceGroup.new
         resource_group.name = params[:azure_resource_group_name]
         resource_group.location = params[:azure_service_location]
 
@@ -414,7 +412,7 @@ module Azure
 
       def create_virtual_machine_using_template(params)
         template = create_deployment_template(params)
-        parameters = create_deployment_parameters(params, @platform)
+        parameters = create_deployment_parameters(params)
 
         deploy_prop = DeploymentProperties.new
         deploy_prop.template = template
@@ -466,7 +464,8 @@ module Azure
         ext_version = compute_management_client.virtual_machine_extension_images.list_versions(
           params[:azure_service_location],
           params[:chef_extension_publisher],
-          params[:chef_extension]).last.name
+          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

data/lib/azure/resource_management/vnet_config.rb

@@ -1,7 +1,6 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
-#
-# Copyright:: Copyright 2016-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");
@@ -60,8 +59,8 @@ module Azure::ARM
       {
         "name" => subnet_name,
         "properties" => {
-          "addressPrefix" => subnet_prefix
-        }
+          "addressPrefix" => subnet_prefix,
+        },
       }
     end
 
@@ -138,8 +137,8 @@ module Azure::ARM
       else ## subnets exist in vnet, calculate new address_prefix for the new subnet based on the space taken by these existing subnets under the given address space of the virtual network ##
         vnet_network_address = IPAddress(vnet_address_prefix)
         subnets = sort_subnets_by_cidr_prefix(subnets)
-        available_networks_pool = Array.new
-        used_networks_pool = Array.new
+        available_networks_pool = []
+        used_networks_pool = []
         subnets.each do |subnet|
           ## in case the larger network is not divided into smaller subnets but
           ## divided into only 1 largest subnet of the complete network size ##
@@ -160,7 +159,8 @@ module Azure::ARM
 
           ## sort both the network pools before trimming the available_networks_pool ##
           available_networks_pool, used_networks_pool = sort_pools(
-            available_networks_pool, used_networks_pool)
+            available_networks_pool, used_networks_pool
+          )
 
           ## trim the available_networks_pool based on the networks already
           ## allocated to the existing subnets ##
@@ -172,7 +172,8 @@ module Azure::ARM
 
           ## sort both the network pools after trimming the available_networks_pool ##
           available_networks_pool, used_networks_pool = sort_pools(
-            available_networks_pool, used_networks_pool)
+            available_networks_pool, used_networks_pool
+          )
         end
 
         ## space available in the vnet_address_prefix network for the new subnet ##
@@ -225,7 +226,7 @@ module Azure::ARM
       vnet_config[:virtualNetworkName] = vnet_name
       if vnet ## handle resources in the existing virtual network ##
         vnet_config[:addressPrefixes] = vnet_address_spaces(vnet)
-        vnet_config[:subnets] = Array.new
+        vnet_config[:subnets] = []
         subnets = subnets_list(resource_group_name, vnet_name)
         if subnets
           subnets.each do |subnet|
@@ -238,7 +239,7 @@ module Azure::ARM
         end
       else ## create config for new vnet ##
         vnet_config[:addressPrefixes] = [ "10.0.0.0/16" ]
-        vnet_config[:subnets] = Array.new
+        vnet_config[:subnets] = []
         vnet_config[:subnets].push(
           subnet(vnet_subnet_name, "10.0.0.0/24")
         )

data/lib/azure/resource_management/windows_credentials.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-# Copyright:: Copyright 2015-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");
@@ -40,35 +40,35 @@ module Azure::ARM
     # Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724284(v=vs.85).aspx
     class FILETIME < FFI::Struct
       layout :dwLowDateTime, :DWORD,
-             :dwHighDateTime, :DWORD
+        :dwHighDateTime, :DWORD
     end
 
     # Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa374790(v=vs.85).aspx
     class CREDENTIAL_ATTRIBUTE < FFI::Struct
       layout :Keyword, :LPTSTR,
-             :Flags, :DWORD,
-             :ValueSize, :DWORD,
-             :Value, :LPBYTE
+        :Flags, :DWORD,
+        :ValueSize, :DWORD,
+        :Value, :LPBYTE
     end
 
     # Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa374788(v=vs.85).aspx
     class CREDENTIAL_OBJECT < FFI::Struct
       layout :Flags, :DWORD,
-             :Type, :DWORD,
-             :TargetName, :LPTSTR,
-             :Comment, :LPTSTR,
-             :LastWritten, FILETIME,
-             :CredentialBlobSize, :DWORD,
-             :CredentialBlob, :LPBYTE,
-             :Persist, :DWORD,
-             :AttributeCount, :DWORD,
-             :Attributes, CREDENTIAL_ATTRIBUTE,
-             :TargetAlias, :LPTSTR,
-             :UserName, :LPTSTR
+        :Type, :DWORD,
+        :TargetName, :LPTSTR,
+        :Comment, :LPTSTR,
+        :LastWritten, FILETIME,
+        :CredentialBlobSize, :DWORD,
+        :CredentialBlob, :LPBYTE,
+        :Persist, :DWORD,
+        :AttributeCount, :DWORD,
+        :Attributes, CREDENTIAL_ATTRIBUTE,
+        :TargetAlias, :LPTSTR,
+        :UserName, :LPTSTR
       end
 
     # Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa374804(v=vs.85).aspx
-    safe_attach_function :CredReadW, [:LPCTSTR, :DWORD, :DWORD, :pointer], :BOOL
+    safe_attach_function :CredReadW, %i{LPCTSTR DWORD DWORD pointer}, :BOOL
   end
 
   module WindowsCredentials
@@ -100,7 +100,7 @@ module Azure::ARM
         credential[:tokentype] = tokentype[0].split(":")[1]
         credential[:user] = user[0].split(":")[1]
         credential[:token] = access_token[0].split(":")[1]
-        #Todo: refresh_token is not complete currently
+        # Todo: refresh_token is not complete currently
         # target_name method needs to be modified for that
         credential[:refresh_token] = refresh_token[0].split(":")[1]
         credential[:clientid] = clientid[0].split(":")[1]
@@ -118,7 +118,7 @@ module Azure::ARM
       exit
     end
 
-    #Todo: For getting the complete refreshToken, both credentials (ending with --0-2 and --1-2) have to be read
+    # Todo: For getting the complete refreshToken, both credentials (ending with --0-2 and --1-2) have to be read
     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

data/lib/azure/service_management/ASM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2016-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");
@@ -64,9 +64,10 @@ module Azure
       end
 
       def rdp_port(arr_ports)
-        if !arr_ports
+        unless arr_ports
           return ""
         end
+
         if arr_ports.length > 0
           arr_ports.each do |port|
             if port["Name"] == "Remote Desktop"
@@ -78,7 +79,7 @@ module Azure
       end
 
       def find_server(params = {})
-        server = connection.roles.find(params[:name], params = { :azure_dns_name => params[:azure_dns_name] })
+        server = connection.roles.find(params[:name], params = { azure_dns_name: params[:azure_dns_name] })
       end
 
       def delete_server(params = {})
@@ -117,7 +118,7 @@ module Azure
 
         puts ""
         if role
-          details = Array.new
+          details = []
           details << ui.color("Role name", :bold, :cyan)
           details << role.name
           details << ui.color("Status", :bold, :cyan)
@@ -226,7 +227,7 @@ module Azure
           remove_hosted_service_on_failure = nil
         end
 
-        #If Storage Account is not specified, check if the geographic location has one to re-use
+        # If Storage Account is not specified, check if the geographic location has one to re-use
         if not params[:azure_storage_account]
           storage_accts = connection.storageaccounts.all
           storage = storage_accts.find { |storage_acct| storage_acct.location.to_s == params[:azure_service_location] }

data/lib/azure/service_management/ag.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,11 +26,11 @@ module Azure
       @ags ||= begin
         @ags = {}
         response = @connection.query_azure("affinitygroups",
-                                           "get",
-                                           "",
-                                           "",
-                                           true,
-                                           false)
+          "get",
+          "",
+          "",
+          true,
+          false)
         response.css("AffinityGroup").each do |ag|
           item = AG.new(@connection).parse(ag)
           @ags[item.name] = item
@@ -89,11 +89,11 @@ module Azure
         end
       end
       @connection.query_azure("affinitygroups",
-                              "post",
-                              builder.to_xml,
-                              "",
-                              true,
-                              false)
+        "post",
+        builder.to_xml,
+        "",
+        true,
+        false)
     end
   end
 end