knife-zero 2.0.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6637438abccde5c8a7cf8e0e4eb815cf0c6b21e2057d43a744bb97cc6f3478b
-  data.tar.gz: 0d0602230673673d135fad5b5b10ae95fd174ff383b03e76cb3d3eb97740ecd0
+  metadata.gz: ac67b410005680ab38ee1746311ffb1ba52909983081436b720fd957f6e75564
+  data.tar.gz: cdb89df6d2e69fed589df841cebd9701afda1d4875ee18d83d462a7eaa46f486
 SHA512:
-  metadata.gz: 1ded3b80a019d2beae3d626f79d5354caafb4f525fcc4b4a24e4bd9ee642134001314b871a936dc12354d0bda911c19f3701a0804a1d2c6978f8e9abdffa4510
-  data.tar.gz: f1e6b656bf6e8de0f84299bb225c4ef2996a423fbe54038314c83a4263100c2aba3a7b6e78a476e28ee7cd7f68f49e438d61b2607eeccd80ab4955f547908179
+  metadata.gz: d0fa31dcf279e4db60b673cb4970eb7f14c67b92af10ed46a7bd99f71c2a37c0d87c4f905f459abdee5cda49fa5671128d98f5aec2299679a258cf1eb2d014d8
+  data.tar.gz: 37f2d61abb130e6fe1273fbc1150b5021bd0895c9bff33f4ed5d82d5f832b08263213e1225a6a52600b2bd488b66c0ac39fa9d70a1d600c1973e221edee756c5

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## Unreleased
 
