knife-cloud 1.0.1 → 1.1.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89a275527a1635cbb275c29795146b6f0dbbd845
-  data.tar.gz: dcae475fc95e70ab33aea6c486ff11c858538b34
+  metadata.gz: 788ed3dc24ee8ce5785af0a5adfbfdfff4cc2e84
+  data.tar.gz: 013964ef1d9e20da5a1a8490d5021c6d1ba2df99
 SHA512:
-  metadata.gz: cae449a3498e725833a6976856acf81acc6139a04a0dde8ac014bd35ae73e12b4109536d2f619dd69649cb26b513af1c06fc2a1a540d34f86a3bf3626cee9f6f
-  data.tar.gz: 1799ec2b8a323715aeb2f2097056064384709c2270764c59036d4039733b054e88685e33d80562e5432ecc0261483ec70657b97daef116fc658d48fb95a1b57f
+  metadata.gz: 88d59fbde18cb34fb0727c102fd4ef00d401cfb2cb742d62e4d68185f80dee660623675d6d737b52de975fc7ec0416cc23780366e200992aa13333f3ec4392da
+  data.tar.gz: 5b80aa2d77ba13b576001a46c7edcbf4a9e3db7f4aeba058eadbe2a7c24bc76c8c13f9e77b4cfa7052f67942dd70442cc843135c366e3adfb4214928e65221c5

data/.travis.yml

@@ -1,7 +1,19 @@
 rvm:
-#  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 
-script: bundle exec rake spec
+gemfile: ci.gemfile
+
+env:
+  - CHEF_VERSION="master"
+  - CHEF_VERSION="~> 12.0"
+  - CHEF_VERSION="< 12"
+
+matrix:
+  exclude:
+  - rvm: 1.9.3
+    env: CHEF_VERSION="master"
+  - rvm: 1.9.3
+    env: CHEF_VERSION="~> 12.0"
+
+script: bundle exec rake spec

data/README.md

