knife-vsphere 4.1.0 → 4.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf734223229d2bc9a6692bf838a0267b278d3b1385102c1c1816d28bf3ee7c8
-  data.tar.gz: 1c7632e1d51931914c342ac20e45fb61b139beb8da36de4f53e57bf0b8b5d8b7
+  metadata.gz: 0f1dc216c472e38cc3440f95efbaf1f8c139772b60c64bedbffae096cca623d2
+  data.tar.gz: 5b3929bc65961c899be025043bbcec97d6c376388e4e951f8ec504f77f44d369
 SHA512:
-  metadata.gz: 46666124a77c22d8b702b93e20e26fa19cf75daf4991f8b7dc2a48274bdf52718e3bf5d1cfc5f9c59b0712dec84931dc6d3305be25fad7db2f3e372b8f7ec8e0
-  data.tar.gz: d514c680db143863e31fe823cd5f2953c944d0ca5b3705295ddf3f9dd96fd7baf6d1a977ff74c83afc3ef053c5517e8c034a536c928f661fa4571fb8a9921bd8
+  metadata.gz: d087900222047061ad9e99e6196572c582fe6dd492d29d519395270d38103d01b9d4ebe7b54ede7cc87de72337ec79e788530d8ba54408202a010c6f6fd143ce
+  data.tar.gz: 41bff6932e00d31d0a8c41709383a2b9b1996e008430a00214ab484001808e69195e20e4f52f3ac7338b9cd1dc14f4522a1cc362ca5fdf2b701f6ad836370c1f

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

@@ -5,9 +5,6 @@
 #
 
 require "chef/knife"
-require "rbvmomi"
-require "base64"
-require "filesize"
 require "chef/knife/bootstrap"
 
 # Power state on
@@ -24,8 +21,11 @@ class Chef
     # Main knife vsphere that more or less everything in this gem is built off of
     class BaseVsphereCommand < Chef::Knife::Bootstrap
       deps do
+        require "rbvmomi"
         Chef::Knife::Bootstrap.load_deps
-        require "socket"
+        require "base64" unless defined?(Base64)
+        require "filesize"
+        require "socket" unless defined?(Socket)
         require "net/ssh/multi"
         require "readline"
         require "chef/json_compat"
@@ -122,7 +122,7 @@ class Chef
       end
 
       def get_password_from_stdin
-        @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
+        @password ||= ui.ask("Enter your password: ") { |q| q.echo(false) }
       end
 
       def traverse_folders_for_pools(folder)

data/lib/chef/knife/vsphere_cluster_list.rb

@@ -4,12 +4,16 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known clusters in the configured datacenter
 class Chef::Knife::VsphereClusterList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere cluster list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   def traverse_folders(folder)

data/lib/chef/knife/vsphere_cpu_ratio.rb

@@ -1,10 +1,14 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereCpuratio extends the BaseVspherecommand
 class Chef::Knife::VsphereCpuRatio < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere cpu ratio [CLUSTER] [HOST]"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   # The main run method for cpu_ratio

data/lib/chef/knife/vsphere_customization_list.rb

@@ -3,13 +3,17 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all customization specifications in the configured datacenter
 # VsphereCustomizationlist extends the BaseVspherecommand
 class Chef::Knife::VsphereCustomizationList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere customization list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   # The main run method for customization_list

data/lib/chef/knife/vsphere_datastore_file.rb

@@ -1,12 +1,16 @@
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Upload or download a file from a datastore
 # VsphereDatastoreFile extends the BaseVspherecommand
 class Chef::Knife::VsphereDatastoreFile < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastore file"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   option :local_file,

data/lib/chef/knife/vsphere_datastore_list.rb

@@ -16,13 +16,17 @@
 # PERFORMANCE OF THIS SOFTWARE
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known data stores in datacenter with sizes
 # VsphereDatastorelist extends the BaseVspherecommand
 class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastore list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   option :list,

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -16,13 +16,17 @@
 # PERFORMANCE OF THIS SOFTWARE
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Gets the data store with the most free space in datacenter
 # VsphereDatastoreMaxfree extends the BaseVspherecommand
 class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastore maxfree"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   option :regex,
     short: "-r REGEX",
     long: "--regex REGEX",

