knife-cloud 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0dffb3f762fabd5c361aa9b75c9664c201da6473
-  data.tar.gz: 82bb614bfa626c8d0048a9473de8b3185451751a
+SHA256:
+  metadata.gz: 3e9f12b223e859ae2666a230a73195fb48221bdf29edc0a3b345c0ddc40b6d3b
+  data.tar.gz: 80e5ff22aa5769a1e671526a6fe9a06436db5b3da5192f24dd02a63d5a961089
 SHA512:
-  metadata.gz: 8e49df45f0bce339410f742445b94411d20ab2711828395f08a1897947c8a3d5d5025284f1f06ddae93c91f4760ae74dd2fb646b5fbd38d1d82d3e26d4894e57
-  data.tar.gz: e047f78d7412473e0509bb43ff1154a602c3389f0fbfb740d201d8cd128a12f494ec2254a914cc47f0a10eb95b0a7d797a55632e0b645bcbfe78f70126dfc294
+  metadata.gz: 5c200c5564f6273a92472f0591bd04173b0e266488bddc3320ccccc5be2c00bdea7ac979f661083f559dd7ee4b92e82d8ca8c83335bebbcda033b81fd610106e
+  data.tar.gz: c79491de45e5a99dc43fdcb9204e425c75f1768d90e9518069a8b8cda69b675584fa9f76ccf64aede16e4fd00f8efa2ab27f438d8b965b5bd56f3123e5b90835

data/LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2013 Opscode, Inc.
+Copyright [yyyy] [name of copyright owner]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/knife/cloud/helpers'
+require "chef/knife/cloud/helpers"
 
 class Chef
   class Knife

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

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require 'chef/knife/winrm_base'
-require 'chef/knife/core/bootstrap_context'
-require 'net/ssh/multi'
+require "chef/knife/winrm_base"
+require "chef/knife/core/bootstrap_context"
+require "net/ssh/multi"
 
 class Chef
   class Knife
@@ -29,199 +29,181 @@ class Chef
           includer.class_eval do
 
             deps do
-              require 'chef/json_compat'
-              require 'tempfile'
-              require 'highline'
-              require 'net/ssh'
-              require 'chef/knife/ssh'
+              require "chef/json_compat"
+              require "tempfile"
+              require "net/ssh"
+              require "chef/knife/ssh"
               Chef::Knife::Ssh.load_deps
             end
 
             include Chef::Knife::WinrmBase
 
             option :ssh_user,
-              :short => "-x USERNAME",
-              :long => "--ssh-user USERNAME",
-              :description => "The ssh username",
-              :default => "root"
+              short: "-x USERNAME",
+              long: "--ssh-user USERNAME",
+              description: "The ssh username",
+              default: "root"
 
             option :ssh_password,
-              :short => "-P PASSWORD",
-              :long => "--ssh-password PASSWORD",
-              :description => "The ssh password"
+              short: "-P PASSWORD",
+              long: "--ssh-password PASSWORD",
+              description: "The ssh password"
 
             option :ssh_port,
-              :short => "-p PORT",
-              :long => "--ssh-port PORT",
-              :description => "The ssh port",
-              :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key },
-              :default => "22"
+              short: "-p PORT",
+              long: "--ssh-port PORT",
+              description: "The ssh port",
+              proc: Proc.new { |key| Chef::Config[:knife][:ssh_port] = key },
+              default: "22"
 
             option :ssh_gateway,
-              :long => "--ssh-gateway GATEWAY",
-              :description => "The ssh gateway server. Any proxies configured in your ssh config are automatically used by default.",
-              :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
+              long: "--ssh-gateway GATEWAY",
+              description: "The ssh gateway server. Any proxies configured in your ssh config are automatically used by default.",
+              proc: Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
 
             option :ssh_gateway_identity,
-              :long => "--ssh-gateway-identity IDENTITY_FILE",
-              :description => "The private key for ssh gateway server",
-              :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway_identity] = key }
+              long: "--ssh-gateway-identity IDENTITY_FILE",
+              description: "The private key for ssh gateway server",
+              proc: Proc.new { |key| Chef::Config[:knife][:ssh_gateway_identity] = key }
 
             option :forward_agent,
-              :long => "--forward-agent",
-              :description => "Enable SSH agent forwarding",
-              :boolean => true
+              long: "--forward-agent",
+              description: "Enable SSH agent forwarding",
+              boolean: true
 
             option :identity_file,
