knife-zero 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62b7b04af9df122f587f761f40f5b648a1302561c441545b3655cb7ae350d93
-  data.tar.gz: 3afcb78f362a483216f9a19239c03ab3f36c482d9423d7d4277dc92fec7470ad
+  metadata.gz: ec45a99b4e00747009e914be5be5e53ca9ee490bbb4213ae97a9da1a585f7e51
+  data.tar.gz: c3750a145a402bfe5eaa96bb5fc1d0fdbcddfa0fc087cfcf25f67d46815739fc
 SHA512:
-  metadata.gz: 697c2636b742cb7256043904704fa139748cc881bbce0f96e9ecd443d468ac41bddd5a91175cf364f883f245a3d1012725d669f2f4c1f29afc71fa90621b5148
-  data.tar.gz: '0089e7a25b9ef24f9f00b16ca3c16a40fc773e9efb9a9b0ee0435b8ef3685560636acb69856bba160ea6daef25157f63d1dc17003208bf8003174b90b24b0b37'
+  metadata.gz: 12c381d16c23b23b83e7f3891d1d54e43205bdcbf034e675da43466a085999227c555b8bb76230363d3bf10490766046fd9523093faf0520fa080586447a1ba8
+  data.tar.gz: 6bd256d008478efec34fd27cb353fcd7712ffd2875d52875f1ef0b2944243aac31c8b7b490eb6a1cca702f02c4f2f5dc2119f4327b9dde324ddfe83ff654248d

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 none.
 
+## v2.4.0
+
+- follow core changes.
+  - ssh_command changed at chef-17.3.27
+
 ## v2.3.2
 
 - follow core changes, they uses autoload.

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/knife-zero/bootstrap_ssh.rb

@@ -1,4 +1,5 @@
 require 'chef/knife/ssh'
+require 'chef/version'
 
 class Chef
   class Knife
@@ -9,6 +10,7 @@ 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]
@@ -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/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.3.2'.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.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-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:
@@ -192,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+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