data/lib/chef/knife/vsphere_datastorecluster_list.rb

@@ -16,7 +16,7 @@
 # PERFORMANCE OF THIS SOFTWARE
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 def number_to_human_size(number)
   number = number.to_f
@@ -56,6 +56,10 @@ end
 class Chef::Knife::VsphereDatastoreclusterList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastorecluster list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   def run

data/lib/chef/knife/vsphere_datastorecluster_maxfree.rb

@@ -16,7 +16,7 @@
 # PERFORMANCE OF THIS SOFTWARE
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 def max_dscluster(dscluster, max_dscluster)
   return true unless max_dscluster
@@ -47,6 +47,10 @@ end
 class Chef::Knife::VsphereDatastoreclusterMaxfree < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastorecluster maxfree"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   option :regex,
     short: "-r REGEX",
     long: "--regex REGEX",

data/lib/chef/knife/vsphere_folder_list.rb

@@ -3,13 +3,17 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all vm folders
 # VsphereFolderlist extends the BaseVspherecommand
 class Chef::Knife::VsphereFolderList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere folder list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   # Walks though the folders to find something

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -1,5 +1,5 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # list hosts belonging to pool
 # VsphereHostslist extends the BaseVspherecommand
@@ -7,8 +7,8 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere hosts list"
 
   deps do
-    require "rbvmomi"
-    require "netaddr"
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_list.rb

@@ -3,12 +3,16 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known pools in the configured datacenter
 class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere pool list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   def traverse_folders(folder)

data/lib/chef/knife/vsphere_pool_query.rb

@@ -1,13 +1,13 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # VspherePoolQuery extends the BaseVsphereCommand
 class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
-  banner 'knife vsphere pool query POOLNAME QUERY.  See "http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html" for allowed QUERY values.'
+  banner 'knife vsphere pool query POOLNAME QUERY. See "https://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html" for allowed QUERY values.'
 
   deps do
-    require "rbvmomi"
-    require "netaddr"
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_show.rb

@@ -1,12 +1,12 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 class Chef::Knife::VspherePoolShow < Chef::Knife::BaseVsphereCommand
-  banner 'knife vsphere pool show POOLNAME QUERY.  See "http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html" for allowed QUERY values.'
+  banner 'knife vsphere pool show POOLNAME QUERY. See "https://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.ComputeResource.html" for allowed QUERY values.'
 
   deps do
-    require "rbvmomi"
-    require "netaddr"
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_template_list.rb

@@ -4,15 +4,19 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known VM templates in the configured datacenter
 # VsphereTemplatelist extends the BaseVspherecommand
 class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere template list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method for template_list

data/lib/chef/knife/vsphere_vlan_create.rb

@@ -1,11 +1,15 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known data stores in datacenter with sizes
 # VsphereVlanCreate extends BaseVspherecommand
 class Chef::Knife::VsphereVlanCreate < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vlan create NAME VID"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   option :switch,

data/lib/chef/knife/vsphere_vlan_list.rb

@@ -15,13 +15,17 @@
 # PERFORMANCE OF THIS SOFTWARE
 
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known data stores in datacenter with sizes
 # VsphereVlanlist extends the BaseVspherecommand
 class Chef::Knife::VsphereVlanList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vlan list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   # The main run method for vlan_list

data/lib/chef/knife/vsphere_vm_cdrom.rb

@@ -1,14 +1,18 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVmCdrom extends the BaseVspherecommand
 class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm cdrom VMNAME (options)"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   # The empty device name.
   EMPTY_DEVICE_NAME ||= "".freeze
 
@@ -66,15 +70,15 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
+    cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == ::RbVmomi::VIM::VirtualCdrom }
     fatal_exit "Could not find a cd drive" unless cdrom_obj
 
     backing = if get_config(:attach)
