knife-zero 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e729fe2878ec1d2a13f131c08c241a570557bcfa
-  data.tar.gz: fc5e3e2e48959607b9b92fafc25d4fe5013af357
+  metadata.gz: 8a52879c7b2312b6a05e46f044746eed637e2070
+  data.tar.gz: 3125584c73940e7a77afc98f8ec48122e2cb1c06
 SHA512:
-  metadata.gz: 58de913724633bc5ccfa587bc683f724071945b79f6cad52b6f5d6346c16ad0cd2e77c4638ea0817ddf3d6faa04f5f6b12889ba4e69d89608038d9416b99a248
-  data.tar.gz: 88c189a807cfcefb3fddd68363a2f00290c9040070cce47f2194e2ff5355fc196dba363feae603d89e27f457385887fd6f241702f0ef4f89f44e536686bf30c0
+  metadata.gz: 767c923ddd0b2f41f69be5bd28cbf81d958de19cea129db796613f0d251da777b940a48458fd6d50e2d7f8e88c71dfafc73a761bd29208446532a6aaa5aa8d4f
+  data.tar.gz: dcf59ee8ac62dfd553adcdd07a04b3c5a06393d3c43a48298157ca2bf75865feaacd3f2146bb077dc071feb062008a49dfba78c26716730add01dc8f32b6cddc

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unrelesed
 
+## v1.3.0
+
+- return dummy key to validation.
+- remove bootstrap template chef-full-localmode. use chef-full by default.
+- create around alias for validation_key and start_chef to bootstrap_context.
+- set true to Chef::Config[:knife_zero] for bootstrap_context.
+
 ## v1.2.1
 
 - set rescue for debug during ssh session.

data/lib/chef/knife/zero_base.rb

@@ -7,6 +7,7 @@ class Chef
         includer.class_eval do
           deps do
             Chef::Config[:local_mode] = true
+            Chef::Config[:knife_zero] = true
             Chef::Knife::Ssh.load_deps
           end
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -43,7 +43,7 @@ class Chef
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template",
-        :default => "chef-full-localmode"
+        :default => "chef-full"
 
       option :use_sudo,
         :long => "--sudo",

data/lib/knife-zero/core/bootstrap_context.rb

@@ -5,14 +5,28 @@ class Chef
     module Core
       class BootstrapContext
          class_eval do
-           def start_chef_local
-             client_path = @chef_config[:chef_client_path] || 'chef-client'
-             s = "#{client_path} -j /etc/chef/first-boot.json"
-             s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
-             s << " -E #{bootstrap_environment}" if ::Chef::VERSION.to_f != 0.9 # only use the -E option on Chef 0.10+
-             s << " -S http://127.0.0.1:#{URI.parse(Chef::Config.chef_server_url).port}"
-             s << " -W" if @config[:why_run]
-             s
+           alias :orig_validation_key validation_key
+           def validation_key
+             if @chef_config[:knife_zero]
+               OpenSSL::PKey::RSA.new(2048).to_s
+             else
+               orig_validation_key
+             end
+           end
+
+           alias :orig_start_chef start_chef
+           def start_chef
+             if @chef_config[:knife_zero]
+               client_path = @chef_config[:chef_client_path] || 'chef-client'
+               s = "#{client_path} -j /etc/chef/first-boot.json"
+               s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
+               s << " -E #{bootstrap_environment}" if ::Chef::VERSION.to_f != 0.9 # only use the -E option on Chef 0.10+
+               s << " -S http://127.0.0.1:#{URI.parse(Chef::Config.chef_server_url).port}"
+               s << " -W" if @config[:why_run]
+               s
+             else
+               orig_start_chef
+             end
            end
          end
       end

data/lib/knife-zero/version.rb

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

data/test/chef/knife/test_zero_bootstrap.rb

@@ -9,8 +9,12 @@ class TC_ZeroBootstrap < Test::Unit::TestCase
       Chef::Knife::ZeroBootstrap.load_deps
     end
 
+    test "returns true from Chef::Config[:knife_zero]" do
+      assert_true(Chef::Config[:knife_zero])
+    end
+
     test "returns changed value from core" do