-              :short => "-i IDENTITY_FILE",
-              :long => "--identity-file IDENTITY_FILE",
-              :description => "The SSH identity file used for authentication"
+              short: "-i IDENTITY_FILE",
+              long: "--identity-file IDENTITY_FILE",
+              description: "The SSH identity file used for authentication"
 
             option :chef_node_name,
-              :short => "-N NAME",
-              :long => "--node-name NAME",
-              :description => "The Chef node name for your new node"
+              short: "-N NAME",
+              long: "--node-name NAME",
+              description: "The Chef node name for your new node"
 
             option :prerelease,
-              :long => "--prerelease",
-              :description => "Install the pre-release chef gems"
+              long: "--prerelease",
+              description: "Install the pre-release chef gems"
 
             option :bootstrap_version,
-              :long => "--bootstrap-version VERSION",
-              :description => "The version of Chef to install",
-              :proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
+              long: "--bootstrap-version VERSION",
+              description: "The version of Chef to install",
+              proc: lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
             option :bootstrap_proxy,
-              :long => "--bootstrap-proxy PROXY_URL",
-              :description => "The proxy server for the node being bootstrapped",
-              :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
+              long: "--bootstrap-proxy PROXY_URL",
+              description: "The proxy server for the node being bootstrapped",
+              proc: Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
 
             option :bootstrap_no_proxy,
-              :long => "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
-              :description => "Do not proxy locations for the node being bootstrapped; this option is used internally by Opscode",
-              :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
-
-            option :distro,
-              :short => "-d DISTRO",
-              :long => "--distro DISTRO",
-              :description => "Bootstrap a distro using a template. [DEPRECATED] Use -t / --template option instead.",
-              :proc => Proc.new { |t|
-                Chef::Log.warn("[DEPRECATED] -d / --distro option is deprecated. Use -t / --template option instead.")
-                Chef::Config[:knife][:bootstrap_template] = t
-              }
+              long: "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
+              description: "Do not proxy locations for the node being bootstrapped; this option is used internally by Chef",
+              proc: Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
 
             option :bootstrap_template,
-              :short => "-t TEMPLATE",
-              :long => "--bootstrap-template TEMPLATE",
-              :description => "Bootstrap Chef using a built-in or custom template. Set to the full path of an erb template or use one of the built-in templates."
+              short: "-t TEMPLATE",
+              long: "--bootstrap-template TEMPLATE",
+              description: "Bootstrap Chef using a built-in or custom template. Set to the full path of an erb template or use one of the built-in templates."
 
             option :use_sudo,
-              :long => "--sudo",
-              :description => "Execute the bootstrap via sudo",
-              :boolean => true
+              long: "--sudo",
+              description: "Execute the bootstrap via sudo",
+              boolean: true
 
             option :use_sudo_password,
-              :long => "--use-sudo-password",
-              :description => "Execute the bootstrap via sudo with password",
-              :boolean => false
-
-            option :template_file,
-              :long => "--template-file TEMPLATE",
-              :description => "Full path to location of template to use. [DEPRECATED] Use -t / --bootstrap-template option instead.",
-              :proc        => Proc.new { |v|
-                Chef::Log.warn("[DEPRECATED] --template-file option is deprecated. Use -t / --bootstrap-template option instead.")
-                v
-              }
+              long: "--use-sudo-password",
+              description: "Execute the bootstrap via sudo with password",
+              boolean: false
 
             option :run_list,
-              :short => "-r RUN_LIST",
-              :long => "--run-list RUN_LIST",
-              :description => "Comma separated list of roles/recipes to apply",
-              :proc => lambda { |o| o.split(/[\s,]+/) },
-              :default => []
+              short: "-r RUN_LIST",
+              long: "--run-list RUN_LIST",
+              description: "Comma separated list of roles/recipes to apply",
+              proc: lambda { |o| o.split(/[\s,]+/) },
+              default: []
 
             option :first_boot_attributes,
-              :short => "-j JSON_ATTRIBS",
-              :long => "--json-attributes",
-              :description => "A JSON string to be added to the first run of chef-client",
-              :proc => lambda { |o| JSON.parse(o) },
-              :default => {}
+              short: "-j JSON_ATTRIBS",
+              long: "--json-attributes",
+              description: "A JSON string to be added to the first run of chef-client",
+              proc: lambda { |o| JSON.parse(o) },
+              default: {}
 
             option :host_key_verify,
