Skip to content

Commit c13fa62

Browse files
committed
ci(gemfile+lock): use ssf customised inspec repo [skip ci]
* Automated using myii/ssf-formula#357
1 parent 2f0a889 commit c13fa62

File tree

2 files changed

+75
-58
lines changed

2 files changed

+75
-58
lines changed

Diff for: Gemfile

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22

33
source 'https://rubygems.org'
44

5-
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
6-
# regression where the diff isn't displayed when comparing using `eq`.
7-
gem 'inspec', '~> 4.22.22'
8-
# Install the `kitchen-docker` gem using `git` because the latest version
9-
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
5+
# Install the `inspec` gem using `git` because versions after `4.22.22`
6+
# suppress diff output; this version fixes this for our uses.
7+
# rubocop:disable Layout/LineLength
8+
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
9+
# rubocop:enable Layout/LineLength
10+
11+
# Install the `kitchen-docker` gem using `git` in order to gain a performance
12+
# improvement: avoid package installations which are already covered by the
13+
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1014
# rubocop:disable Layout/LineLength
1115
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
1216
# rubocop:enable Layout/LineLength
17+
1318
gem 'kitchen-inspec', '>= 2.5.0'
1419
gem 'kitchen-salt', '>= 0.6.3'
1520

Diff for: Gemfile.lock