-      assert_equal("chef-full-localmode", @app.config[:distro])
+      assert_equal("chef-full", @app.config[:distro])
     end
 
     test "returns BootstrapSsh via knife_ssh" do

data/test/chef/knife/test_zero_chef_client.rb

@@ -6,6 +6,10 @@ class TC_ZeroChefClient < Test::Unit::TestCase
       @app.merge_configs
     end
 
+    test "returns true from Chef::Config[:knife_zero]" do
+      assert(Chef::Config[:knife_zero])
+    end
+
     test "returns changed value from core" do
       assert_nil(@app.config[:concurrency])
       assert_nil(@app.config[:override_runlist])

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

@@ -0,0 +1,20 @@
+require 'chef/knife/zero_chef_client'
+require 'knife-zero/core/bootstrap_context'
+
+class TC_BootstrapContext < Test::Unit::TestCase
+  def setup
+    Chef::Config[:validation_key] = nil
+    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"}
+  end
+
+  test "Should use aliased validation_key" do
+    assert_equal("knfe-zerozero", @bsc.validation_key)
+  end
+
+  test "Should use aliased start_chef" do
+    assert_match('-S http://127.0.0.1', @bsc.start_chef)
+  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.2.0", Knife::Zero::VERSION)
+    assert_equal("1.3.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.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,6 @@ files:
 - Rakefile
 - circle.yml
 - knife-zero.gemspec
-- lib/chef/knife/bootstrap/chef-full-localmode.erb
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/chef/knife/zero_chef_client.rb
@@ -179,6 +178,7 @@ files:
 - lib/knife-zero/version.rb
 - 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/test_bootstrap_ssh.rb
 - test/knife-zero/test_versioin.rb
 - test/run_test.rb
@@ -210,6 +210,7 @@ summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
 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/test_bootstrap_ssh.rb
 - test/knife-zero/test_versioin.rb
 - test/run_test.rb

data/lib/chef/knife/bootstrap/chef-full-localmode.erb

@@ -1,74 +0,0 @@
-bash -c '
-<%= "export https_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
-
-distro=`uname -s`
-
-if test "x$distro" = "xSunOS"; then
-  if test -d "/usr/sfw/bin"; then
-    PATH=/usr/sfw/bin:$PATH
-    export PATH
-  fi
-fi
-
-exists() {
-  if command -v $1 &>/dev/null
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
-<% if knife_config[:bootstrap_install_command] %>
-  <%= knife_config[:bootstrap_install_command] %>
-<% else %>
-  install_sh="<%= knife_config[:bootstrap_url] ? knife_config[:bootstrap_url] : "https://www.chef.io/chef/install.sh" %>"
-  if ! exists /usr/bin/chef-client; then
-    echo "Installing Chef Client..."
-    if exists wget; then
-      bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_wget_options] %> ${install_sh} -O -) <%= latest_current_chef_version_string %>
-    elif exists curl; then
-      bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_curl_options] %> ${install_sh}) <%= latest_current_chef_version_string %>
-    else
-      echo "Neither wget nor curl found. Please install one and try again." >&2
-      exit 1
-    fi
-  fi
-<% end %>
-
-mkdir -p /etc/chef
-
-cat > /etc/chef/validation.pem <<'EOP'
-<%= OpenSSL::PKey::RSA.new 2048 %>
-EOP
-chmod 0600 /etc/chef/validation.pem
-
-<% if encrypted_data_bag_secret -%>
-cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
-<%= encrypted_data_bag_secret %>
-EOP
-chmod 0600 /etc/chef/encrypted_data_bag_secret
-<% end -%>
-
-<%# Generate Ohai Hints -%>
-<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
-mkdir -p /etc/chef/ohai/hints
-
-<% @chef_config[:knife][:hints].each do |name, hash| -%>
-cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
-EOP
-<% end -%>
-<% end -%>
-
-cat > /etc/chef/client.rb <<'EOP'
-<%= config_content %>
-EOP
-
-cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
-EOP
-
-echo "Starting first Chef Client run..."
-
-<%= start_chef_local %>'