-              :long => "--[no-]host-key-verify",
-              :description => "Verify host key, enabled by default.",
-              :boolean => true,
-              :default => true
+              long: "--[no-]host-key-verify",
+              description: "Verify host key, enabled by default.",
+              boolean: true,
+              default: true
 
             option :hint,
-              :long => "--hint HINT_NAME[=HINT_FILE]",
-              :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
-              :proc => Proc.new { |h|
+              long: "--hint HINT_NAME[=HINT_FILE]",
+              description: "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
+              proc: Proc.new { |h|
                 Chef::Config[:knife][:hints] ||= Hash.new
                 name, path = h.split("=")
-                Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new  }
+                Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new }
 
             option :secret,
-              :short => "-s SECRET",
-              :long  => "--secret ",
-              :description => "The secret key to use to encrypt data bag item values"
+              short: "-s SECRET",
+              long: "--secret ",
+              description: "The secret key to use to encrypt data bag item values"
 
             option :secret_file,
-              :long => "--secret-file SECRET_FILE",
-              :description => "A file containing the secret key to use to encrypt data bag item values"
+              long: "--secret-file SECRET_FILE",
+              description: "A file containing the secret key to use to encrypt data bag item values"
 
             option :bootstrap_url,
-              :long        => "--bootstrap-url URL",
-              :description => "URL to a custom installation script",
-              :proc        => Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u }
+              long: "--bootstrap-url URL",
+              description: "URL to a custom installation script",
+              proc: Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u }
 
             option :bootstrap_curl_options,
-              :long        => "--bootstrap-curl-options OPTIONS",
-              :description => "Add options to curl when install chef-client",
-              :proc        => Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
+              long: "--bootstrap-curl-options OPTIONS",
+              description: "Add options to curl when install chef-client",
+              proc: Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
 
             option :auth_timeout,
-              :long => "--auth-timeout MINUTES",
-              :description => "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 25 minutes.",
-              :default => 25
+              long: "--auth-timeout MINUTES",
+              description: "The maximum time in minutes to wait to for authentication over the transport to the node to succeed. The default value is 25 minutes.",
+              default: 25
 
             option :node_ssl_verify_mode,
