knife-zero 2.3.0 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +15 -0
  3. data/README.md +2 -2
  4. data/knife-zero.gemspec +1 -0
  5. data/lib/chef/knife/zero_base.rb +1 -0
  6. data/lib/chef/knife/zero_bootstrap.rb +1 -1
  7. data/lib/knife-zero/bootstrap_ssh.rb +36 -1
  8. data/lib/knife-zero/version.rb +1 -1
  9. metadata +17 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ac67b410005680ab38ee1746311ffb1ba52909983081436b720fd957f6e75564
4
- data.tar.gz: cdb89df6d2e69fed589df841cebd9701afda1d4875ee18d83d462a7eaa46f486
3
+ metadata.gz: ceb90219e7049a7d2dd1d168fb5ff0f3860d897345069f066d89446969e505e8
4
+ data.tar.gz: afa5bfd790797872bb3c7d0a8d489404323e33ddabfb02ec9fd6acd4f8dd156d
5
5
  SHA512:
6
- metadata.gz: d0fa31dcf279e4db60b673cb4970eb7f14c67b92af10ed46a7bd99f71c2a37c0d87c4f905f459abdee5cda49fa5671128d98f5aec2299679a258cf1eb2d014d8
7
- data.tar.gz: 37f2d61abb130e6fe1273fbc1150b5021bd0895c9bff33f4ed5d82d5f832b08263213e1225a6a52600b2bd488b66c0ac39fa9d70a1d600c1973e221edee756c5
6
+ metadata.gz: e7572d96c52138a67d0615c6bb9f21021a14b173a5a66d76464ae89b5c4cd116e5695fd50e837c0909534633f49aacb7617b14250839fd7e7db69d674867439e
7
+ data.tar.gz: 007a81e48624135cdb6c35e96ae6a661a10fa3554e0664e8c0bb517e729d8653c32368dcf9be91b3750d7953321d5bd5f31046fc882f5009dba321400907a0a1
data/CHANGELOG.md CHANGED
@@ -4,6 +4,21 @@
4
4
 
5
5
  none.
6
6
 
7
+ ## v2.4.0
8
+
9
+ - follow core changes.
10
+ - ssh_command changed at chef-17.3.27
11
+
12
+ ## v2.3.2
13
+
14
+ - follow core changes, they uses autoload.
15
+ - .to_yaml not work in diagnose.
16
+
17
+ ## v2.3.1
18
+
19
+ - bugfix: alter_project not works due to typo. HT: [@aspyatkin](https://github.com/aspyatkin)
20
+ - [https://github.com/higanworks/knife-zero/issues/133#issuecomment-674530243](https://github.com/higanworks/knife-zero/issues/133#issuecomment-674530243)
21
+
7
22
  ## v2.3.0
8
23
 
9
24
  - use `allowd_` instead.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Knife-Plugin Zero
2
2
 
3
- - 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)
3
+ - 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)
4
4
  - 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)
5
5
 
6
6
  [![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
17
17
  - [Knife-Zero Document](https://knife-zero.github.io)
18
18
  - [Knife-Zero Document(Ja)](https://knife-zero.github.io/ja/)
19
19
 
20
- - [CHANGELOG](https://github.com/higanworks/knife-zero/blob/master/CHANGELOG.md)
20
+ - [CHANGELOG](https://github.com/higanworks/knife-zero/blob/main/CHANGELOG.md)
21
21
 
22
22
  ## Requirements
23
23
 
data/knife-zero.gemspec CHANGED
@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
29
29
  spec.add_development_dependency 'test-unit-rr'
30
30
 
31
31
  spec.add_runtime_dependency 'chef', '>= 15.0'
32
+ spec.add_runtime_dependency 'knife', '>= 17.0'
32
33
  end
data/lib/chef/knife/zero_base.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'chef'
2
2
  require 'chef/knife/ssh'
3
3
  require 'chef/knife/bootstrap' unless Chef::Knife.const_defined?(:Bootstrap)
4
+ require 'yaml'
4
5
 
5
6
  class Chef
6
7
  class Knife
data/lib/chef/knife/zero_bootstrap.rb CHANGED
@@ -56,7 +56,7 @@ class Chef
56
56
 
57
57
  case @config[:alter_project]
58
58
  when 'cinc'
59
- Chef::Config[:knife][:bootstrap_url] = 'https://omnitruck.cinc.sh/install.sh'
59
+ @config[:bootstrap_url] = 'https://omnitruck.cinc.sh/install.sh'
60
60
  end
61
61
 
62
62
  if @config[:bootstrap_converge]
data/lib/knife-zero/bootstrap_ssh.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'chef/knife/ssh'
2
+ require 'chef/version'
2
3
 
3
4
  class Chef
4
5
  class Knife
@@ -9,9 +10,10 @@ class Chef
9
10
  require 'knife-zero/helper'
10
11
  end
11
12
 
13
+ if Gem::Version.new(Chef::VERSION) < Gem::Version.new("17.3.27")
12
14
  def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
13
15
  if config[:client_version]
14
- case @config[:alter_project]
16
+ case config[:alter_project]
15
17
  when 'cinc'
16
18
  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]}})
17
19
  else
@@ -40,6 +42,39 @@ class Chef
40
42
  ui.error e.backtrace.join("\n")
41
43
  exit 1
42
44
  end
45
+ else
46
+ def ssh_command(command, session_list = session) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
47
+ if config[:client_version]
48
+ case config[:alter_project]
49
+ when 'cinc'
50
+ 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]}})
51
+ else
52
+ 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]}})
53
+ end
54
+ end
55
+
56
+ if config[:json_attribs]
57
+ Chef::Log.info "Onetime Attributes: #{config[:chef_client_json]}"
58
+ super(build_client_json)
59
+ end
60
+
61
+ chef_zero_port = config[:chef_zero_port] ||
62
+ Chef::Config[:knife][:chef_zero_port] ||
63
+ URI.parse(Chef::Config.chef_server_url).port
64
+ chef_zero_host = config[:chef_zero_host] ||
65
+ Chef::Config[:knife][:chef_zero_host] ||
66
+ '127.0.0.1'
67
+ session_list.servers.each do |server|
68
+ session = server.session(true)
69
+ session.forward.remote(chef_zero_port, chef_zero_host, ::Knife::Zero::Helper.zero_remote_port)
70
+ end
71
+ super
72
+ rescue => e # rubocop:disable Style/RescueStandardError
73
+ ui.error(e.class.to_s + e.message)
74
+ ui.error e.backtrace.join("\n")
75
+ exit 1
76
+ end
77
+ end
43
78
 
44
79
  def build_client_json
45
80
  <<-SCRIPT
data/lib/knife-zero/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Zero
3
- VERSION = '2.3.0'.freeze
3
+ VERSION = '2.4.1'.freeze
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-zero
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - sawanoboly
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-05 00:00:00.000000000 Z
11
+ date: 2021-09-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -150,6 +150,20 @@ dependencies:
150
150
  - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '15.0'
153
+ - !ruby/object:Gem::Dependency
154
+ name: knife
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ version: '17.0'
160
+ type: :runtime
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
166
+ version: '17.0'
153
167
  description: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
154
168
  SSH port fowarding.
155
169
  email:
@@ -192,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
192
206
  - !ruby/object:Gem::Version
193
207
  version: '0'
194
208
  requirements: []
195
- rubygems_version: 3.1.2
209
+ rubygems_version: 3.2.22
196
210
  signing_key:
197
211
  specification_version: 4
198
212
  summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH