train-core 3.3.27 → 3.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.
- checksums.yaml +4 -4
- data/lib/train.rb +3 -0
- data/lib/train/transports/ssh.rb +1 -0
- data/lib/train/transports/ssh_connection.rb +1 -1
- data/lib/train/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bcdd1ac651c1272f119e63d0edb3d9267b4811088a0e3133b90d1fa969c79258
|
|
4
|
+
data.tar.gz: '09c95e4d2627b99f5c878336f84f416fd61ee46225362973b81ad0d4b70559a2'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f0bec9907895f76f5e211fafdc1e1adc5ea7603a5db7c6e3ac4e098102976aa13c0ca2e2c2fa4eb8d67666820e516336a063a32687a4ba22683cdec8fc7a4584
|
|
7
|
+
data.tar.gz: 3c2444b2309bccff9f61f52a0c235b090e7d3040a01ec084da895a287a600708278b934e84a9f268c30fa2e306035cd3eeb6621fd201cd7492f5af5560b04a13
|
data/lib/train.rb
CHANGED
|
@@ -113,6 +113,9 @@ module Train
|
|
|
113
113
|
# TODO: rewrite next line using compact! once we drop support for ruby 2.3
|
|
114
114
|
creds = creds.delete_if { |_, value| value.nil? }
|
|
115
115
|
|
|
116
|
+
# merge train options in from the URI query string
|
|
117
|
+
creds.merge!(uri.query_values.map { |k, v| [k.to_sym, v] }.to_h) unless uri.query_values.nil?
|
|
118
|
+
|
|
116
119
|
# return the updated config
|
|
117
120
|
creds
|
|
118
121
|
end
|
data/lib/train/transports/ssh.rb
CHANGED
|
@@ -63,6 +63,7 @@ module Train::Transports
|
|
|
63
63
|
option :bastion_port, default: 22
|
|
64
64
|
option :non_interactive, default: false
|
|
65
65
|
option :verify_host_key, default: false
|
|
66
|
+
option :forward_agent, default: false
|
|
66
67
|
|
|
67
68
|
# Allow connecting with older algorithms
|
|
68
69
|
option :append_all_supported_algorithms, default: true
|
|
@@ -341,7 +341,7 @@ class Train::Transports::SSH
|
|
|
341
341
|
if timeout
|
|
342
342
|
res = thr.join(timeout)
|
|
343
343
|
unless res
|
|
344
|
-
logger.
|
|
344
|
+
logger.debug("train ssh command '#{cmd}' reached requested timeout (#{timeout}s)")
|
|
345
345
|
session.channels.each_value { |c| c.eof!; c.close }
|
|
346
346
|
raise Train::CommandTimeoutReached.new "ssh command reached timeout (#{timeout}s)"
|
|
347
347
|
end
|
data/lib/train/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: train-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.
|
|
4
|
+
version: 3.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chef InSpec Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-12-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: addressable
|