-              :long        => "--node-ssl-verify-mode [peer|none]",
-              :description => "Whether or not to verify the SSL cert for all HTTPS requests.",
-              :proc        => Proc.new { |v|
-                valid_values = ["none", "peer"]
+              long: "--node-ssl-verify-mode [peer|none]",
+              description: "Whether or not to verify the SSL cert for all HTTPS requests.",
+              proc: Proc.new { |v|
+                valid_values = %w{none peer}
                 unless valid_values.include?(v)
                   raise "Invalid value '#{v}' for --node-ssl-verify-mode. Valid values are: #{valid_values.join(", ")}"
                 end
               }
 
             option :node_verify_api_cert,
-              :long        => "--[no-]node-verify-api-cert",
-              :description => "Verify the SSL cert for HTTPS requests to the Chef server API.",
-              :boolean     => true
+              long: "--[no-]node-verify-api-cert",
+              description: "Verify the SSL cert for HTTPS requests to the Chef server API.",
+              boolean: true
 
             option :bootstrap_install_command,
-              :long        => "--bootstrap-install-command COMMANDS",
-              :description => "Custom command to install chef-client",
-              :proc        => Proc.new { |ic| Chef::Config[:knife][:bootstrap_install_command] = ic }
+              long: "--bootstrap-install-command COMMANDS",
+              description: "Custom command to install chef-client",
+              proc: Proc.new { |ic| Chef::Config[:knife][:bootstrap_install_command] = ic }
 
             option :bootstrap_wget_options,
-              :long        => "--bootstrap-wget-options OPTIONS",
-              :description => "Add options to wget when installing chef-client",
-              :proc        => Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
+              long: "--bootstrap-wget-options OPTIONS",
+              description: "Add options to wget when installing chef-client",
+              proc: Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
 
             option :bootstrap_vault_file,
-              :long        => '--bootstrap-vault-file VAULT_FILE',
-              :description => 'A JSON file with a list of vault(s) and item(s) to be updated'
+              long: "--bootstrap-vault-file VAULT_FILE",
+              description: "A JSON file with a list of vault(s) and item(s) to be updated"
 
             option :bootstrap_vault_json,
-              :long        => '--bootstrap-vault-json VAULT_JSON',
-              :description => 'A JSON string with the vault(s) and item(s) to be updated'
+              long: "--bootstrap-vault-json VAULT_JSON",
+              description: "A JSON string with the vault(s) and item(s) to be updated"
 
             option :bootstrap_vault_item,
-              :long        => '--bootstrap-vault-item VAULT_ITEM',
-              :description => 'A single vault and item to update as "vault:item"',
-              :proc        => Proc.new { |i|
+              long: "--bootstrap-vault-item VAULT_ITEM",
+              description: 'A single vault and item to update as "vault:item"',
+              proc: Proc.new { |i|
                 (vault, item) = i.split(/:/)
                 Chef::Config[:knife][:bootstrap_vault_item] ||= {}
                 Chef::Config[:knife][:bootstrap_vault_item][vault] ||= []
@@ -229,15 +211,15 @@ class Chef
                 Chef::Config[:knife][:bootstrap_vault_item]
               }
             option :msi_url,
-              :short => "-u URL",
-              :long => "--msi-url URL",
-              :description => "Location of the Chef Client MSI. The default templates will prefer to download from this location. The MSI will be downloaded from chef.io if not provided.",
-              :default => ''
-            
+              short: "-u URL",
+              long: "--msi-url URL",
+              description: "Location of the Chef Client MSI. The default templates will prefer to download from this location. The MSI will be downloaded from chef.io if not provided.",
+              default: ""
+
             option :install_as_service,
-              :long => "--install-as-service",
-              :description => "Install chef-client as service in windows machine",
-              :default => false
+              long: "--install-as-service",
+              description: "Install chef-client as service in windows machine",
+              default: false
 
           end
         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 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require 'chef/knife/core/ui'
-require 'chef/knife/cloud/helpers'
+require "chef/knife/core/ui"
+require "chef/knife/cloud/helpers"
 
 class Chef
   class Knife
@@ -35,7 +35,7 @@ class Chef
         end
 
         def wait_for_server_ready
-          raise Chef::Exceptions::Override, "You must override wait_for_server_ready in #{self.to_s}"
+          raise Chef::Exceptions::Override, "You must override wait_for_server_ready in #{self}"
         end
 
         def send_bootstrap_command
@@ -60,8 +60,8 @@ class Chef
           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[:template_file] =  locate_config_value(:template_file)
-          bootstrap.config[:bootstrap_template] =  locate_config_value(:bootstrap_template)
+          bootstrap.config[:template_file] = locate_config_value(:template_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)

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

@@ -1,7 +1,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 #
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,12 @@
 # limitations under the License.
 #
 
-require 'chef/knife/core/ui'
-require 'chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol'
-require 'chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol'
-require 'chef/knife/cloud/chefbootstrap/windows_distribution'
-require 'chef/knife/cloud/chefbootstrap/unix_distribution'
-require 'chef/knife/cloud/exceptions'
+require "chef/knife/core/ui"
+require "chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol"
+require "chef/knife/cloud/chefbootstrap/winrm_bootstrap_protocol"
+require "chef/knife/cloud/chefbootstrap/windows_distribution"
+require "chef/knife/cloud/chefbootstrap/unix_distribution"
+require "chef/knife/cloud/exceptions"
 
 class Chef
   class Knife
@@ -47,9 +47,9 @@ class Chef
         end
 
         def create_bootstrap_protocol
-          if @config[:bootstrap_protocol].nil? or @config[:bootstrap_protocol] == 'ssh'
+          if @config[:bootstrap_protocol].nil? || @config[:bootstrap_protocol] == "ssh"
             SshBootstrapProtocol.new(@config)
-          elsif @config[:bootstrap_protocol] == 'winrm'
+          elsif @config[:bootstrap_protocol] == "winrm"
             WinrmBootstrapProtocol.new(@config)
           else
             # raise an exception, invalid bootstrap protocol.
@@ -60,9 +60,9 @@ class Chef
         end
 
         def create_bootstrap_distribution
-          if @config[:image_os_type] == 'windows'
+          if @config[:image_os_type] == "windows"
             Chef::Knife::Cloud::WindowsDistribution.new(@config)
-          elsif @config[:image_os_type] == 'linux'
+          elsif @config[:image_os_type] == "linux"
             Chef::Knife::Cloud::UnixDistribution.new(@config)
           else
             # raise an exception, invalid bootstrap distribution.
@@ -75,4 +75,3 @@ class Chef
     end
   end
 end
-