knife-zero 2.4.2 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149fbd77f85c915b104af952516f476d0b9028443b00431074617990ccb600ed
-  data.tar.gz: 8091b146b95a0a20d7eaf4d7c285a16e047e11f3cfaa29fb90bb15587d515768
+  metadata.gz: 8fb07f8728ae47371ac3795b1e182eaab2b3a5ca1e53df80ebea651001bc93ea
+  data.tar.gz: 11bae6be9723526492427bdf3b7afe06bc830c1d1965f8c5e6ee5fea686447be
 SHA512:
-  metadata.gz: 1703b839e001a71f139bf04737e02d49e0138428929cb2cfc646ae4e118c7d261f09708c0a4e379ae73a609308e3dcf48181f393df7de671d4640f9d7e13730c
-  data.tar.gz: 7943c7cc3efb38358b644e538230dcc6b9fc413cd296bcaaad37b4f48eb2c351eb964cde599e3246705a94e3ba7687a35eb487744dc6739d24e7bc57f64013c2
+  metadata.gz: 9233512a5e8ec475c118ae1fa597a88c7ab7dbba8d4a81d86fd935a45e3825484efa7cbb11c022881e9e50c338827b61f46fd0987084251055256a9a416b4309
+  data.tar.gz: bbedbc39c32c56eab47eb518e3e61f2c97ef66b37656be0009423eee4bc04ea0c814ba02638fe14cf90f71ea08d4b15d3d7533b096131199b444583c76fceaba

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 ## Unreleased
 
 none.
+
+## v2.5.1
+
+- Put some more Chefutils constants [#169](https://github.com/higanworks/knife-zero/pull/169) HT [@Spirtulus](https://github.com/Spirtulus)
+
+## v2.5.0
+
+- CINC client bootstrap fix [#168](https://github.com/higanworks/knife-zero/pull/168) HT [@Spirtulus](https://github.com/Spirtulus)
+- drop support chef-client < 16.6
+
 ## v2.4.2
 
 - compatibility: Check knife version instead of chef version before overriding knife method [#162](https://github.com/higanworks/knife-zero/pull/162) HT [@cgunther](https://github.com/cgunther)

data/knife-zero.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit-notify'
   spec.add_development_dependency 'test-unit-rr'
 
-  spec.add_runtime_dependency 'chef', '>= 15.0'
+  spec.add_runtime_dependency 'chef', '>= 16.6'
   spec.add_runtime_dependency 'knife', '>= 17.0'
 end

data/lib/chef/knife/zero_base.rb

@@ -41,7 +41,7 @@ class Chef
                  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'
+                 default: '/etc/' + ChefUtils::Dist::Infra::DIR_SUFFIX + '/client.rb'
         end
       end
 

data/lib/chef/knife/zero_converge.rb

@@ -111,12 +111,12 @@ class Chef
 
       def start_chef_client # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
-        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
+        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}#{ChefUtils::Dist::Infra::CLIENT}"
         s = String.new(client_path)
         s << ' -l debug' if @config[:verbosity] && @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 << ' -j /etc/' + ChefUtils::Dist::Infra::DIR_SUFFIX + '/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]}"

data/lib/knife-zero/bootstrap_ssh.rb

@@ -78,7 +78,7 @@ class Chef
 
       def build_client_json
         <<-SCRIPT
-        sudo sh -c 'cat <<"EOP" > /etc/chef/chef_client_json.json
+        sudo sh -c 'cat <<"EOP" > /etc/#{ChefUtils::Dist::Infra::DIR_SUFFIX}/chef_client_json.json
         #{config[:chef_client_json].to_json}
         '
         SCRIPT

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

@@ -52,8 +52,8 @@ class Chef
           def start_chef # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
             if @chef_config[:knife_zero]
               if @config[:bootstrap_converge]
-                client_path = @chef_config[:chef_client_path] || 'chef-client'
-                s = String.new("#{client_path} -j /etc/chef/first-boot.json")
+                client_path = @chef_config[:chef_client_path] || ChefUtils::Dist::Infra::CLIENT
+                s = String.new("#{client_path} -j /etc/" + ChefUtils::Dist::Infra::DIR_SUFFIX + "/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?

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.4.2'.freeze
+    VERSION = '2.5.1'.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.4.2
+  version: 2.5.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.6'
 - !ruby/object:Gem::Dependency
   name: knife
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH