knife-cloud 3.0.4 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da70c3aac46f79c197680b6b6f0b7996cf89fed2ff513ca651fce9f58494d75
-  data.tar.gz: 13835e1419477fa3791d8fc9468da494f17bede94de19f781a4fddc3b56edc9e
+  metadata.gz: 4d094ac82d266b55c10836597562f90be7d663f2a5402ce88707e4951678c22b
+  data.tar.gz: afe47c2a29045c02ceddbcf8ca83c0de382dac58040909b192a8bf005547a299
 SHA512:
-  metadata.gz: 4e1d88d206d25a75d323c260d6dbd0c37578a874c75b3561347da00374945345f6e53c5cb5b4d65ef1838377cb12ea5d3d9953a1300a6fc7104b44da44a1832c
-  data.tar.gz: da72735b5f74a3ad959b51aefdc86315ecc5b1d1f6923cd01fb45b4b7c96fe0dacb4ea54f8b4be78a57f1926d6ba38168fc9a0e1cbb4d82fa691865453fbb13d
+  metadata.gz: 6a565797f2420f0a6b43b725bc60b16845fe8197e69c841856a53cfb63add16220788582c42c3a902080e7589ffc600f1345442d1ee6bd443d25d7628f7b5ccc
+  data.tar.gz: 8f989dc61d30d130349fb0ef39fb5257b1f24ef15eff0acbab21c6bf46d62b18d1f4e8efcf1604ad716a16cac6c41c0ad9a96881c7ea1b4161deaf2cfda50660

data/lib/chef/knife/cloud/chefbootstrap/bootstrap_options.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 
 require "chef/knife/core/bootstrap_context"
-require "net/ssh/multi"
 
 class Chef
   class Knife
@@ -30,8 +29,9 @@ class Chef
 
             deps do
               require "chef/json_compat"
-              require "tempfile"
-              require "net/ssh"
+              require "tempfile" unless defined?(Tempfile)
+              require "net/ssh" unless defined?(Net::SSH)
+              require "net/ssh/multi"
               require "chef/knife/ssh"
               Chef::Knife::Ssh.load_deps
             end

data/lib/chef/knife/cloud/chefbootstrap/bootstrap_protocol.rb

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -46,36 +46,36 @@ class Chef
 
         def init_bootstrap_options
           # set the command bootstrap options.
-          bootstrap.name_args << locate_config_value(:bootstrap_ip_address)
-          bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name)
-          bootstrap.config[:run_list] = locate_config_value(:run_list)
-          bootstrap.config[:prerelease] = locate_config_value(:prerelease)
-          bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
-          bootstrap.config[:bootstrap_proxy] = locate_config_value(:bootstrap_proxy)
-          bootstrap.config[:environment] = locate_config_value(:environment)
+          bootstrap.name_args << config[:bootstrap_ip_address]
+          bootstrap.config[:chef_node_name] = config[:chef_node_name]
+          bootstrap.config[:run_list] = config[:run_list]
+          bootstrap.config[:prerelease] = config[:prerelease]
+          bootstrap.config[:bootstrap_version] = config[:bootstrap_version]
+          bootstrap.config[:bootstrap_proxy] = config[:bootstrap_proxy]
+          bootstrap.config[:environment] = config[:environment]
           # see chef/knife/bootstrap.rb #warn_chef_config_secret_key.
