knife-vrealize 5.0.2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3c96c272f00e8d5bc3922de2db7b6ae0955d9cb7520c18e8ab64c882ea3312
-  data.tar.gz: 7f74f3e6e96c360d807358fc4b3ecc29cea6d4b3758e9d2c3b752f44edad114b
+  metadata.gz: 0d4dafa146bc6df4768a50e5c1b23dfcebcd681e9ae6ef051730ff0a277e3689
+  data.tar.gz: 4fa38fb23055ff6e23952a975410605153051ac831e48b6ea1398427072abc6f
 SHA512:
-  metadata.gz: 05aee0b54656edde368d422c94957a8266e5d88170fbb033669b15a3a47f2b91dd4bf0961180e6565f5c3c8f0db52c3e5ec5b9be8b4220812b4c16397376806f
-  data.tar.gz: e5e1f2fcec20fb0af51ccac43d9923868220fdbdf748092c009b2a568d1a4cb302ae57f416564b81cf8e9a0180303dc4f5ab1d5f4b8aa762ba20cb791fda0180
+  metadata.gz: bc2207db033c162545c15093010be180fffa0d9ee173687dad160e22a4f913de9765d0d8d2014864025aa53b81335cb0088f243175c69f168b54e269f5bf8569
+  data.tar.gz: 9ec9d6219ff4074a6d40d1a3620e6694c7f012617499ed71e80594a3615180918c1e2dc5206502b211ba1e12badacfb2e67b2caa5183c309529aafb995dcf5a5

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

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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");
@@ -30,7 +30,7 @@ class Chef
       class VraService < Service
         include VraServiceHelpers
         def initialize(options = {})
-          super(options)
+          super(config: options)
 
           @username   = options[:username]
           @password   = options[:password]

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

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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");
@@ -27,16 +27,16 @@ class Chef
         include Chef::Knife::Cloud::Helpers
 
         def create_service_instance
-          Chef::Knife::Cloud::VraService.new(username:  locate_config_value(:vra_username),
-                                             password:  locate_config_value(:vra_password),
-                                             base_url:  locate_config_value(:vra_base_url),
-                                             tenant:    locate_config_value(:vra_tenant),
-                                             page_size: locate_config_value(:vra_page_size),
+          Chef::Knife::Cloud::VraService.new(username:  config[:vra_username],
+                                             password:  config[:vra_password],
+                                             base_url:  config[:vra_base_url],
+                                             tenant:    config[:vra_tenant],
+                                             page_size: config[:vra_page_size],
                                              verify_ssl: verify_ssl?)
         end
 
         def verify_ssl?
-          !locate_config_value(:vra_disable_ssl_verify)
+          !config[:vra_disable_ssl_verify]
         end
 
         def wait_for_request(request, wait_time = 600, refresh_rate = 2)
@@ -78,7 +78,7 @@ class Chef
 
         # rubocop:disable Style/GuardClause
         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("The following required parameters are missing: #{missing.join(", ")}")

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

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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");

data/lib/chef/knife/vra_catalog_list.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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,19 +20,22 @@
 
 require "chef/knife"
 require "chef/knife/cloud/list_resource_command"
-require_relative "cloud/vra_service"
-require_relative "cloud/vra_service_helpers"
 require_relative "cloud/vra_service_options"
 
 class Chef
   class Knife
     class Cloud
       class VraCatalogList < ResourceListCommand
-        include VraServiceHelpers
         include VraServiceOptions
 
         banner "knife vra catalog list"
 
+        deps do
+          require_relative "cloud/vra_service"
+          require_relative "cloud/vra_service_helpers"
+          include VraServiceHelpers
+        end
+
         option :entitled,
           long:        "--entitled-only",
           description: "only list entitled vRA catalog entries",
@@ -52,10 +55,12 @@ class Chef
         end
 
         def query_resource
-          @service.list_catalog_items(locate_config_value(:entitled))
+          @service.list_catalog_items(config[:entitled])
         end
 
         def format_status_value(status)
+          return "-" if status.nil?
+
           status = status.downcase
           color  = if status == "published"
                      :green

data/lib/chef/knife/vra_server_create.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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,20 +21,23 @@
 require "chef/knife"
 require "chef/knife/cloud/server/create_command"
 require "chef/knife/cloud/server/create_options"
-require_relative "cloud/vra_service"
-require_relative "cloud/vra_service_helpers"
 require_relative "cloud/vra_service_options"
+require_relative "cloud/vra_service_helpers"
 
 class Chef
   class Knife
     class Cloud
       class VraServerCreate < ServerCreateCommand
-        include VraServiceHelpers
         include VraServiceOptions
         include ServerCreateOptions
+        include VraServiceHelpers
 
         banner "knife vra server create CATALOG_ID (options)"
 
+        deps do
+          require_relative "cloud/vra_service"
+        end
+
         option :cpus,
           long:        "--cpus NUM_CPUS",
           description: "Number of CPUs the server should have"
@@ -97,22 +100,22 @@ class Chef
 
           @create_options = {
             catalog_id: @name_args.first,
-            cpus: locate_config_value(:cpus),
-            memory: locate_config_value(:memory),
-            requested_for: locate_config_value(:requested_for),
-            subtenant_id: locate_config_value(:subtenant_id),
-            lease_days: locate_config_value(:lease_days),
-            notes: locate_config_value(:notes),
+            cpus: config[:cpus],
+            memory: config[:memory],
+            requested_for: config[:requested_for],
+            subtenant_id: config[:subtenant_id],
+            lease_days: config[:lease_days],
+            notes: config[:notes],
             extra_params: extra_params,
-            wait_time: locate_config_value(:server_create_timeout),
-            refresh_rate: locate_config_value(:request_refresh_rate),
+            wait_time: config[:server_create_timeout],
+            refresh_rate: config[:request_refresh_rate],
           }
         end
 
         def before_bootstrap
           super
 
-          config[:chef_node_name] = locate_config_value(:chef_node_name) ? locate_config_value(:chef_node_name) : server.name
+          config[:chef_node_name] ||= server.name
           config[:bootstrap_ip_address] = hostname_for_server
         end
 

data/lib/chef/knife/vra_server_delete.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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,8 +21,6 @@
 require "chef/knife"
 require "chef/knife/cloud/server/delete_options"
 require "chef/knife/cloud/server/delete_command"
-require_relative "cloud/vra_service"
-require_relative "cloud/vra_service_helpers"
 require_relative "cloud/vra_service_options"
 
 class Chef
@@ -30,11 +28,16 @@ class Chef
     class Cloud
       class VraServerDelete < ServerDeleteCommand
         include ServerDeleteOptions
-        include VraServiceHelpers
         include VraServiceOptions
 
         banner "knife vra server delete RESOURCE_ID [RESOURCE_ID] (options)"
 
+        deps do
+          require_relative "cloud/vra_service"
+          require_relative "cloud/vra_service_helpers"
+          include VraServiceHelpers
+        end
+
         # rubocop:disable Style/GuardClause
         def validate_params!
           if @name_args.empty?

data/lib/chef/knife/vra_server_list.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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,19 +21,22 @@
 require "chef/knife"
 require "chef/knife/cloud/server/list_command"
 require "chef/knife/cloud/server/list_options"
-require_relative "cloud/vra_service"
-require_relative "cloud/vra_service_helpers"
 require_relative "cloud/vra_service_options"
 
 class Chef
   class Knife
     class Cloud
       class VraServerList < ServerListCommand
-        include VraServiceHelpers
         include VraServiceOptions
 
         banner "knife vra server list"
 
+        deps do
+          require_relative "cloud/vra_service"
+          require_relative "cloud/vra_service_helpers"
+          include VraServiceHelpers
+        end
+
         def before_exec_command
           @columns_with_info = [
             { label: "Resource ID",  key: "id" },

data/lib/chef/knife/vra_server_show.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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,8 +21,6 @@
 require "chef/knife"
 require "chef/knife/cloud/server/show_options"
 require "chef/knife/cloud/server/show_command"
-require_relative "cloud/vra_service"
-require_relative "cloud/vra_service_helpers"
 require_relative "cloud/vra_service_options"
 
 class Chef
@@ -30,11 +28,16 @@ class Chef
     class Cloud
       class VraServerShow < ServerShowCommand
         include ServerShowOptions
-        include VraServiceHelpers
         include VraServiceOptions
 
         banner "knife vra server show RESOURCE_ID (options)"
 
+        deps do
+          require_relative "cloud/vra_service"
+          require_relative "cloud/vra_service_helpers"
+          include VraServiceHelpers
+        end
+
         def validate_params!
           if @name_args.empty?
             ui.error("You must supply a Resource ID for a server to display.")

data/lib/chef/knife/vro_workflow_execute.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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");
@@ -60,14 +60,14 @@ class Chef
         default:     300
 
       def verify_ssl?
-        !locate_config_value(:vro_disable_ssl_verify)
+        !config[:vro_disable_ssl_verify]
       end
 
       def vro_config
         @vro_config ||= VcoWorkflows::Config.new(
-          url: locate_config_value(:vro_base_url),
-          username: locate_config_value(:vro_username),
-          password: locate_config_value(:vro_password),
+          url: config[:vro_base_url],
+          username: config[:vro_username],
+          password: config[:vro_password],
           verify_ssl: verify_ssl?
         )
       end
@@ -105,7 +105,7 @@ class Chef
       end
 
       def wait_for_workflow
-        wait_time = locate_config_value(:request_timeout)
+        wait_time = config[:request_timeout]
         Timeout.timeout(wait_time) do
           loop do
             token = vro_client.token
@@ -120,7 +120,7 @@ class Chef
 
       def missing_config_parameters
         %i{vro_username vro_password vro_base_url}.each_with_object([]) do |param, memo|
-          memo << param if locate_config_value(param).nil?
+          memo << param if config[param].nil?
         end
       end
 
@@ -129,7 +129,6 @@ class Chef
           print_error_and_exit("The following parameters are missing but required:" \
             "#{missing_config_parameters.join(", ")}")
         end
-
         print_error_and_exit("You must supply a workflow name.") if @name_args.empty?
       end
 
@@ -165,7 +164,7 @@ class Chef
 
       def set_parameters
         self.workflow_name = @name_args.shift
-        self.workflow_id   = locate_config_value(:vro_workflow_id)
+        self.workflow_id   = config[:vro_workflow_id]
         self.parameters    = parse_and_validate_params!(@name_args)
       end
 

data/lib/knife-vrealize/version.rb

@@ -2,7 +2,7 @@
 
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: 2015-2019, 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");
@@ -19,5 +19,5 @@
 #
 
 module KnifeVrealize
-  VERSION = "5.0.2"
+  VERSION = "6.0.4"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-vrealize
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 6.0.4
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: knife
+  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'
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: vcoworkflows
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      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: Chef Infra Knife plugin to interact with VMware vRealize.