knife-zero 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620915bb2600d2bff34062afc9f5aed680043159
-  data.tar.gz: c01f7d554cbb73f3ed02dd5e2f03eff8e9f26231
+  metadata.gz: 7615a63a5eff793078740317f3ca12fdb607821e
+  data.tar.gz: 0d73adc8804b0bd7795cdf3c7bfa4f37b73ed7ca
 SHA512:
-  metadata.gz: a0d1659ce376fd1969d2689082e7e6a1bc6eaee0653f7665b722325228c9cb592a6d3c7792234d099ba3e64556cac8f6399e079799eb691d0e955a8220d1c694
-  data.tar.gz: 9bc35ec066cc9707d6664623d9184d79dc2a796f94c3c2aa8b9e5505d3bb0b310b1558bd7cf8f1662af1cb942c83ea6c2906f192f08e31a3f22471c985e82c11
+  metadata.gz: abec6340cc40f8df2457bb2d11323c4f83d12a4a2cedd6f8178fe98e6803a70e9a3ec3732d3a38e196da9d8b1a1678ac404c1ccdf1430484e5127199b50eb5ef
+  data.tar.gz: ec85f918f363ac842b3e65c1391ba9093e2ba6322763fa55249be4fa7bc01af698167116c81a8540cb7b5aa3595bb84c032c36f9b7c81c4ceb224460b29d5514

data/CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog of knife-zero
 
-## Unrelesed
+## Unreleased
+
+## v1.5.0
+
+- Feature: Support bootstrap as vault client(chef-vault).
 
 ## v1.4.0
 
 - Change: remote listen by local chef-zero port + 10000
-- Feature: overrde Remote Chef-Zero port.
+- Feature: override Remote Chef-Zero port.
 
 ## v1.3.0
 
@@ -29,7 +33,7 @@
 
 ## v1.1.5
 
-- FIx: remove debug code.
+- Fix: remove debug code.
 
 ## v1.1.4
 
@@ -78,7 +82,7 @@
 
 ## v0.1.0 (yanked)
 
-- Feature: run Chef-Client by Seach query.
+- Feature: run Chef-Client by Search query.
 
 
 ## v0.0.2

data/Dockerfile

@@ -0,0 +1,25 @@
+FROM higanworks/knife-zero-edgebase
+MAINTAINER sawanoboriyu@higanworks.com
+
+ADD .git/index /index
+
+WORKDIR /home
+RUN wget https://codeload.github.com/chef/chef/legacy.tar.gz/master
+RUN tar xvzf master && mv chef-chef-* chef
+
+WORKDIR /home/chef
+
+RUN gem build chef.gemspec
+RUN gem install -V -b chef*.gem --no-ri --no-rdoc
+
+ADD . /home/knife-zero/
+ADD integration_test/chef-repo /chef-repo/
+
+WORKDIR /home/knife-zero
+
+RUN gem build knife-zero.gemspec
+RUN gem install -V -l knife-zero-*.gem
+
+WORKDIR /chef-repo
+
+CMD ["sh", "run.sh"]

data/README.md

@@ -1,6 +1,7 @@
 # Knife-Plugin Zero
 