-          bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:encrypted_data_bag_secret)
-          bootstrap.config[:encrypted_data_bag_secret_file] = locate_config_value(:encrypted_data_bag_secret_file)
-          bootstrap.config[:first_boot_attributes] = locate_config_value(:first_boot_attributes)
-          bootstrap.config[:secret] = locate_config_value(:secret)
-          bootstrap.config[:secret_file] = locate_config_value(:secret_file)
-          bootstrap.config[:bootstrap_template] = locate_config_value(:bootstrap_template)
-          bootstrap.config[:node_ssl_verify_mode] = locate_config_value(:node_ssl_verify_mode)
-          bootstrap.config[:node_verify_api_cert] = locate_config_value(:node_verify_api_cert)
-          bootstrap.config[:bootstrap_no_proxy] = locate_config_value(:bootstrap_no_proxy)
-          bootstrap.config[:bootstrap_url] = locate_config_value(:bootstrap_url)
-          bootstrap.config[:bootstrap_install_command] = locate_config_value(:bootstrap_install_command)
-          bootstrap.config[:bootstrap_wget_options] = locate_config_value(:bootstrap_wget_options)
-          bootstrap.config[:bootstrap_curl_options] = locate_config_value(:bootstrap_curl_options)
-          bootstrap.config[:bootstrap_vault_file] = locate_config_value(:bootstrap_vault_file)
-          bootstrap.config[:bootstrap_vault_json] = locate_config_value(:bootstrap_vault_json)
-          bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item)
-          bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
-          bootstrap.config[:msi_url] = locate_config_value(:msi_url)
-          bootstrap.config[:install_as_service] = locate_config_value(:install_as_service)
-          bootstrap.config[:session_timeout] = locate_config_value(:session_timeout)
-          bootstrap.config[:channel] = locate_config_value(:channel)
-          bootstrap.config[:bootstrap_product] = locate_config_value(:bootstrap_product)
+          bootstrap.config[:encrypted_data_bag_secret] = config[:encrypted_data_bag_secret]
+          bootstrap.config[:encrypted_data_bag_secret_file] = config[:encrypted_data_bag_secret_file]
+          bootstrap.config[:first_boot_attributes] = config[:first_boot_attributes]
+          bootstrap.config[:secret] = config[:secret]
+          bootstrap.config[:secret_file] = config[:secret_file]
+          bootstrap.config[:bootstrap_template] = config[:bootstrap_template]
+          bootstrap.config[:node_ssl_verify_mode] = config[:node_ssl_verify_mode]
+          bootstrap.config[:node_verify_api_cert] = config[:node_verify_api_cert]
+          bootstrap.config[:bootstrap_no_proxy] = config[:bootstrap_no_proxy]
+          bootstrap.config[:bootstrap_url] = config[:bootstrap_url]
+          bootstrap.config[:bootstrap_install_command] = config[:bootstrap_install_command]
+          bootstrap.config[:bootstrap_wget_options] = config[:bootstrap_wget_options]
+          bootstrap.config[:bootstrap_curl_options] = config[:bootstrap_curl_options]
+          bootstrap.config[:bootstrap_vault_file] = config[:bootstrap_vault_file]
+          bootstrap.config[:bootstrap_vault_json] = config[:bootstrap_vault_json]
+          bootstrap.config[:bootstrap_vault_item] = config[:bootstrap_vault_item]
+          bootstrap.config[:use_sudo_password] = config[:use_sudo_password]
+          bootstrap.config[:msi_url] = config[:msi_url]
+          bootstrap.config[:install_as_service] = config[:install_as_service]
+          bootstrap.config[:session_timeout] = config[:session_timeout]
+          bootstrap.config[:channel] = config[:channel]
+          bootstrap.config[:bootstrap_product] = config[:bootstrap_product]
         end
 
       end

data/lib/chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol.rb

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -32,33 +32,33 @@ class Chef
         end
 
         def init_bootstrap_options
-          bootstrap.config[:connection_user] = @config[:connection_user]
-          bootstrap.config[:connection_password] = @config[:connection_password]
-          bootstrap.config[:connection_port] = locate_config_value(:connection_port)
-          bootstrap.config[:ssh_identity_file] = @config[:ssh_identity_file]
-          bootstrap.config[:ssh_verify_host_key] = @config[:ssh_verify_host_key]
-          bootstrap.config[:use_sudo] = true unless @config[:connection_user] == "root"
-          bootstrap.config[:ssh_gateway] = locate_config_value(:ssh_gateway)
-          bootstrap.config[:forward_agent] = locate_config_value(:forward_agent)
-          bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
+          bootstrap.config[:connection_user] = config[:connection_user]
+          bootstrap.config[:connection_password] = config[:connection_password]
+          bootstrap.config[:connection_port] = config[:connection_port]
+          bootstrap.config[:ssh_identity_file] = config[:ssh_identity_file]
+          bootstrap.config[:ssh_verify_host_key] = config[:ssh_verify_host_key]
+          bootstrap.config[:use_sudo] = true unless config[:connection_user] == "root"
+          bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
+          bootstrap.config[:forward_agent] = config[:forward_agent]
+          bootstrap.config[:use_sudo_password] = config[:use_sudo_password]
           super
         end
 
         def wait_for_server_ready