+65-53
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
GIT
2+
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
3+
revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d
4+
branch: ssf
5+
specs:
6+
inspec (4.41.0)
7+
faraday_middleware (>= 0.12.2, < 1.1)
8+
inspec-core (= 4.41.0)
9+
mongo
10+
train (~> 3.0)
11+
train-aws (~> 0.1)
12+
train-habitat (~> 0.1)
13+
train-winrm (~> 0.2)
14+
inspec-core (4.41.0)
15+
addressable (~> 2.4)
16+
chef-telemetry (~> 1.0, >= 1.0.8)
17+
faraday (>= 0.9.0, < 1.5)
18+
faraday_middleware (~> 1.0)
19+
hashie (>= 3.4, < 5.0)
20+
license-acceptance (>= 0.2.13, < 3.0)
21+
method_source (>= 0.8, < 2.0)
22+
mixlib-log (~> 3.0)
23+
multipart-post (~> 2.0)
24+
parallel (~> 1.9)
25+
parslet (>= 1.5, < 2.0)
26+
pry (~> 0.13)
27+
rspec (>= 3.9, < 3.11)
28+
rspec-its (~> 1.2)
29+
rubyzip (>= 1.2.2, < 3.0)
30+
semverse (~> 3.0)
31+
sslshake (~> 1.2)
32+
thor (>= 0.20, < 2.0)
33+
tomlrb (>= 1.2, < 2.1)
34+
train-core (~> 3.0)
35+
tty-prompt (~> 0.17)
36+
tty-table (~> 0.10)
37+
138
GIT
239
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
340
revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
@@ -227,6 +264,7 @@ GEM
227264
azure_mgmt_storage (0.23.0)
228265
ms_rest_azure (~> 0.12.0)
229266
bcrypt_pbkdf (1.1.0)
267+
bson (4.12.1)
230268
builder (3.2.4)
231269
chef-config (17.3.48)
232270
addressable
@@ -249,18 +287,27 @@ GEM
249287
multi_json
250288
domain_name (0.5.20190701)
251289
unf (>= 0.0.5, < 1.0.0)
252-
ecma-re-validator (0.2.1)
253-
regexp_parser (~> 1.2)
254290
ed25519 (1.2.4)
255291
erubi (1.10.0)
256292
excon (0.85.0)
257-
faraday (0.17.4)
293+
faraday (1.4.3)
294+
faraday-em_http (~> 1.0)
295+
faraday-em_synchrony (~> 1.0)
296+
faraday-excon (~> 1.1)
297+
faraday-net_http (~> 1.0)
298+
faraday-net_http_persistent (~> 1.1)
258299
multipart-post (>= 1.2, < 3)
300+
ruby2_keywords (>= 0.0.4)
259301
faraday-cookie_jar (0.0.7)
260302
faraday (>= 0.8.0)
261303
http-cookie (~> 1.0.0)
262-
faraday_middleware (0.12.2)
263-
faraday (>= 0.7.4, < 1.0)
304+
faraday-em_http (1.0.0)
305+
faraday-em_synchrony (1.0.0)
306+
faraday-excon (1.1.0)
307+
faraday-net_http (1.0.1)
308+
faraday-net_http_persistent (1.2.0)
309+
faraday_middleware (1.0.0)
310+
faraday (~> 1.0)
264311
ffi (1.15.3)
265312
fuzzyurl (0.9.0)
266313
google-api-client (0.52.0)
@@ -283,51 +330,15 @@ GEM
283330
ffi (>= 1.0.1)
284331
gyoku (1.3.1)
285332
builder (>= 2.1.2)
286-
hana (1.3.7)
287-
hashie (3.6.0)
333+
hashie (4.1.0)
288334
http-cookie (1.0.4)
289335
domain_name (~> 0.5)
290336
httpclient (2.8.3)
291337
i18n (1.8.10)
292338
concurrent-ruby (~> 1.0)
293339
inifile (3.0.0)
294-
inspec (4.22.22)
295-
faraday_middleware (~> 0.12.2)
296-
inspec-core (= 4.22.22)
297-
train (~> 3.0)
298-
train-aws (~> 0.1)
299-
train-habitat (~> 0.1)
300-
train-winrm (~> 0.2)
301-
inspec-core (4.22.22)
302-
addressable (~> 2.4)
303-
chef-telemetry (~> 1.0)
304-
faraday (>= 0.9.0)
305-
hashie (~> 3.4)
306-
json_schemer (>= 0.2.1, < 0.2.12)
307-
license-acceptance (>= 0.2.13, < 2.0)
308-
method_source (>= 0.8, < 2.0)
309-
mixlib-log (~> 3.0)
310-
multipart-post (~> 2.0)
311-
parallel (~> 1.9)
312-
parslet (~> 1.5)
313-
pry (~> 0.13)
314-
rspec (~> 3.9)
315-
rspec-its (~> 1.2)
316-
rubyzip (~> 1.2, >= 1.2.2)
317-
semverse (~> 3.0)
318-
sslshake (~> 1.2)
319-
thor (>= 0.20, < 2.0)
320-
tomlrb (~> 1.2.0)
321-
train-core (~> 3.0)
322-
tty-prompt (~> 0.17)
323-
tty-table (~> 0.10)
324340
jmespath (1.4.0)
325341
json (2.5.1)
326-
json_schemer (0.2.11)
327-
ecma-re-validator (~> 0.2)
328-
hana (~> 1.3)
329-
regexp_parser (~> 1.5)
330-
uri_template (~> 0.7)
331342
jwt (2.2.3)
332343
kitchen-inspec (2.5.0)
333344
hashie (>= 3.4, <= 5.0)
@@ -338,11 +349,11 @@ GEM
338349
test-kitchen (>= 1.4)
339350
kitchen-vagrant (1.9.0)
340351
test-kitchen (>= 1.4, < 4)
341-
license-acceptance (1.0.19)
352+
license-acceptance (2.1.13)
342353
pastel (~> 0.7)
343-
tomlrb (~> 1.2)
344-
tty-box (~> 0.3)
345-
tty-prompt (~> 0.18)
354+
tomlrb (>= 1.2, < 3.0)
355+
tty-box (~> 0.6)
356+
tty-prompt (~> 0.20)
346357
little-plugger (1.1.4)
347358
logging (2.3.0)
348359
little-plugger (~> 1.1)
@@ -361,6 +372,8 @@ GEM
361372
mixlib-shellout (3.2.5)
362373
chef-utils
363374
mixlib-versioning (1.2.12)
375+
mongo (2.15.0)
376+
bson (>= 4.8.2, < 5.0.0)
364377
ms_rest (0.7.6)
365378
concurrent-ruby (~> 1.0)
366379
faraday (>= 0.9, < 2.0.0)
@@ -387,7 +400,6 @@ GEM
387400
coderay (~> 1.1)
388401
method_source (~> 1.0)
389402
public_suffix (4.0.6)
390-
regexp_parser (1.8.2)
391403
representable (3.1.1)
392404
declarative (< 0.1.0)
393405
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -410,8 +422,9 @@ GEM
410422
diff-lcs (>= 1.2.0, < 2.0)
411423
rspec-support (~> 3.10.0)
412424
rspec-support (3.10.2)
425+
ruby2_keywords (0.0.5)
413426
rubyntlm (0.6.3)
414-
rubyzip (1.3.0)
427+
rubyzip (2.3.2)
415428
semverse (3.0.0)
416429
signet (0.15.0)
417430
addressable (~> 2.3)
@@ -440,7 +453,7 @@ GEM
440453
winrm-fs (~> 1.1)
441454
thor (1.1.0)
442455
timeliness (0.3.10)
443-
tomlrb (1.2.9)
456+
tomlrb (1.3.0)
444457
trailblazer-option (0.1.1)
445458
train (3.8.1)
446459
activesupport (>= 6.0.3.1)
@@ -558,7 +571,6 @@ GEM
558571
unf_ext (0.0.7.7)
559572
unicode-display_width (2.0.0)
560573
unicode_utils (1.4.0)
561-
uri_template (0.7.0)
562574
winrm (2.3.6)
563575
builder (>= 2.1.2)
564576
erubi (~> 1.8)
@@ -572,10 +584,10 @@ GEM
572584
erubi (~> 1.8)
573585
winrm (~> 2.0)
574586
winrm-fs (~> 1.0)
575-
winrm-fs (1.3.3)
587+
winrm-fs (1.3.5)
576588
erubi (~> 1.8)
577589
logging (>= 1.6.1, < 3.0)
578-
rubyzip (~> 1.1)
590+
rubyzip (~> 2.0)
579591
winrm (~> 2.0)
580592
wisper (2.0.1)
581593
zeitwerk (2.4.2)
@@ -584,7 +596,7 @@ PLATFORMS
584596
ruby
585597

586598
DEPENDENCIES
587-
inspec (~> 4.22.22)
599+
inspec!
588600
kitchen-docker!
589601
kitchen-inspec (>= 2.5.0)
590602
kitchen-salt (>= 0.6.3)

0 commit comments

Comments
 (0)