@@ -1,31 +1,32 @@
-Knife Cloud
-===============
+# Knife Cloud
 
 [![Build Status](http://img.shields.io/travis/opscode/knife-cloud.svg)][travis]
 [![Code Climate](http://img.shields.io/codeclimate/github/opscode/knife-cloud.svg)][codeclimate]
 
-[travis]: https://travis-ci.org/opscode/knife-cloud
-[codeclimate]: https://codeclimate.com/github/opscode/knife-cloud
+[travis]: https://travis-ci.org/chef/knife-cloud
+[codeclimate]: https://codeclimate.com/github/chef/knife-cloud
 
 ## Description
 
-Knife-cloud is a library for implementing knife plugins that integrate cloud
-infrastructure with Chef. For more information about knife and Chef visit https://getchef.com/chef.
+`knife-cloud` is a library for implementing knife plugins that integrate cloud
+infrastructure with Chef. For more information about knife and Chef visit https://chef.io/chef.
 
 ## Purpose
 
-The knife-cloud library has been designed to integrate the common tasks of all knife plugins. As a developer of a knife plugin, you will not have to worry about writing generic code in your plugin, eg: the Chef bootstrap code or SSH / WinRM connection code. 
+The knife-cloud library has been designed to integrate the common tasks of all knife plugins. As a developer of a knife plugin, you will not have to worry about writing generic code in your plugin, eg: the Chef bootstrap code or SSH / WinRM connection code.
 
 ## Installation
 
 This library is distributed as a Ruby Gem. To install it, run:
 
     $ gem install knife-cloud
+    $ # OR
+    $ chef exec gem install knife-cloud
 
 Depending on your system's configuration, you may need to run this command with root privileges.
 Alternatively, you can build the gem from the knife-cloud source code.
 
-	$ git clone https://github.com/opscode/knife-cloud
+	$ git clone https://github.com/chef/knife-cloud
 	$ cd knife-cloud
 	$ rake gem
 	$ gem install knife-cloud-x.y.z.gem
@@ -33,7 +34,7 @@ Alternatively, you can build the gem from the knife-cloud source code.
 ## Writing your custom plugin
 
 General documentation of how to develop a knife plugin can be found in
-[Chef documentation](http://docs.getchef.com/plugin_knife_custom.html). Use of
+[Chef documentation](http://docs.chef.io/plugin_knife_custom.html). Use of
 the `knife-cloud` gem to implement the plugin automates many aspects of the
 process.
 
@@ -97,7 +98,7 @@ Create a new ruby project, say knife-myplugin. Its code structure will look like
 				myplugin_server_delete.rb
 				myplugin_server_list.rb
 				myplugin_flavor_list.rb
-	
+
 ### Service
 
 - myplugin_service.rb
@@ -113,7 +114,7 @@ Example Code:
 	  class Knife
 		class Cloud
 		  class MypluginService < FogService
-		  
+
 			def initialize(options = {})
 				# TODO - Add cloud specific auth params to be passed to fog connection. See knife-openstack for real life example.
 				super(options.merge({
@@ -184,7 +185,7 @@ This class will inherit from the Chef::Knife::Cloud::ServerCreateCommand class.
 			include MypluginServiceOptions
 
 			banner "knife myplugin server create (options)"
-			
+
 		  end
 		end
 	  end
@@ -269,7 +270,7 @@ Following is the code template for the above methods
         def validate_params!
           super
           errors = []
-          
+
           # TODO - Add your validation here for any create server parameters and populate errors [] with error message strings.
 
           # errors << "your error message" if some_param_undefined
@@ -277,7 +278,7 @@ Following is the code template for the above methods
           error_message = ""
           raise CloudExceptions::ValidationError, error_message if errors.each{|e| ui.error(e); error_message = "#{error_message} #{e}."}.any?
         end
-	
+
 ### Server Delete Command
 
 - myplugin_server_delete.rb
@@ -404,7 +405,7 @@ Example -
 
 ## License
 
-Copyright:: Copyright (c) 2014 Chef Software, Inc.
+Copyright:: Copyright (c) 2014-2015 Chef Software, Inc.
 
 License:: Apache License, Version 2.0
 

data/ci.gemfile

@@ -0,0 +1,18 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in knife-cloud.gemspec
+gemspec
+
+if ENV['CHEF_VERSION'] == 'master'
+  gem 'chef', github: 'chef/chef'
+elsif ENV['CHEF_VERSION'] == '< 12'
+  gem 'ohai', '7.4.1'
+  gem 'chef', ENV['CHEF_VERSION']
+else
+  gem 'chef', ENV['CHEF_VERSION']
+end
+
+group :development do
+  gem 'rake'
+  gem 'knife-windows'
+end

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

@@ -104,7 +104,16 @@ class Chef
             option :distro,
               :short => "-d DISTRO",
               :long => "--distro DISTRO",
-              :description => "Bootstrap a distro using a template"
+              :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
+              }
+
+            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."
 
             option :use_sudo,
               :long => "--sudo",
@@ -118,9 +127,11 @@ class Chef
 
             option :template_file,
               :long => "--template-file TEMPLATE",
-              :description => "Full path to location of template to use",
-              :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
-              :default => false
+              :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
+              }
 
             option :run_list,
               :short => "-r RUN_LIST",
@@ -164,6 +175,31 @@ class Chef
               :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 }
+
+            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
+
+            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"]
+                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
+
             option :bootstrap_install_command,
               :long        => "--bootstrap-install-command COMMANDS",
               :description => "Custom command to install chef-client",
@@ -174,15 +210,25 @@ class Chef
               :description => "Add options to wget when installing chef-client",
               :proc        => Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
 
-            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 }
+            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'
+
+            option :bootstrap_vault_json,
+              :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|
+                (vault, item) = i.split(/:/)
+                Chef::Config[:knife][:bootstrap_vault_item] ||= {}
+                Chef::Config[:knife][:bootstrap_vault_item][vault] ||= []
+                Chef::Config[:knife][:bootstrap_vault_item][vault].push(item)
+                Chef::Config[:knife][:bootstrap_vault_item]
+              }
 
-            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
           end
         end
       end # module ends

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

@@ -61,6 +61,18 @@ class Chef
           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[: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)
         end
 
       end

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

@@ -32,7 +32,6 @@ class Chef
 
         def load_winrm_deps
           require 'winrm'
-          require 'em-winrm'
           require 'chef/knife/bootstrap_windows_winrm'
           require 'chef/knife/core/windows_bootstrap_context'
           require 'chef/knife/winrm'
@@ -75,7 +74,7 @@ class Chef
           sleep 2
           false
         ensure
-          tcp_socket && tcp_socket.close          
+          tcp_socket && tcp_socket.close
         end
 
       end

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "1.0.1"
+    VERSION = "1.1.0.rc.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/lib/test/templates/chef-full-chef-zero.erb

@@ -10,14 +10,13 @@ exists() {
   fi
 }
 
-install_sh="http://opscode.com/chef/install.sh"
-version_string="-v <%= chef_version %>"
+install_sh="http://chef.io/chef/install.sh"
 
 if ! exists /usr/bin/chef-client; then
   if exists wget; then
-    bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -) ${version_string}
+    bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -)
   elif exists curl; then
-    bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> ${install_sh}) ${version_string}
+    bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> ${install_sh})
   else
     echo "Neither wget nor curl found. Please install one and try again." >&2
     exit 1

