knife-zero 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d05862dc7246e728f58b0bda336b60417415d10668a16fad81c7efc0ee5cd61
-  data.tar.gz: 87ba092f340f8ffcdd95202cfa217138cb9acd06ed31b7601ffc4151a835997c
+  metadata.gz: ec45a99b4e00747009e914be5be5e53ca9ee490bbb4213ae97a9da1a585f7e51
+  data.tar.gz: c3750a145a402bfe5eaa96bb5fc1d0fdbcddfa0fc087cfcf25f67d46815739fc
 SHA512:
-  metadata.gz: b5e198e21398ade07a5bef9d11381a4900d886078748d155fc90d262bc540b24453dcc4985afc4d0d51de6e9185bce5a7471dd0666b67d01768a8662ce38015f
-  data.tar.gz: 9b38e4d64ef1a2e85bba7535ac23be86e1e9d805d637cbbc4026d579dd5e3b103ac00a1320d7d2da99022081a637ceada9b476ff7260da47a4064fb7bce90308
+  metadata.gz: 12c381d16c23b23b83e7f3891d1d54e43205bdcbf034e675da43466a085999227c555b8bb76230363d3bf10490766046fd9523093faf0520fa080586447a1ba8
+  data.tar.gz: 6bd256d008478efec34fd27cb353fcd7712ffd2875d52875f1ef0b2944243aac31c8b7b490eb6a1cca702f02c4f2f5dc2119f4327b9dde324ddfe83ff654248d

data/CHANGELOG.md

@@ -4,9 +4,33 @@
 
 none.
 
+## v2.4.0
+
+- follow core changes.
+  - ssh_command changed at chef-17.3.27
+
+## v2.3.2
+
+- follow core changes, they uses autoload.
+  - .to_yaml not work in diagnose.
+
+## v2.3.1
+
+- bugfix: alter_project not works due to typo. HT: [@aspyatkin](https://github.com/aspyatkin)
+  - [https://github.com/higanworks/knife-zero/issues/133#issuecomment-674530243](https://github.com/higanworks/knife-zero/issues/133#issuecomment-674530243)
+
+## 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]
+- 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`.

data/README.md

@@ -1,6 +1,6 @@
 # Knife-Plugin 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)
+- current_main: [![Circle CI](https://circleci.com/gh/higanworks/knife-zero/tree/main.svg?style=svg)](https://circleci.com/gh/higanworks/knife-zero/tree/main)
 - 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%20Chat.svg)](https://gitter.im/higanworks/knife-zero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -17,7 +17,7 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 - [Knife-Zero Document](https://knife-zero.github.io)
 - [Knife-Zero Document(Ja)](https://knife-zero.github.io/ja/)
 
-- [CHANGELOG](https://github.com/higanworks/knife-zero/blob/master/CHANGELOG.md)
+- [CHANGELOG](https://github.com/higanworks/knife-zero/blob/main/CHANGELOG.md)
 
 ## Requirements
 

data/knife-zero.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit-rr'
 
   spec.add_runtime_dependency 'chef', '>= 15.0'
+  spec.add_runtime_dependency 'knife', '>= 17.0'
 end

data/lib/chef/knife/zero_base.rb

@@ -1,6 +1,7 @@
 require 'chef'
 require 'chef/knife/ssh'
 require 'chef/knife/bootstrap' unless Chef::Knife.const_defined?(:Bootstrap)
+require 'yaml'
 
 class Chef
   class Knife

data/lib/knife-zero/bootstrap_ssh.rb

@@ -1,4 +1,5 @@
 require 'chef/knife/ssh'
+require 'chef/version'
 
 class Chef
   class Knife
@@ -9,9 +10,10 @@ class Chef
         require 'knife-zero/helper'
       end
 
+    if Gem::Version.new(Chef::VERSION) < Gem::Version.new("17.3.27")
       def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         if config[:client_version]
-          case @config[:alter_project]
+          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
@@ -40,6 +42,40 @@ class Chef
         ui.error e.backtrace.join("\n")
         exit 1
       end
+    else
+      # def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
+      def ssh_command(command, session_list = session) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
+        if 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]
+          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
+        chef_zero_host = config[:chef_zero_host] ||
+                         Chef::Config[:knife][:chef_zero_host] ||
+                         '127.0.0.1'
+        session_list.servers.each do |server|
+          session = server.session(true)
+          session.forward.remote(chef_zero_port, chef_zero_host, ::Knife::Zero::Helper.zero_remote_port)
+        end
+        super
+      rescue => e # rubocop:disable Style/RescueStandardError
+        ui.error(e.class.to_s + e.message)
+        ui.error e.backtrace.join("\n")
+        exit 1
+      end
+    end
 
       def build_client_json
         <<-SCRIPT

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]
@@ -55,6 +58,7 @@ class Chef
                 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/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.2.0'.freeze
+    VERSION = '2.4.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.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - sawanoboly
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '15.0'
+- !ruby/object:Gem::Dependency
+  name: knife
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
 description: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
   SSH port fowarding.
 email:
@@ -177,7 +191,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 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
   port fowarding.