knife-vcenter 2.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433d6065abe6b2ffa6e0a81008ddfb053b89553009c54f9889e60af443992b2d
-  data.tar.gz: 3ec33019ad02c1fdc93684d1d7ff56c7e577950194bbfdde3bb6233af133c722
+  metadata.gz: 623c199e59de931af1b1f631c4e2179cf3d2edfc5ba53366b3ed1060fc186759
+  data.tar.gz: 354d21619fbbbc382007fabaa6bcbc462d579ecb27d6d47f132d85f39ff79a9e
 SHA512:
-  metadata.gz: 0c1c84205ac005b1b71b5d7c263cc5460252f4f7675b05466fbd179f3a622534630788595fa91f22e4dc3b6040e55b6d13ab15a3be9f6eaa837f9aba3c395f98
-  data.tar.gz: 58a58f37c10265e61b592b2c6ef7f6a3e267a83125cc8aea2e8c29e1802e093657607591291120d2803f870262d1137192b7178f8109bef881f12418c6e9be37
+  metadata.gz: 00ba3056b9745793ff226fc7b4f452fa2dc288b71221515972d030435b2170147e5a13612c20d308e5ef91d3ea372f577a61c130fde94e6bbd257ccece6dce59
+  data.tar.gz: 8461ae70e178bae44c55a2dbfb4669e47942a191ab36c8c77ba5d21dc42455c03ba52879bd83bbf31b2269bb5a7d01a7fab1232fbf22bd255a8812b40445c7be

data/lib/chef/knife/cloud/vcenter_service.rb

@@ -20,8 +20,8 @@
 require "chef/knife/cloud/exceptions"
 require "chef/knife/cloud/service"
 require "chef/knife/cloud/helpers"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "support/clone_vm"
+require_relative "vcenter_service_helpers"
+require_relative "../../../support/clone_vm"
 require "uri"
 require "json"
 require "ostruct"
@@ -104,7 +104,7 @@ class Chef
             @ipaddress = clone_obj.clone
 
             # return an object from the restapi
-            return get_server(options[:name])
+            get_server(options[:name])
 
           when "create"
 

data/lib/chef/knife/cloud/vcenter_service_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2017-2018 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");
@@ -31,16 +31,16 @@ class Chef
         # Creates the object for vCenterService
         #
         def create_service_instance
-          Chef::Knife::Cloud::VcenterService.new(username: locate_config_value(:vcenter_username),
-                                                 password: locate_config_value(:vcenter_password),
-                                                 host: locate_config_value(:vcenter_host),
+          Chef::Knife::Cloud::VcenterService.new(username: config[:vcenter_username],
+                                                 password: config[:vcenter_password],
+                                                 host: config[:vcenter_host],
                                                  verify_ssl: verify_ssl?)
         end
 
         # Do we have valid SSL?
         #
         def verify_ssl?
-          !locate_config_value(:vcenter_disable_ssl_verify)
+          !config[:vcenter_disable_ssl_verify]
         end
 
         # Validate the options and fail out if something isn't there
@@ -54,7 +54,7 @@ class Chef
         #
         # @param [Object] keys makes sure that the values are all not nil
         def check_for_missing_config_values!(*keys)
-          missing = keys.select { |x| locate_config_value(x).nil? }
+          missing = keys.select { |x| config[x].nil? }
 
           unless missing.empty?
             ui.error(format("The following required parameters are missing: %s", missing.join(", ")))

data/lib/chef/knife/vcenter_cluster_list.rb

@@ -19,20 +19,22 @@
 
 require "chef/knife"
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   class Knife
     class Cloud
       # Extends ResourceListcommand to talk to vCenter
       class VcenterClusterList < ResourceListCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
 
         banner "knife vcenter cluster list"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         # Creates the columns and how to sort the columns
         #
         def before_exec_command

data/lib/chef/knife/vcenter_datacenter_list.rb

@@ -19,9 +19,7 @@
 
 require "chef/knife"
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   # The main knife class
@@ -30,11 +28,15 @@ class Chef
     class Cloud
       # Extends the ResourceListCommand for specific vCenter
       class VcenterDatacenterList < ResourceListCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
 
         banner "knife vcenter datacenter list"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         # Sets up the columns for listing out and sorts by name
         #
         def before_exec_command

data/lib/chef/knife/vcenter_host_list.rb

@@ -19,9 +19,7 @@
 
 require "chef/knife"
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   # Main knife class
@@ -30,11 +28,15 @@ class Chef
     class Cloud
       # Extends the ResourceListcommand for specific vCenter
       class VcenterHostList < ResourceListCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
 
         banner "knife vcenter host list"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         # Sets up the columns for listing out and sorts by name
         #
         def before_exec_command

data/lib/chef/knife/vcenter_vm_clone.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2017-2018 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");
@@ -21,9 +21,7 @@
 require "chef/knife"
 require "chef/knife/cloud/server/create_command"
 require "chef/knife/cloud/server/create_options"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   # The main knife class
@@ -32,12 +30,16 @@ class Chef
     class Cloud
       # Extends the ServerCreateCommand for specific vCenter
       class VcenterVmClone < Chef::Knife::Cloud::ServerCreateCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
         include ServerCreateOptions
 
         banner "knife vcenter vm clone NAME (options)"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         option :template,
           long: "--template NAME",
           description: "Name of VM or template to use to clone machine from"
@@ -87,12 +89,12 @@ class Chef
           @create_options = {
             name: @name_args[0],
             type: "clone",
-            template: locate_config_value(:template),
-            targethost: locate_config_value(:targethost),
-            datacenter: locate_config_value(:datacenter),
-            poweron: !locate_config_value(:disable_power_on),
-            folder: locate_config_value(:folder),
-            resource_pool: locate_config_value(:pool),
+            template: config[:template],
+            targethost: config[:targethost],
+            datacenter: config[:datacenter],
+            poweron: !config[:disable_power_on],
+            folder: config[:folder],
+            resource_pool: config[:pool],
           }
         end
 
@@ -101,7 +103,7 @@ class Chef
         def before_bootstrap
           super
 
-          config[:chef_node_name] = locate_config_value(:chef_node_name) || server.name
+          config[:chef_node_name] = config[:chef_node_name] || server.name
 
           config[:bootstrap_ip_address] = hostname_for_server
         end

data/lib/chef/knife/vcenter_vm_create.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2017-2018 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");
@@ -20,9 +20,7 @@
 require "chef/knife"
 require "chef/knife/cloud/server/create_command"
 require "chef/knife/cloud/server/create_options"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   # The main knife class
@@ -31,12 +29,16 @@ class Chef
     class Cloud
       # Extends the ServerCreateCommand for specific vCenter
       class VcenterVmCreate < Chef::Knife::Cloud::ServerCreateCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
         include ServerCreateOptions
 
         banner "knife vcenter vm create NAME"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         option :targethost,
           long: "--targethost HOST",
           description: "vCenter host on which the new VM should be created"
@@ -73,10 +75,10 @@ class Chef
           @create_options = {
             name: @name_args[0],
             type: "create",
-            targethost: locate_config_value(:targethost),
-            folder: locate_config_value(:folder),
-            datastore: locate_config_value(:datastore),
-            resource_pool: locate_config_value(:resource_pool),
+            targethost: config[:targethost],
+            folder: config[:folder],
+            datastore: config[:datastore],
+            resource_pool: config[:resource_pool],
           }
 
           puts @create_options

data/lib/chef/knife/vcenter_vm_delete.rb

@@ -20,9 +20,7 @@
 require "chef/knife"
 require "chef/knife/cloud/server/delete_options"
 require "chef/knife/cloud/server/delete_command"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   class Knife
@@ -31,10 +29,14 @@ class Chef
       class VcenterVmDelete < ServerDeleteCommand
         include ServerDeleteOptions
         include VcenterServiceOptions
-        include VcenterServiceHelpers
 
         banner "knife vcenter vm delete NAME [NAME] (options)"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         # rubocop:disable Style/GuardClause
         # Validates the parameters to make sure we're good.
         #

data/lib/chef/knife/vcenter_vm_list.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2017-2018 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");
@@ -20,9 +20,7 @@
 require "chef/knife"
 require "chef/knife/cloud/server/list_command"
 require "chef/knife/cloud/server/list_options"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   # The main knife class
@@ -31,11 +29,15 @@ class Chef
     class Cloud
       # Extends the ServerListCommand for specific vCenter
       class VcenterVmList < Chef::Knife::Cloud::ServerListCommand
-        include VcenterServiceHelpers
         include VcenterServiceOptions
 
         banner "knife vcenter vm list"
 
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         # Sets up the columns for listing out and sorts by name
         #
         def before_exec_command

data/lib/chef/knife/vcenter_vm_show.rb

@@ -20,9 +20,7 @@
 require "chef/knife"
 require "chef/knife/cloud/server/show_options"
 require "chef/knife/cloud/server/show_command"
-require "chef/knife/cloud/vcenter_service"
-require "chef/knife/cloud/vcenter_service_helpers"
-require "chef/knife/cloud/vcenter_service_options"
+require_relative "cloud/vcenter_service_options"
 
 class Chef
   class Knife
@@ -31,9 +29,14 @@ class Chef
       class VcenterVmShow < ServerShowCommand
         include ServerShowOptions
         include VcenterServiceOptions
-        include VcenterServiceHelpers
 
         banner "knife vcenter vm show NAME (options)"
+
+        # lazy load this file as it includes vmware deps that we only want at plugin runtime
+        deps do
+          require_relative "cloud/vcenter_service"
+        end
+
         def validate_params!
           if @name_args.empty?
             ui.error("You must supply the name of the virtual machine to display.")

data/lib/knife-vcenter/version.rb

@@ -20,5 +20,5 @@
 # Provisions machines in vCenter
 module KnifeVcenter
   # The version of this amazing Gem, you should <3 it.
-  VERSION = "2.1.0"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: knife-cloud
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '15.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
+        version: '15.11'
+- !ruby/object:Gem::Dependency
+  name: knife-cloud
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +72,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: vsphere-automation-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -92,90 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
 description: Knife plugin to VMware vCenter.
 email:
 - partnereng@chef.io
@@ -209,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="