knife-zero 1.15.3 → 1.16.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f101736fd4259132c3bc58de4ebc0242cf4384f3
-  data.tar.gz: 4c792fe31836a9bd6ae261247ff64fa21949ec9a
+  metadata.gz: 9dc4464b0ebe5babb1012fec6d849b0fbc3d9b08
+  data.tar.gz: 258b4f0893a60245da187c947184bbe756efc544
 SHA512:
-  metadata.gz: 3c239c00cf00bc9061238c8f6cfcc566f16a91c753c36bc92d056f557159c1904ba63ab05d8b54e7b473aafa65749dc515f72e569d50173dea3d5b88ee245fb4
-  data.tar.gz: 12518b6fe5f43e0f850d9c78f94c7dfa2cc4d265a5273717a781da037b01b3bb30f6de23f3548fec4da58d6ebf8d840a1ece868233f77984c4672feb6ed0f98d
+  metadata.gz: 34d76dffa90a49468451c030034867b8e449c104decb81e607222a3060f95e5de81e3fcccb0381ac3ae536b12c695486077f01879de39b7e756b3fb74538ef53
+  data.tar.gz: 671cc93e8c418609c8bece5b647283cc60f8a449d81ea2fbe5c3fd11de3f17b07ba7962f8a16990c06988e88ad7a71fb47f3ed03402ae9b2c290ea55c9d9e31b

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## Unreleased
 
 Empty.
+
+## v1.16.0.pre~
+
+- [Feature] converge with `--json-attributes` #98
+
 ## v1.15.3
 
 - [Bugfix] move overridden options of bootstrap into deps.

data/lib/chef/knife/zero_converge.rb

@@ -1,6 +1,7 @@
 require 'chef/knife'
 require 'chef/knife/zero_base'
 require 'chef/application/client'
+require 'chef/config_fetcher'
 require 'knife-zero/bootstrap_ssh'
 require 'knife-zero/helper'
 
@@ -20,7 +21,9 @@ class Chef
       self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
 
       ## Import Features from chef-client
-      ## > 12.5.1
+      self.options[:json_attribs] = Chef::Application::Client.options[:json_attribs]
+
+      ### > 12.5.1
       self.options[:named_run_list] = Chef::Application::Client.options[:named_run_list]
 
       if ::Knife::Zero::Helper.required_chef_version?('12.8.1')
@@ -70,6 +73,9 @@ class Chef
         end
 
         validate_options!
+        if @config[:json_attribs]
+          @config[:chef_client_json] = fetch_json_from_url
+        end
 
         @name_args = [@name_args[0], start_chef_client]
       end
@@ -81,6 +87,7 @@ class Chef
         s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
         s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
         s << " -o #{@config[:override_runlist]}" if @config[:override_runlist]
+        s << ' -j /etc/chef/chef_client_json.json' if @config[:json_attribs]
         s << " --splay #{@config[:splay]}" if @config[:splay]
         s << " -n #{@config[:named_run_list]}" if @config[:named_run_list]
         s << " --skip-cookbook-sync" if @config[:skip_cookbook_sync]
@@ -95,6 +102,13 @@ class Chef
           ui.error("--override_runlist and --named_run_list are exclusive")
           exit 1
         end
+        if json_attribs_without_override_given?
+          ui.error(
+            '--json-attributes must be used with --override-runlist ' \
+            'to avoid updating local node object.'
+          )
+          exit 1
+        end
         true
       end
       # True if policy_name and run_list are both given
@@ -103,13 +117,30 @@ class Chef
       end
 
       def override_runlist_given?
-        !config[:run_list].nil? && !config[:run_list].empty?
+        !config[:override_runlist].nil? && !config[:override_runlist].empty?
       end
 
       def named_run_list_given?
-        !config[:run_list].nil? && !config[:run_list].empty?
+        !config[:named_run_list].nil? && !config[:named_run_list].empty?
+      end
+
+      def json_attribs_without_override_given?
+        if json_attribs_given?
+          return true unless override_runlist_given?
+        else
+          false
+        end
+        false
       end
 
+      def json_attribs_given?
+        !config[:json_attribs].nil? && !config[:json_attribs].empty?
+      end
+
+      def fetch_json_from_url
+        config_fetcher = Chef::ConfigFetcher.new(@config[:json_attribs])
+        config_fetcher.fetch_json
+      end
     end
   end
 end

data/lib/knife-zero/bootstrap_ssh.rb

@@ -16,6 +16,11 @@ class Chef
           super(%Q{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://chef.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
         end
 
+        if config[:json_attribs]
+          Chef::Log.info "Onetime Attributes: #{config[:chef_client_json]}"
+          super(build_client_json)
+        end
+
         chef_zero_port = config[:chef_zero_port] ||
                          Chef::Config[:knife][:chef_zero_port] ||
                          URI.parse(Chef::Config.chef_server_url).port
@@ -33,6 +38,14 @@ class Chef
           exit 1
         end
       end
+
+      def build_client_json
+        <<-EOH
+        sudo sh -c 'cat <<"EOP" > /etc/chef/chef_client_json.json
+        #{config[:chef_client_json].to_json}
+        '
+        EOH
+      end
     end
   end
 end

data/lib/knife-zero/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.16.0.pre1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,9 +187,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.4.8