data/spec/unit/bootstrap_protocol_spec.rb

@@ -55,6 +55,17 @@ describe Chef::Knife::Cloud::BootstrapProtocol do
       @config[:secret] = "secret"
       @config[:secret_file] = "secret_file"
       @config[:template_file] = "../template_file"
+      @config[:bootstrap_vault_file] = "/foo/bar/baz"
+      @config[:bootstrap_vault_json] = '{ "vault": "item1" }'
+      @config[:bootstrap_vault_item] = { 'vault' => 'item1' }
+      @config[:bootstrap_template] = "../template_file"
+      @config[:node_ssl_verify_mode] = "none"
+      @config[:node_verify_api_cert] = true
+      @config[:bootstrap_url] = "https://www.chef.io/chef/install.sh"
+      @config[:bootstrap_install_command] = "curl -l https://www.chef.io/chef/install.sh | sudo bash -s --"
+      @config[:bootstrap_wget_options] = "-e use_proxy=yes -e http://myproxy.com:8080"
+      @config[:bootstrap_curl_options] = "--proxy http://myproxy.com:8080"
+      @config[:use_sudo_password] = "true"
       allow(@config).to receive(:locate_config_value).and_return({})
       @instance.bootstrap = Chef::Knife::Bootstrap.new
       @instance.init_bootstrap_options
@@ -65,6 +76,17 @@ describe Chef::Knife::Cloud::BootstrapProtocol do
       expect(@instance.bootstrap.config[:secret]).to eq(@config[:secret])
       expect(@instance.bootstrap.config[:secret_file]).to eq(@config[:secret_file])
       expect(@instance.bootstrap.config[:template_file]).to eq(@config[:template_file])
+      expect(@instance.bootstrap.config[:bootstrap_vault_file]).to eq(@config[:bootstrap_vault_file])
+      expect(@instance.bootstrap.config[:bootstrap_vault_json]).to eq(@config[:bootstrap_vault_json])
+      expect(@instance.bootstrap.config[:bootstrap_vault_item]).to eq(@config[:bootstrap_vault_item])
+      expect(@instance.bootstrap.config[:bootstrap_template]).to eq(@config[:bootstrap_template])
+      expect(@instance.bootstrap.config[:node_ssl_verify_mode]).to eq(@config[:node_ssl_verify_mode])
+      expect(@instance.bootstrap.config[:node_verify_api_cert]).to eq(@config[:node_verify_api_cert])
+      expect(@instance.bootstrap.config[:bootstrap_url]).to eq(@config[:bootstrap_url])
+      expect(@instance.bootstrap.config[:bootstrap_install_command]).to eq(@config[:bootstrap_install_command])
+      expect(@instance.bootstrap.config[:bootstrap_wget_options]).to eq(@config[:bootstrap_wget_options])
+      expect(@instance.bootstrap.config[:bootstrap_curl_options]).to eq(@config[:bootstrap_curl_options])
+      expect(@instance.bootstrap.config[:use_sudo_password]).to eq(@config[:use_sudo_password])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.rc.0
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -140,6 +140,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ci.gemfile
 - knife-cloud.gemspec
 - lib/chef/knife/cloud/chefbootstrap/bootstrap_distribution.rb
 - lib/chef/knife/cloud/chefbootstrap/bootstrap_options.rb
@@ -213,9 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -245,3 +246,4 @@ test_files:
 - spec/unit/unix_distribution_spec.rb
 - spec/unit/windows_distribution_spec.rb
 - spec/unit/winrm_bootstrap_protocol_spec.rb
+has_rdoc: