Skip to content

Commit

Permalink
Fix for net-ssh 2.10.0.
Browse files Browse the repository at this point in the history
This sets the default compression to auto-negotiate the best available.
This is broken currently because net-ssh no longer silently allows
falling back to no compression and OpenSSH uses `"[email protected]"`,
not `"zlib"`. I've removed the validation as it is incorrect and in the
future it would be nice to not need an ASAP release for this kind of
issue. If a user misconfigured the compression setting, they will now
notice immediately because it will refuse to connect.
  • Loading branch information
coderanger committed Aug 3, 2015
1 parent fe70cb5 commit 70adb14
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions lib/kitchen/transport/ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,8 @@ class Ssh < Kitchen::Transport::Base
default_config :ssh_key, nil
expand_path_for :ssh_key

default_config :compression, "zlib"
required_config :compression do |attr, value, transport|
if !%W[zlib none].include?(value)
raise UserError, "#{transport} :#{attr} value may only " \
"be set to `none' or `zlib'."
end
end
default_config :compression, true
required_config :compression

default_config :compression_level do |transport|
transport[:compression] == "none" ? 0 : 6
Expand Down

0 comments on commit 70adb14

Please sign in to comment.