+none.
+
+## v2.3.0
+
+- use `allowd_` instead.
+- ref: [Renamed Client Configuration Options - Chef Infra Client 16.3 released!](https://discourse.chef.io/t/chef-infra-client-16-3-released/17449)
+
+## v2.2.1
+
+- path --validation_key option to resolve crash bootstraping in cinc 15.6 [#138](https://github.com/higanworks/knife-zero/pull/138)
+
+## v2.2.0
+
+- add `--alter-project` to support cinc [#133](https://github.com/higanworks/knife-zero/pull/133)
+  - allowed values: 'chef' or 'cinc'
+  - in config => `knife[:alter_project]`
+- relocate `--node-config` option from `zero converge` to both `zero converge` and `zero bootstrap`.
+- remove `-N` for `--node-config` short option.
+  - (Duplicate with NAME option)
+
+## v2.1.0
+
+- Allow pass run-list and environments from json-attributes.
+  - Related:Split run list and attributes from nodes [#132](https://github.com/higanworks/knife-zero/issues/132)
+
+## v2.0.4
+
+- bugfix: Crash around the end of a concurrent connection [#131](https://github.com/higanworks/knife-zero/pull/131)
+
+
 ## v2.0.3
 
 - Properly quoted policy name [#129](https://github.com/higanworks/knife-zero/pull/129) HT: [@etki](https://github.com/etki)

data/README.md

@@ -50,7 +50,7 @@ knife zero diagnose # show configuration from file
 
 ### Configuration file
 
-Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
+Relocated: [Configuration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
 
 ### knife zero bootstrap | converge | diagnose
 
@@ -60,9 +60,9 @@ Relocated
 - [Subcommands | Knife-Zero Document](http://knife-zero.github.io/30_subcommands/)
 
 
-#### (Hint)Supress Automatic Attributes
+#### (Hint)Suppress Automatic Attributes
 
-Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configration/)
+Relocated: [Configuration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
 
 
 ## To include from other knife plugins

data/lib/chef/knife/zero_base.rb

@@ -28,6 +28,19 @@ class Chef
                  description: 'Listen port on remote',
                  default: nil,
                  proc: proc { |key| Chef::Config[:remote_chef_zero_port] = key.to_i }
+
+          option :alter_project,
+                 long: '--alter-project PROJECT',
+                 proc: proc { |u| Chef::Config[:alter_project] = u },
+                 description: 'Products used on remote nodes',
+                 default: 'chef',
+                 in: %w{chef cinc}
+
+          option :node_config_file,
+                 long: '--node-config PATH_TO_CONFIG',
+                 proc: proc { |u| Chef::Config[:node_config_file] = u },
+                 description: 'The configuration file to use on remote node',
+                 default: '/etc/chef/client.rb'
         end
       end
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -54,6 +54,11 @@ class Chef
           )
         end
 
+        case @config[:alter_project]
+        when 'cinc'
+          Chef::Config[:knife][:bootstrap_url] = 'https://omnitruck.cinc.sh/install.sh'
+        end
+
         if @config[:bootstrap_converge]
           unless @config[:overwrite_node_object]
             q = Chef::Search::Query.new

data/lib/chef/knife/zero_converge.rb

@@ -36,11 +36,6 @@ class Chef
         self.options[:skip_cookbook_sync] = Chef::Application::Client.options[:skip_cookbook_sync]
       end
 
-      option :node_config_file,
-             short: '-N PATH_TO_CONFIG',
-             long: '--node-config PATH_TO_CONFIG',
-             description: 'The configuration file to use on remote node'
-
       option :splay,
              long: '--splay SECONDS',
              description: 'The splay time for running at intervals, in seconds',
@@ -105,11 +100,12 @@ class Chef
           ::Knife::Zero::Helper.hook_shell_out!('before_converge', ui, Chef::Config[:knife][:before_converge])
         end
 
-        validate_options!
         if @config[:json_attribs]
           @config[:chef_client_json] = fetch_json_from_url
         end
 
+        validate_options!
+
         @name_args = [@name_args[0], start_chef_client]
       end
 
@@ -123,7 +119,7 @@ class Chef
         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 << " --config #{@config[:node_config_file]}" if @config[:node_config_file]
+        s << " --config #{@config[:node_config_file]}"
         s << ' --skip-cookbook-sync' if @config[:skip_cookbook_sync]
         s << ' --no-color' unless @config[:color]
         s << " -E #{@config[:environment]}" if @config[:environment]
@@ -142,7 +138,8 @@ class Chef
         if json_attribs_without_override_given?
           ui.error(
             '--json-attributes must be used with --override-runlist ' \
-            'to avoid updating local node object.'
+            'or passed json should includes key `run-list` ' \
+            'to avoid unexpected updating local node object.'
           )
           exit 1
         end
@@ -155,7 +152,7 @@ class Chef
       end
 
       def override_runlist_given?
-        !config[:override_runlist].nil? && !config[:override_runlist].empty?
+        !config[:override_runlist].nil? && !config[:override_runlist].empty? || @config[:chef_client_json]&.key?('run_list')
       end
 
       def named_run_list_given?

data/lib/knife-zero/bootstrap_ssh.rb

@@ -11,7 +11,12 @@ class Chef
 
       def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         if config[:client_version]
-          super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          case @config[:alter_project]
+          when 'cinc'
+            super(%{/opt/cinc/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.cinc.sh/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          else
+            super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/chef/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          end
         end
 
         if config[:json_attribs]

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

@@ -18,16 +18,19 @@ class Chef
           alias_method :orig_config_content, :config_content
           def config_content # rubocop:disable Metrics/AbcSize
             client_rb = orig_config_content
-            white_lists = []
-            %w{automatic_attribute_whitelist default_attribute_whitelist normal_attribute_whitelist override_attribute_whitelist}.each do |white_list|
-              next unless Chef::Config[:knife][white_list.to_sym]&.is_a?(Array)
+            allowed_lists = []
+            %w{
+              automatic_attribute_whitelist default_attribute_whitelist normal_attribute_whitelist override_attribute_whitelist
+              allowed_automatic_attributes allowed_default_attributes allowed_normal_attributes allowed_override_attributes
+            }.each do |allowed_list|
+              next unless Chef::Config[:knife][allowed_list.to_sym]&.is_a?(Array)
 
-              white_lists.push([
-                white_list,
-                Chef::Config[:knife][white_list.to_sym].to_s
+              allowed_lists.push([
+                allowed_list,
+                Chef::Config[:knife][allowed_list.to_sym].to_s
               ].join(' '))
             end
-            client_rb << white_lists.join("\n")
+            client_rb << allowed_lists.join("\n")
 
             ## For support policy_document_native_api
             if @config[:policy_name]
@@ -52,8 +55,10 @@ class Chef
                 client_path = @chef_config[:chef_client_path] || 'chef-client'
                 s = String.new("#{client_path} -j /etc/chef/first-boot.json")
                 s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
+                s << " --config #{@config[:node_config_file]}"
                 s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
                 s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
+                s << " -K #{[::File.dirname(@config[:node_config_file]), 'validation.pem'].join('/')}"
                 s << ' -W' if @config[:why_run]
                 Chef::Log.info 'Remote command: ' + s
                 s

data/lib/knife-zero/net_ssh_multi_patch.rb

@@ -86,6 +86,8 @@ module Net::SSH::Multi
 
       ## >> Patch
       def keepalive_if_needed(readers, writers)
+        return unless session
+
         listeners = session.listeners.keys
         readers = readers || []
         writers = writers || []

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.0.3'.freeze
+    VERSION = '2.3.0'.freeze
     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: 2.0.3
+  version: 2.3.0
 platform: ruby
 authors:
 - sawanoboly
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,7 +177,7 @@ homepage: http://knife-zero.github.io
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,9 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
   port fowarding.