diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-06-23 13:08:28 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-06-23 13:08:28 -0700 |
commit | 8b6bea70fe55d466d3ba41e87d799a9b18837ba2 (patch) | |
tree | d138e5d83f360828989ac609543f32c24401541c | |
parent | ac57672e9a1fcb2b1d22b7045f278889bfeabe01 (diff) | |
download | chef-8b6bea70fe55d466d3ba41e87d799a9b18837ba2.tar.gz |
Pull in the latest net-ssh/net-sftp & remove the http2 dep in chef-telemetry
This expands our SSH support and the telemetry update slims the package down slightly.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | Gemfile | 3 | ||||
-rw-r--r-- | Gemfile.lock | 35 | ||||
-rw-r--r-- | chef.gemspec | 4 |
3 files changed, 12 insertions, 30 deletions
@@ -22,8 +22,7 @@ end gem "cheffish", "~> 14" -# avoid bringing in the new http 4 gem that comes with other ffi baggage which breaks builds -gem "chef-telemetry", "=1.0.3" +gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep group(:omnibus_package) do gem "appbundler" diff --git a/Gemfile.lock b/Gemfile.lock index 9ccfa1bca3..33a2c99cf8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,8 @@ PATH mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 15.0) plist (~> 3.2) @@ -81,8 +81,8 @@ PATH mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 15.0) plist (~> 3.2) @@ -142,11 +142,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.4) byebug (11.1.3) - chef-telemetry (1.0.3) + chef-telemetry (1.0.8) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 2.2) chef-vault (4.0.1) chef-zero (14.0.17) ffi-yajl (~> 2.2) @@ -163,8 +162,6 @@ GEM safe_yaml (~> 1.0.0) debug_inspector (0.0.3) diff-lcs (1.3) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) @@ -194,15 +191,6 @@ GEM hashie (3.6.0) highline (1.7.10) htmlentities (4.3.4) - http (2.2.2) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) httpclient (2.8.3) iniparse (1.5.0) inspec-core (4.20.10) @@ -269,9 +257,9 @@ GEM necromancer (0.5.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.2.0) + net-sftp (3.0.0) + net-ssh (>= 5.0.0, < 7.0.0) + net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) @@ -391,11 +379,6 @@ GEM pastel (~> 0.7.2) strings (~> 0.1.5) tty-screen (~> 0.7) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unf_ext (0.0.7.7-x64-mingw32) - unf_ext (0.0.7.7-x86-mingw32) unicode-display_width (1.7.0) unicode_utils (1.4.0) uri_template (0.7.0) @@ -457,7 +440,7 @@ DEPENDENCIES chef! chef-bin! chef-config! - chef-telemetry (= 1.0.3) + chef-telemetry (>= 1.0.8) chef-utils! chef-vault cheffish (~> 14) diff --git a/chef.gemspec b/chef.gemspec index c8f3b614ee..bdc4a1546d 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -30,9 +30,9 @@ Gem::Specification.new do |s| s.add_dependency "ffi", "~> 1.9", ">= 1.9.25" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-ssh", ">= 4.2", "< 6" + s.add_dependency "net-ssh", ">= 4.2", "< 7" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" - s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2" + s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.0" # ed25519 ssh key support s.add_dependency "highline", ">= 1.6.9", "< 2" |