-          print "\n#{ui.color("Waiting for sshd to host (#{@config[:bootstrap_ip_address]})", :magenta)}"
+          print "\n#{ui.color("Waiting for sshd to host (#{config[:bootstrap_ip_address]})", :magenta)}"
 
-          ssh_gateway = get_ssh_gateway_for(@config[:bootstrap_ip_address])
+          ssh_gateway = get_ssh_gateway_for(config[:bootstrap_ip_address])
 
           # The ssh_gateway & subnet_id are currently supported only in EC2.
           if ssh_gateway
-            print(".") until tunnel_test_ssh(ssh_gateway, @config[:bootstrap_ip_address]) do
-              @initial_sleep_delay = !!locate_config_value(:subnet_id) ? 40 : 10
+            print(".") until tunnel_test_ssh(ssh_gateway, config[:bootstrap_ip_address]) do
+              @initial_sleep_delay = !!config[:subnet_id] ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
             end
           else
-            print(".") until tcp_test_ssh(@config[:bootstrap_ip_address], locate_config_value(:connection_port) || Chef::Config[:knife][:ssh_port] ) do
-              @initial_sleep_delay = !!locate_config_value(:subnet_id) ? 40 : 10
+            print(".") until tcp_test_ssh(config[:bootstrap_ip_address], config[:connection_port] || config[:ssh_port] ) do
+              @initial_sleep_delay = !!config[:subnet_id] ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
             end
@@ -66,11 +66,11 @@ class Chef
         end
 
         def get_ssh_gateway_for(hostname)
-          if locate_config_value(:ssh_gateway)
+          if config[:ssh_gateway]
             # The ssh_gateway specified in the knife config (if any) takes
             # precedence over anything in the SSH configuration
-            Chef::Log.debug("Using ssh gateway #{locate_config_value(:ssh_gateway)} from knife config")
-            locate_config_value(:ssh_gateway)
+            Chef::Log.debug("Using ssh gateway #{config[:ssh_gateway]} from knife config")
+            config[:ssh_gateway]
           else
             # Next, check if the SSH configuration has a ProxyCommand
             # directive for this host. If there is one, parse out the
@@ -130,7 +130,8 @@ class Chef
         def tunnel_test_ssh(ssh_gateway, hostname, &block)
           status = false
           gateway = configure_ssh_gateway(ssh_gateway)
-          gateway.open(hostname, locate_config_value(:ssh_port)) do |local_tunnel_port|
+          remote_ssh_port = config[:connection_port] || config[:ssh_port] || 22
+          gateway.open(hostname, remote_ssh_port) do |local_tunnel_port|
             status = tcp_test_ssh("localhost", local_tunnel_port, &block)
           end
           status
@@ -157,8 +158,8 @@ class Chef
           gateway_keys = ssh_gateway_config[:keys]
 
           # Use the keys specificed on the command line if available (overrides SSH Config)
-          if locate_config_value(:ssh_gateway_identity)
-            gateway_keys = Array(locate_config_value(:ssh_gateway_identity))
+          if config[:ssh_gateway_identity]
+            gateway_keys = Array(config[:ssh_gateway_identity])
           end
 
           unless gateway_keys.nil?

data/lib/chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol.rb

@@ -31,7 +31,7 @@ class Chef
         end
 
         def load_winrm_deps
-          require "winrm"
+          require "winrm" unless defined?(WinRM::Connection)
           require "chef/knife/core/windows_bootstrap_context"
         end
 

data/lib/chef/knife/cloud/fog/options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 
 class Chef
@@ -13,13 +13,11 @@ class Chef
             option :fog_version,
               long: "--fog-version version",
               description: "Fog gem version to use. Use the ruby gem version strings",
-              default: "",
-              proc: Proc.new { |v| Chef::Config[:knife][:cloud_fog_version] = v }
+              default: ""
 
             option :api_endpoint,
               long: "--api-endpoint ENDPOINT",
-              description: "Your API endpoint. Eg, for Eucalyptus it can be 'http://ecc.eucalyptus.com:8773/services/Eucalyptus'",
-              proc: Proc.new { |endpoint| Chef::Config[:knife][:api_endpoint] = endpoint }
+              description: "Your API endpoint. Eg, for Eucalyptus it can be 'http://ecc.eucalyptus.com:8773/services/Eucalyptus'"
 
           end
         end

data/lib/chef/knife/cloud/fog/service.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 
 require_relative "../service"
@@ -12,18 +12,18 @@ class Chef
     class Cloud
       class FogService < Service
 
-        def initialize(options = {})
-          load_fog_gem
+        def initialize(**kwargs)
           super
+          load_fog_gem
         end
 
         def load_fog_gem
           # Load specific version of fog-core. Any other classes/modules using fog-core are loaded after this.
-          gem "fog-core", Chef::Config[:knife][:cloud_fog_version]
+          gem "fog-core", config[:cloud_fog_version]
           require "fog/core"
           Chef::Log.debug("Using fog-core version: #{Gem.loaded_specs["fog-core"].version}")
-        rescue Exception
-          Chef::Log.error "Error loading fog-core gem."
+        rescue Exception => ex
+          Chef::Log.error "Error loading fog-core gem: #{ex}"
           exit 1
         end
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013-2016 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,11 +27,6 @@ class Chef
           end
         end
 
-        def locate_config_value(key)
-          key = key.to_sym
-          config[key] || Chef::Config[:knife][key]
-        end
-
         def create_service_instance
           raise Chef::Exceptions::Override, "You must override create_service_instance in #{self} to create cloud specific service"
         end
@@ -52,7 +47,7 @@ class Chef
           # subclasses to implement this.
           errors = []
           keys.each do |k|
-            errors << "You did not provide a valid '#{pretty_key(k)}' value." if locate_config_value(k).nil?
+            errors << "You did not provide a valid '#{pretty_key(k)}' value." if config[k].nil?
           end
           error_message = ""
           raise CloudExceptions::ValidationError, error_message if errors.each { |e| ui.error(e); error_message = "#{error_message} #{e}." }.any?

data/lib/chef/knife/cloud/server/create_command.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -33,16 +33,16 @@ class Chef
 
         def validate_params!
           # set param vm_name to a random value if the name is not set by the user (plugin)
-          config[:chef_node_name] = get_node_name(locate_config_value(:chef_node_name), locate_config_value(:chef_node_name_prefix))
+          config[:chef_node_name] = get_node_name(config[:chef_node_name], config[:chef_node_name_prefix])
 
           # validate ssh_identity_file for connection protocol and connection_user, connection_password for both ssh bootstrap protocol and winrm bootstrap protocol
           errors = []
-          if locate_config_value(:connection_protocol) == "ssh"
-            if locate_config_value(:ssh_identity_file).nil? && locate_config_value(:connection_password).nil?
+          if config[:connection_protocol] == "ssh"
+            if config[:ssh_identity_file].nil? && config[:connection_password].nil?
               errors << "You must provide either SSH Identity file or Connection Password."
             end
-          elsif locate_config_value(:connection_protocol) == "winrm"
-            if locate_config_value(:connection_password).nil?
+          elsif config[:connection_protocol] == "winrm"
+            if config[:connection_password].nil?
               errors << "You must provide Connection Password."
             end
           else

data/lib/chef/knife/cloud/server/create_options.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013-2016 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,20 +30,17 @@ class Chef
             option :image,
               short: "-I IMAGE",
               long: "--image IMAGE",
-              description: "A regexp matching an image name or an image ID for the server",
-              proc: Proc.new { |i| Chef::Config[:knife][:image] = i }
+              description: "A regexp matching an image name or an image ID for the server"
 
             option :image_os_type,
               short: "-T IMAGE_OS_TYPE",
               long: "--image-os-type IMAGE_OS_TYPE",
-              description: "The image os type. options [windows/linux]. Only required when cloud does not provide a way to identify image os",
-              proc: Proc.new { |i| Chef::Config[:knife][:image_os_type] = i }
+              description: "The image os type. options [windows/linux]. Only required when cloud does not provide a way to identify image os"
 
             option :flavor,
               short: "-f FLAVOR_ID",
               long: "--flavor FLAVOR_ID",
-              description: "The flavor name or ID of server",
-              proc: Proc.new { |f| Chef::Config[:knife][:flavor] = f }
+              description: "The flavor name or ID of server"
 
             deprecated_option :bootstrap_protocol,
               replacement: :connection_protocol,
@@ -52,8 +49,7 @@ class Chef
             option :server_create_timeout,
               long: "--server-create-timeout timeout",
               description: "How long to wait until the server is ready; default is 600 seconds",
-              default: 600,
-              proc: Proc.new { |v| Chef::Config[:knife][:server_create_timeout] = v }
+              default: 600
 
             option :delete_server_on_failure,
               long: "--delete-server-on-failure",
@@ -64,8 +60,7 @@ class Chef
             option :chef_node_name_prefix,
               long: "--chef-node-name-prefix PREFIX_FOR_NODE_NAME",
               description: "The prefix for chef node name",
-              default: includer.snake_case_name.split("_").first,
-              proc: Proc.new { |key| Chef::Config[:knife][:chef_node_name_prefix] = key }
+              default: includer.snake_case_name.split("_").first
           end
         end
 

data/lib/chef/knife/cloud/server/list_options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
-# Copyright:: Copyright (c) 2013-2016 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,8 +31,7 @@ class Chef
 
             option :chef_node_attribute,
               long: "--chef-node-attribute CHEF_NODE_ATTRIBUTE_NAME",
-              description: "Used with --chef-data option. It display node attributes details by adding new column in server list display.",
-              proc: Proc.new { |i| Chef::Config[:knife][:chef_node_attribute] = i }
+              description: "Used with --chef-data option. It display node attributes details by adding new column in server list display."
 
           end
         end

data/lib/chef/knife/cloud/server/options.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013-2016 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
             option :custom_attributes,
               long: "--custom-attributes CUSTOM_ATTRIBUTES",
               description: "Custom attributes to be passed to Fog.",
-              proc: Proc.new { |args| Chef::Config[:knife][:custom_attributes] = args.split(";").map { |keys| keys.split("=") }.map { |j| Hash[*j.map(&:strip)] } }
+              proc: Proc.new { |args| args.split(";").map { |keys| keys.split("=") }.map { |j| Hash[*j.map(&:strip)] } }
           end
         end
       end

data/lib/chef/knife/cloud/server/show_command.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -32,7 +32,7 @@ class Chef
         def validate_params!
           errors = []
           config[:instance_id] = @name_args.first
-          if locate_config_value(:instance_id).nil?
+          if config[:instance_id].nil?
             errors << "You must provide a valid Instance Id"
           end
           error_message = ""
@@ -40,9 +40,9 @@ class Chef
         end
 
         def execute_command
-          server = service.get_server(locate_config_value(:instance_id))
+          server = service.get_server(config[:instance_id])
           if server.nil?
-            error_message = "Server doesn't exists for this #{locate_config_value(:instance_id)} instance id."
+            error_message = "Server doesn't exists for this #{config[:instance_id]} instance id."
             ui.error(error_message)
             raise CloudExceptions::ServerShowError, error_message
           else

data/lib/chef/knife/cloud/server/show_options.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -24,8 +24,7 @@ class Chef
 
             option :instance_id,
               long: "--instance-id INSTANCE_ID",
-              description: "Required. Instance Id of Server",
-              proc: Proc.new { |i| Chef::Config[:knife][:instance_id] = i }
+              description: "Required. Instance Id of Server"
 
           end
         end

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

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013-2016 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");
@@ -25,9 +25,12 @@ class Chef
       class Service
         include Cloud::Helpers
         attr_accessor :ui
+        attr_accessor :config
+        attr_reader :auth_params
 
-        def initialize(options = {})
-          @auth_params = options[:auth_params]
+        def initialize(config:, auth_params: nil)
+          @config = config
+          @auth_params = auth_params
         end
 
         def connection
@@ -78,7 +81,7 @@ class Chef
         end
 
         def add_custom_attributes(server_def)
-          Chef::Config[:knife][:custom_attributes].map { |args| args.map { |k, v| server_def.merge!(k.to_sym => v) } } unless Chef::Config[:knife][:custom_attributes].nil?
+          config[:custom_attributes].map { |args| args.map { |k, v| server_def.merge!(k.to_sym => v) } } unless config[:custom_attributes].nil?
         end
 
       end # class service

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "3.0.4".freeze
+    VERSION = "4.0.15".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/lib/test/knife-utils/helper.rb

@@ -1,6 +1,6 @@
-require "securerandom"
-require "tmpdir"
-require "fileutils"
+require "securerandom" unless defined?(SecureRandom)
+require "tmpdir" unless defined?(Dir.mktmpdir)
+require "fileutils" unless defined?(FileUtils)
 require File.expand_path(File.dirname(__FILE__) + "/knife_test_utils")
 require File.expand_path(File.dirname(__FILE__) + "/matchers")
 

data/lib/test/knife-utils/knife_test_utils.rb

@@ -1,4 +1,4 @@
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module RSpec
   module KnifeTestUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 4.0.15
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.11'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,8 @@ files:
 - lib/test/templates/windows-chef-client-msi.erb
 - lib/test/templates/windows-shell.erb
 homepage: https://github.com/chef/knife-cloud
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -106,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.5
+      version: '2.6'
 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: knife-cloud plugin