train 3.8.7 → 3.10.0
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/transports/docker.rb +11 -0
- data/lib/train/transports/podman.rb +157 -0
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e6b8e68e08bf282a4842a3d7ff2b3433ae881762c68ead8976199d7ff3c7d697
|
4
|
+
data.tar.gz: 2b8406599b0a5da73fce05d206de2eb9633e07603e2edb8c94a8e6669822d738
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b7462fd698eaa650607048b34eca28cb24515dea1e8bee54a4f10842f7bd1dd7b6a33fe2d5f53dd3272046539658536279e3d9be3c77911cfd2aaa3bbb90d54d
|
7
|
+
data.tar.gz: 102693e9e2ad91febec2fda858e61ff1b721a9af806518751ca4e9c70814ac7ad56ef490c0f273a7f01c55a5eac38cc24a4a7a27e72b7aeeee510d6acd637112
|
@@ -83,6 +83,17 @@ class Train::Transports::Docker
|
|
83
83
|
end
|
84
84
|
end
|
85
85
|
|
86
|
+
def unique_identifier
|
87
|
+
uuid = @container.nil? ? @id : @container.id # default uuid set to the docker host.
|
88
|
+
unless sniff_for_windows?
|
89
|
+
cmd = run_command_via_connection("head -1 /proc/self/cgroup|cut -d/ -f3") if file("/proc/self/cgroup").exist?
|
90
|
+
unless cmd.stdout.empty?
|
91
|
+
uuid = cmd.stdout.strip
|
92
|
+
end
|
93
|
+
end
|
94
|
+
uuid
|
95
|
+
end
|
96
|
+
|
86
97
|
private
|
87
98
|
|
88
99
|
def file_via_connection(path)
|
@@ -0,0 +1,157 @@
|
|
1
|
+
require "docker"
|
2
|
+
require_relative "../errors"
|
3
|
+
|
4
|
+
module Train::Transports
|
5
|
+
class Podman < Train.plugin(1)
|
6
|
+
|
7
|
+
name "podman"
|
8
|
+
|
9
|
+
include_options Train::Extras::CommandWrapper
|
10
|
+
option :host, required: true
|
11
|
+
option :podman_url, required: false
|
12
|
+
|
13
|
+
def connection(state = {}, &block)
|
14
|
+
opts = merge_options(options, state || {})
|
15
|
+
|
16
|
+
validate_options(opts)
|
17
|
+
|
18
|
+
if @connection && @connection_options == opts
|
19
|
+
reuse_connection(&block)
|
20
|
+
else
|
21
|
+
create_new_connection(opts, &block)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
# Creates a new Podman connection instance and save it for potential future
|
28
|
+
# reuse.
|
29
|
+
#
|
30
|
+
# @param options [Hash] connection options
|
31
|
+
# @return [Podman::Connection] a Podman connection instance
|
32
|
+
# @api private
|
33
|
+
def create_new_connection(options, &block)
|
34
|
+
if @connection
|
35
|
+
logger.debug("[Podman] shutting previous connection #{@connection}")
|
36
|
+
@connection.close
|
37
|
+
end
|
38
|
+
|
39
|
+
@connection_options = options
|
40
|
+
@connection = Connection.new(options, &block)
|
41
|
+
end
|
42
|
+
|
43
|
+
# Return the last saved Podman connection instance.
|
44
|
+
#
|
45
|
+
# @return [Podman::Connection] a Podman connection instance
|
46
|
+
# @api private
|
47
|
+
def reuse_connection
|
48
|
+
logger.debug("[Podman] reusing existing connection #{@connection}")
|
49
|
+
yield @connection if block_given?
|
50
|
+
@connection
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
class Train::Transports::Podman
|
55
|
+
class Connection < BaseConnection
|
56
|
+
def initialize(options)
|
57
|
+
super(options)
|
58
|
+
|
59
|
+
@id = options[:host]
|
60
|
+
|
61
|
+
if RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
|
62
|
+
raise "Unsupported host platform."
|
63
|
+
end
|
64
|
+
|
65
|
+
# Currently Podman url can be set using option and setting the environment variable.
|
66
|
+
uid = Process.uid
|
67
|
+
podman_url = options[:podman_url] || ENV["CONTAINER_HOST"]
|
68
|
+
podman_url ||= "unix:///run/podman/podman.sock" if uid == 0
|
69
|
+
podman_url ||= "unix:///run/user/#{uid}/podman/podman.sock"
|
70
|
+
|
71
|
+
Docker.url = podman_url
|
72
|
+
|
73
|
+
# Using docker-api ruby library to fetch the Podman container data.
|
74
|
+
@container = ::Docker::Container.get(@id) ||
|
75
|
+
raise("Can't find Podman container #{@id}")
|
76
|
+
@cmd_wrapper = nil
|
77
|
+
@cmd_wrapper = CommandWrapper.load(self, @options)
|
78
|
+
@probably_windows = nil
|
79
|
+
rescue Excon::Error::Socket
|
80
|
+
raise Train::TransportError, "Unable to connect to Podman using #{podman_url}"
|
81
|
+
rescue Docker::Error::NotFoundError => e
|
82
|
+
raise Train::TransportError, "Container Not Found: #{e.message}"
|
83
|
+
rescue Docker::Error::ServerError => e
|
84
|
+
raise Train::TransportError, "#{e.message}"
|
85
|
+
end
|
86
|
+
|
87
|
+
def close
|
88
|
+
# nothing to do at the moment
|
89
|
+
end
|
90
|
+
|
91
|
+
def uri
|
92
|
+
if @container.nil?
|
93
|
+
"podman://#{@id}"
|
94
|
+
else
|
95
|
+
"podman://#{@container.id}"
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
def unique_identifier
|
100
|
+
@container.nil? ? @id : @container.id # default uuid set to the podman host.
|
101
|
+
end
|
102
|
+
|
103
|
+
private
|
104
|
+
|
105
|
+
def file_via_connection(path)
|
106
|
+
if os.aix?
|
107
|
+
Train::File::Remote::Aix.new(self, path)
|
108
|
+
elsif os.solaris?
|
109
|
+
Train::File::Remote::Unix.new(self, path)
|
110
|
+
elsif os.windows?
|
111
|
+
Train::File::Remote::Windows.new(self, path)
|
112
|
+
else
|
113
|
+
Train::File::Remote::Linux.new(self, path)
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
def run_command_via_connection(cmd, &_data_handler)
|
118
|
+
cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
|
119
|
+
|
120
|
+
# Cannot use os.windows? here because it calls run_command_via_connection,
|
121
|
+
# causing infinite recursion during initial platform detection
|
122
|
+
if sniff_for_windows?
|
123
|
+
invocation = cmd_run_command(cmd)
|
124
|
+
else
|
125
|
+
invocation = sh_run_command(cmd)
|
126
|
+
end
|
127
|
+
stdout, stderr, exit_status = @container.exec(
|
128
|
+
invocation, user: @options[:user]
|
129
|
+
)
|
130
|
+
CommandResult.new(stdout.join, stderr.join, exit_status)
|
131
|
+
rescue ::Docker::Error::DockerError => _
|
132
|
+
raise
|
133
|
+
rescue => _
|
134
|
+
# @TODO: differentiate any other error
|
135
|
+
raise
|
136
|
+
end
|
137
|
+
|
138
|
+
def sh_run_command(cmd)
|
139
|
+
["/bin/sh", "-c", cmd]
|
140
|
+
end
|
141
|
+
|
142
|
+
def cmd_run_command(cmd)
|
143
|
+
["cmd.exe", "/s", "/c", cmd]
|
144
|
+
end
|
145
|
+
|
146
|
+
def sniff_for_windows?
|
147
|
+
return @probably_windows unless @probably_windows.nil?
|
148
|
+
|
149
|
+
# Run a command using /bin/sh, which should fail under Windows
|
150
|
+
stdout, _stderr, _exit_status = @container.exec(
|
151
|
+
sh_run_command("true"), user: @options[:user]
|
152
|
+
)
|
153
|
+
@probably_windows = !!stdout.detect { |l| l.include? "failure in a Windows system call" }
|
154
|
+
end
|
155
|
+
end
|
156
|
+
end
|
157
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: train
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.10.0
|
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: 2022-
|
11
|
+
date: 2022-06-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: train-core
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.
|
19
|
+
version: 3.10.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.
|
26
|
+
version: 3.10.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: train-winrm
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -213,6 +213,7 @@ files:
|
|
213
213
|
- lib/train/transports/helpers/azure/file_parser.rb
|
214
214
|
- lib/train/transports/helpers/azure/subscription_id_file_parser.rb
|
215
215
|
- lib/train/transports/helpers/azure/subscription_number_file_parser.rb
|
216
|
+
- lib/train/transports/podman.rb
|
216
217
|
- lib/train/transports/vmware.rb
|
217
218
|
homepage:
|
218
219
|
licenses:
|
@@ -230,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
230
231
|
requirements:
|
231
232
|
- - ">="
|
232
233
|
- !ruby/object:Gem::Version
|
233
|
-
version: '2.
|
234
|
+
version: '2.7'
|
234
235
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
235
236
|
requirements:
|
236
237
|
- - ">="
|