-                RbVmomi::VIM::VirtualCdromIsoBackingInfo(
+                ::RbVmomi::VIM::VirtualCdromIsoBackingInfo(
                   fileName: iso_path
                 )
               else
-                RbVmomi::VIM::VirtualCdromRemoteAtapiBackingInfo(deviceName: EMPTY_DEVICE_NAME)
+                ::RbVmomi::VIM::VirtualCdromRemoteAtapiBackingInfo(deviceName: EMPTY_DEVICE_NAME)
               end
 
     vm.ReconfigVM_Task(
@@ -85,14 +89,14 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
   private
 
   def spec(cd_device, backing)
-    RbVmomi::VIM::VirtualMachineConfigSpec(
+    ::RbVmomi::VIM::VirtualMachineConfigSpec(
       deviceChange: [{
         operation: :edit,
-        device: RbVmomi::VIM::VirtualCdrom(
+        device: ::RbVmomi::VIM::VirtualCdrom(
           backing: backing,
           key: cd_device.key,
           controllerKey: cd_device.controllerKey,
-          connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
+          connectable: ::RbVmomi::VIM::VirtualDeviceConnectInfo(
             startConnected: get_config(:on_boot) || false,
             connected: get_config(:attach) || false,
             allowGuestControl: true

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -7,20 +7,23 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVmClone extends the BaseVspherecommand
 class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm clone VMNAME (options)"
 
   deps do
-    require "ipaddr"
-    require "netaddr"
-    require "securerandom"
-    require_relative "customization_helper"
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require "ipaddr" unless defined?(IPAddr)
+    require "netaddr" unless defined?(NetAddr)
+    require "securerandom" unless defined?(SecureRandom)
     require "chef/json_compat"
-    Chef::Knife::Bootstrap.load_deps
+
+    require_relative "helpers/search_helper"
+    include SearchHelper
+
+    require_relative "helpers/customization_helper"
     include CustomizationHelper
   end
 
@@ -31,9 +34,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   # a linklayer origin is an actual nic
   ORIGIN_IS_REAL_NIC ||= "linklayer".freeze
 
-  # include Chef::Knife::WinrmBase
-  include SearchHelper
-
   common_options
 
   option :dest_folder,
@@ -84,7 +84,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
   option :customization_plugin_data,
     long: "--cplugin-data CUST_PLUGIN_DATA",
-    description: "String of data to pass to the plugin.  Use any format you wish."
+    description: "String of data to pass to the plugin. Use any format you wish."
 
   option :customization_vlan,
     long: "--cvlan CUST_VLANS",
@@ -678,11 +678,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         ident = RbVmomi::VIM.CustomizationLinuxPrep
         ident.hostName = RbVmomi::VIM.CustomizationFixedName(name: hostname)
 
-        ident.domain = if get_config(:customization_domain)
-                         get_config(:customization_domain)
-                       else
-                         ""
-                       end
+        ident.domain = (get_config(:customization_domain) || "")
         cust_spec.identity = ident
       else
         ui.error("Customization only supports Linux and Windows currently.")
@@ -716,7 +712,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
             if @customization_plugin.respond_to?(:data=)
               @customization_plugin.data = cplugin_data
             else
-              abort "Customization plugin has no :data= accessor to receive the --cplugin-data argument.  Define both or neither."
+              abort "Customization plugin has no :data= accessor to receive the --cplugin-data argument. Define both or neither."
             end
           end
         else

data/lib/chef/knife/vsphere_vm_config.rb

@@ -2,16 +2,20 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVMconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmConfig < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm config VMNAME PROPERTY VALUE (PROPERTY VALUE)...
           See \"https://www.vmware.com/support/developer/converter-sdk/conv60_apireference/vim.vm.ConfigSpec.html\"
           for allowed ATTRIBUTE values (any property of type xs:string is supported)."
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method in vm_config

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -4,20 +4,21 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
-
-# These two are needed for the '--purge' deletion case
-require "chef/node"
-require "chef/api_client"
+require_relative "helpers/base_vsphere_command"
 
 # Delete a virtual machine from vCenter
 # VsphereVmDelete extends the BaseVspherecommand
 class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm delete VMNAME (options)"
 
   deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+
+    # These two are needed for the '--purge' deletion case
+    require "chef/node"
+    require "chef/api_client"
     require "rbvmomi"
   end
 

data/lib/chef/knife/vsphere_vm_disk_extend.rb

@@ -4,13 +4,17 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm disk extend VMNAME SIZE. Extends the disk of vm VMNAME to SIZE kilobytes."
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :diskname,

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -1,14 +1,17 @@
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # List the disks attached to a VM
 # VsphereVmdisklist extends the BaseVspherecommand
 class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-
   banner "knife vsphere vm disk list VMNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method for vm_disk_list

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -2,15 +2,18 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVMexecute extends the Basevspherecommand
 class Chef::Knife::VsphereVmExecute < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-
   banner "knife vsphere vm execute VMNAME COMMAND ARGS"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   option :exec_user,
     long: "--exec-user USER",
     description: "User to execute as",

data/lib/chef/knife/vsphere_vm_find.rb

@@ -3,14 +3,18 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # find vms belonging to pool that match criteria, display specified fields
 class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm find"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   VMFOLDER ||= "vm".freeze
 
   common_options

data/lib/chef/knife/vsphere_vm_list.rb

@@ -3,12 +3,16 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
+require_relative "helpers/base_vsphere_command"
 
 # Lists all known virtual machines in the configured datacenter
 class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm list"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+  end
+
   common_options
 
   option :recursive,

data/lib/chef/knife/vsphere_vm_markastemplate.rb

@@ -7,17 +7,21 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Clone an existing template into a new VM, optionally applying a customization specification.
 # usage:
 # knife vsphere vm markastemplate MyVM --folder /templates
 # Vspherevmmarkastemplate extends the Basevspherecommand
 class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm markastemplate VMNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method for vm_markastemplate

data/lib/chef/knife/vsphere_vm_migrate.rb

@@ -3,15 +3,19 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # migrate vm to specified resource pool , datastore and host
 class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   # migrate --resource-pool --dest-host --dest-datastore
   banner "knife vsphere vm migrate VMNAME (options)"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :dest_host,

data/lib/chef/knife/vsphere_vm_move.rb

@@ -3,15 +3,19 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Moves the VM to another folder or datastore
 # VsphereVmMove extends the BaseVspherecommand
 class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm move VMNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :dest_name,

data/lib/chef/knife/vsphere_vm_net.rb

@@ -3,14 +3,19 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Switch VM networking state up/down (on all network interfaces)
 # VsphereVmNet extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm net STATE VMNAME"
+
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method for vm_net

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -3,13 +3,17 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm network add VMNAME NETWORKNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   option :adapter_type,
     long: "--adapter-type STRING",
     description: "Adapter type eg e1000,vmxnet3",
@@ -21,7 +25,7 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
     required: false
 
   deps do
-    require "netaddr"
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_vm_network_delete.rb

@@ -3,13 +3,17 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 class Chef::Knife::VsphereVmNetworkDelete < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm network delete VMNAME NICNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   def run

data/lib/chef/knife/vsphere_vm_network_list.rb

@@ -3,14 +3,18 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVmNetworklist extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNetworkList < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm network list VMNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   # The main run method for vm_network_list

data/lib/chef/knife/vsphere_vm_network_set.rb

@@ -3,15 +3,19 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Changes network on a certain VM
 # VsphereVmNetworkSet extends the BaseVspherecommand
 class Chef::Knife::VsphereVmNetworkSet < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm network set VMNAME NETWORKNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :nic,

data/lib/chef/knife/vsphere_vm_property_get.rb

@@ -2,13 +2,17 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVMPropertyget extends the BaseVspherecommand
 class Chef::Knife::VsphereVmPropertyGet < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-  banner "knife vsphere vm property get VMNAME PROPERTY.  Gets a vApp Property on VMNAME."
+  banner "knife vsphere vm property get VMNAME PROPERTY. Gets a vApp Property on VMNAME."
+
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
 
   common_options
 

data/lib/chef/knife/vsphere_vm_property_set.rb

@@ -2,19 +2,23 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVMPropertySet extends Basevspherecommand
 class Chef::Knife::VsphereVmPropertySet < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-  banner "knife vsphere vm property set VMNAME PROPERTY VALUE.  Sets a vApp Property on VMNAME."
+  banner "knife vsphere vm property set VMNAME PROPERTY VALUE. Sets a vApp Property on VMNAME."
+
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
 
   common_options
 
   option :ovf_environment_transport,
     long: "--ovf-environment-transport STRING",
-    description: "Comma delimited string.  Configures the transports to use for properties. Supported values are: iso and com.vmware.guestInfo."
+    description: "Comma delimited string. Configures the transports to use for properties. Supported values are: iso and com.vmware.guestInfo."
 
   # The main run method for vm_property_set
   #

data/lib/chef/knife/vsphere_vm_show.rb

@@ -2,13 +2,17 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # VsphereVmShow extends the BaseVspherecommand
 class Chef::Knife::VsphereVmShow < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-  banner 'knife vsphere vm show VMNAME QUERY.  See "http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html" for allowed QUERY values.'
+  banner 'knife vsphere vm show VMNAME QUERY. See "https://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html" for allowed QUERY values.'
+
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
 
   common_options
 

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -3,14 +3,18 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Manage snapshots of a virtual machine
 class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm snapshot VMNAME (options)"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :list,

data/lib/chef/knife/vsphere_vm_state.rb

@@ -4,13 +4,11 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Manage power state of a virtual machine
 # VsphereVmState extends the BaseVspherecommand
 class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   # The Different power states that vSphere reports
   POWER_STATES ||= {
     PS_ON => "powered on",
@@ -20,6 +18,12 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
 
   banner "knife vsphere vm state VMNAME (options)"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :state,

data/lib/chef/knife/vsphere_vm_toolsconfig.rb

@@ -2,20 +2,25 @@
 # License:: Apache License, Version 2.0
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Vspherevmtoolsconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm toolsconfig VMNAME PROPERTY VALUE
           See \"https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.ToolsConfigInfo.html\"
           for available properties and types."
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   option :empty,
     short: "-e",
     long: "--empty",
     description: "Allow empty string"
+
   common_options
 
   # The main run method for vm_toolsconfig

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -3,15 +3,19 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Add a new disk to a virtual machine
 # VsphereVmvmdkadd extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm vmdk add VMNAME DISK_GB"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   common_options
 
   option :vmdk_type,
@@ -212,7 +216,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     end
 
     # ensure we don't try to add the controllers SCSI ID
-    new_unit_number = available_unit_numbers.sort[0]
+    new_unit_number = available_unit_numbers.min
     puts "using SCSI ID #{new_unit_number}"
 
     vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(

data/lib/chef/knife/vsphere_vm_vnc_set.rb

@@ -3,14 +3,18 @@
 # License:: Apache License, Version 2.0
 #
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Main class VsphereVMvncset extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
   banner "knife vsphere vm vncset VMNAME"
 
+  deps do
+    Chef::Knife::BaseVsphereCommand.load_deps
+    require_relative "helpers/search_helper"
+    include SearchHelper
+  end
+
   option :vnc_port,
     long: "--vnc-port PORT",
     description: "Port to run VNC on",

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -5,21 +5,23 @@
 #
 
 require "chef/knife"
-require_relative "base_vsphere_command"
-require_relative "search_helper"
+require_relative "helpers/base_vsphere_command"
 
 # Wait for vm finishing Sysprep.
 # usage:
 # knife vsphere vm wait sysprep somemachine --sleep 30 \
 #     --timeout 600
 class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
-  include SearchHelper
-  include CustomizationHelper
-
   banner "knife vsphere vm wait sysprep VMNAME (options)"
 
   deps do
-    require_relative "customization_helper"
+    Chef::Knife::BaseVsphereCommand.load_deps
+
+    require_relative "helpers/search_helper"
+    include SearchHelper
+
+    require_relative "helpers/customization_helper"
+    include CustomizationHelper
   end
 
   common_options

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = "4.1.0".freeze
+  VERSION = "4.1.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.10
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -33,7 +33,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -99,9 +99,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- lib/chef/knife/base_vsphere_command.rb
-- lib/chef/knife/customization_helper.rb
-- lib/chef/knife/search_helper.rb
+- lib/chef/knife/helpers/base_vsphere_command.rb
+- lib/chef/knife/helpers/customization_helper.rb
+- lib/chef/knife/helpers/search_helper.rb
 - lib/chef/knife/vsphere_cluster_list.rb
 - lib/chef/knife/vsphere_cpu_ratio.rb
 - lib/chef/knife/vsphere_customization_list.rb
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: VMware vSphere support for Chef Infra's Knife command