-[![Circle CI](https://circleci.com/gh/higanworks/knife-zero.svg?style=svg)](https://circleci.com/gh/higanworks/knife-zero)
+- current_master: [![Circle CI](https://circleci.com/gh/higanworks/knife-zero/tree/master.svg?style=svg)](https://circleci.com/gh/higanworks/knife-zero/tree/master)
+- integration_with_edge_chef: [![Circle CI](https://circleci.com/gh/higanworks/knife-zero/tree/integration_testedge.svg?style=svg)](https://circleci.com/gh/higanworks/knife-zero/tree/integration_testedge)
 
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/higanworks/knife-zero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -8,11 +9,11 @@
 [![Stories in Ready](https://badge.waffle.io/higanworks/knife-zero.svg?label=ready&title=Ready)](http://waffle.io/higanworks/knife-zero) 
 [![Stories in Progress](https://badge.waffle.io/higanworks/knife-zero.svg?label=In%20Progress&title=In%20Progress)](http://waffle.io/higanworks/knife-zero) 
 
-Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.
+Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port forwarding.
 
 - It doesn't have to transport cookbooks via scp,rsync or something.
 - It can collect node object into local chef-repo.
-- It supports all functioanly of chef(C/S).
+- It supports all functions of chef(C/S).
 - You have only to manage one chef-repo.
 
 ## Requirements
@@ -73,7 +74,7 @@ host.example.com Starting Chef Client, version 11.14.6
 host.example.com Creating a new client identity for host.example.com using the validator key.
 
 
-## Resolv and sync cookbook via http over ssh tcp-forward by run-list.
+## Resolve and sync cookbook via http over ssh tcp-forward by run-list.
 host.example.com resolving cookbooks for run list: ["hogehoge::default"]
 host.example.com Synchronizing Cookbooks:
 host.example.com   - hogehoge
@@ -105,7 +106,7 @@ Platform:    ubuntu 12.04
 Tags:        
 ```
 
-Seach and execute command via ssh by knife ssh.
+Search and execute command via ssh by knife ssh.
 
 ```
 $ knife ssh 'hostname:*' --local-mode uptime --attribute ipaddress 
@@ -181,7 +182,7 @@ host2.example.com Chef Client finished, 0/0 resources updated in 3.729471856 sec
 1. bundle init and add below.
     - `gem 'chef'  `
     - `gem 'knife-zero'`
-    - and cookbook management tool such as `Beakshelf` or `Librarian-Chef`.
+    - and cookbook management tool such as `Berkshelf` or `Librarian-Chef`.
 1. bundle   
 e.g.) `bundle install --path vendor/bundle --binstubs`
 1.  install cookbooks to `./cookbooks`. (if you need run recipe.)
@@ -197,7 +198,11 @@ See [Getting Started knife-zero with test-kitchen](https://github.com/higanworks
 
 ### Or, Try knife-zero simply with Vagrant.
 
-Set local_mode as default to `knfie.rb`.
+> **For Your Information** :  
+> If only you want to try `chef-zero` or `chef-client localmode` (For instance: migrate from chef-solo), You should use [chef-zero provisioner(Vagrant)](http://docs.vagrantup.com/v2/provisioning/chef_zero.html) with vagrant.
+> The knife-zero will provides similar usage with the chef-zero provisioner on vagrant, but for remote node.
+
+Set local_mode as default to `knife.rb`.
 
 ```
 $ echo 'local_mode true' >> knife.rb
@@ -343,9 +348,9 @@ $ knife zero chef_client "name:*" -x vagrant -i ./.vagrant/machines/default/virt
 192.168.33.10 resolving cookbooks for run list: []
 ```
 
-## Debug for Configration
+## Debug for Configuration
 
-`knife zero diagnose` shows configration from file(Such as knife.rb).
+`knife zero diagnose` shows configuration from file(Such as knife.rb).
 
 ```
 $ knife zero diagnose
@@ -355,10 +360,10 @@ Chef::Config
 ---
 :local_mode: true
 :verbosity: 
-:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound/knife.rb"
+:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground/knife.rb"
 :color: true
 :log_level: :error
-:chef_repo_path: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound"
+:chef_repo_path: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground"
 :log_location: !ruby/object:IO {}
 :chef_server_url: http://localhost:8889
 :repo_mode: everything
@@ -373,9 +378,9 @@ Knife::Config
 :format: summary
 :ssh_user: root
 :host_key_verify: true
-:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_plyglound/knife.rb"
+:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground/knife.rb"
 
-Zero Boostrap Config
+Zero Bootstrap Config
 ====================
 ---
 :ssh_user: root

data/circle.yml

@@ -2,6 +2,14 @@
 machine:
   ruby:
     version: 2.1.5
+  services:
+    - docker
 test:
   override:
     - bundle exec ruby test/run_test.rb -v
+deployment:
+  integration:
+    branch: integration_testedge
+    commands:
+      - docker build -t local/knife-zero .
+      - docker run -it local/knife-zero sh run.sh

data/integration_test/chef-repo/knife.rb

@@ -0,0 +1,2 @@
+local_mode true
+chef_repo_path "."

data/integration_test/chef-repo/run.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+/usr/sbin/sshd -E /tmp/log -o 'LogLevel DEBUG'
+knife zero diagnose
+knife zero bootstrap 127.0.0.1 -N zerohost -x docker -P docker --sudo -V
+knife node show zerohost
+knife zero chef_client "name:zerohost" -a ipaddress -x docker -P docker --sudo -V
+

data/integration_test/pre/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:15.04
+MAINTAINER sawanoboriyu@higanworks.com
+
+RUN apt-get -y update
+RUN apt-get -y install sudo git build-essential ruby2.1 ruby2.1-dev openssh-server wget vim net-tools
+
+
+RUN mkdir /var/run/sshd
+RUN useradd -p $(perl -e'print crypt("docker", "docker")') -m docker
+RUN echo '%docker ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/docker
+CMD ["/bin/true"]

data/lib/chef/knife/zero_base.rb

@@ -11,6 +11,7 @@ class Chef
             Chef::Knife::Ssh.load_deps
           end
 
+          ## Just ported from chef
           option :ssh_user,
             :short => "-x USERNAME",
             :long => "--ssh-user USERNAME",
@@ -51,6 +52,17 @@ class Chef
             :boolean => true,
             :default => true
 
+          option :use_sudo,
+            :long => "--sudo",
+            :description => "execute the chef-client via sudo",
+            :boolean => true
+
+          option :use_sudo_password,
+            :long => "--use-sudo-password",
+            :description => "Execute the bootstrap via sudo with password",
+            :boolean => false
+
+          ## Added by Knife-Zero
           option :why_run,
             :short        => '-W',
             :long         => '--why-run',

data/lib/chef/knife/zero_bootstrap.rb

@@ -14,6 +14,7 @@ class Chef
 
       banner "knife zero bootstrap FQDN (options)"
 
+      ## Just ported from chef bootstrap
       option :chef_node_name,
         :short => "-N NAME",
         :long => "--node-name NAME",
@@ -38,23 +39,19 @@ class Chef
         :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 }
 
-      ## Patched
+      # DEPR: Remove this option in Chef 13
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template",
         :default => "chef-full"
 
-      option :use_sudo,
-        :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 :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."
 
+      # DEPR: Remove this option in Chef 13
       option :template_file,
         :long => "--template-file TEMPLATE",
         :description => "Full path to location of template to use",
@@ -113,6 +110,28 @@ class Chef
         :description => "Add options to curl when install chef-client",
         :proc        => Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
 
+
+      ## experimental: vault support
+      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]
+        }
+
+
       def knife_ssh
         begin
         ssh = Chef::Knife::BootstrapSsh.new

data/lib/chef/knife/zero_chef_client.rb

@@ -27,11 +27,6 @@ class Chef
         :description => "The attribute to use for opening the connection - default depends on the context",
         :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key.strip }
 
-      option :use_sudo,
-        :long => "--sudo",
-        :description => "execute the chef-client via sudo",
-        :boolean => true
-
       option :override_runlist,
         :short        => "-o RunlistItem,RunlistItem...",
         :long         => "--override-runlist RunlistItem,RunlistItem...",

data/lib/chef/knife/zero_diagnose.rb

@@ -34,7 +34,7 @@ class Chef
         ui.msg config.to_yaml
         ui.msg ""
 
-        ui.msg "Zero Boostrap Config"
+        ui.msg "Zero Bootstrap Config"
         ui.msg "===================="
         bootstrap = Chef::Knife::ZeroBootstrap.new
         @bootstrap.merge_configs

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/test/chef/knife/test_zero_bootstrap.rb

@@ -22,7 +22,7 @@ class TC_ZeroBootstrap < Test::Unit::TestCase
       assert_kind_of(Chef::Knife::BootstrapSsh, ssh)
     end
 
-    sub_test_case "overwrite ssh_configration from ssh/config" do
+    sub_test_case "overwrite ssh_configuration from ssh/config" do
       test "overwrite port number" do
         stub(Net::SSH).configuration_for { {port: 10022} }
         ssh = @app.knife_ssh

data/test/knife-zero/core/test_bootstrap_context.rb

@@ -7,11 +7,11 @@ class TC_BootstrapContext < Test::Unit::TestCase
     app = Chef::Knife::ZeroBootstrap.new
     app.merge_configs
     @bsc = Chef::Knife::Core::BootstrapContext.new(app.config, [], Chef::Config.configuration)
-    stub(OpenSSL::PKey::RSA).new{"knfe-zerozero"}
+    stub(OpenSSL::PKey::RSA).new{"knife-zerozero"}
   end
 
   test "Should use aliased validation_key" do
-    assert_equal("knfe-zerozero", @bsc.validation_key)
+    assert_equal("knife-zerozero", @bsc.validation_key)
   end
 
   test "Should use aliased start_chef" do

data/test/knife-zero/core/test_zerohelper.rb

@@ -0,0 +1,43 @@
+require 'chef/knife/zero_base'
+require 'knife-zero/helper'
+
+class TC_ZeroHelper < Test::Unit::TestCase
+  def setup
+    @config = Chef::Config
+  end
+
+  test "Should returns 18889 as zero_remote_port by default" do
+    assert_equal(18889, ::Knife::Zero::Helper.zero_remote_port)
+  end
+
+  sub_test_case "override" do
+    test "Should returns 10000 + chef_zero_port as zero_remote_port" do
+      @config[:chef_zero_port] = 2500
+      assert_equal(12500, ::Knife::Zero::Helper.zero_remote_port)
+    end
+
+    test "Should returns 10000 + knife:chef_zero_port as zero_remote_port" do
+      @config[:knife][:chef_zero_port] = 2500
+      assert_equal(12500, ::Knife::Zero::Helper.zero_remote_port)
+    end
+
+    def teardown
+      @config[:chef_zero_port] = nil
+      @config[:knife][:chef_zero_port] = nil
+    end
+  end
+
+  sub_test_case "force set by remote_chef_zero_port" do
+
+    test "Should returns passed remote_chef_zero_port as zero_remote_port" do
+      @config[:remote_chef_zero_port] = 8888
+      @config[:chef_zero_port] = 2500
+      assert_equal(8888, ::Knife::Zero::Helper.zero_remote_port)
+    end
+
+    def teardown
+      @config[:remote_chef_zero_port] = nil
+      @config[:chef_zero_port] = nil
+    end
+  end
+end

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.4.0", Knife::Zero::VERSION)
+    assert_equal("1.5.0", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,12 +160,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - circle.yml
+- integration_test/chef-repo/knife.rb
+- integration_test/chef-repo/run.sh
+- integration_test/pre/Dockerfile
 - knife-zero.gemspec
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
@@ -179,6 +183,7 @@ files:
 - test/chef/knife/test_zero_bootstrap.rb
 - test/chef/knife/test_zero_chef_client.rb
 - test/knife-zero/core/test_bootstrap_context.rb
+- test/knife-zero/core/test_zerohelper.rb
 - test/knife-zero/test_bootstrap_ssh.rb
 - test/knife-zero/test_versioin.rb
 - test/run_test.rb
@@ -202,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
@@ -211,6 +216,7 @@ test_files:
 - test/chef/knife/test_zero_bootstrap.rb
 - test/chef/knife/test_zero_chef_client.rb
 - test/knife-zero/core/test_bootstrap_context.rb
+- test/knife-zero/core/test_zerohelper.rb
 - test/knife-zero/test_bootstrap_ssh.rb
 - test/knife-zero/test_versioin.rb
 - test/run_test.rb