1
0
Fork 0

ci(gemfile+lock): use `ssf` customised `inspec` repo [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/357
This commit is contained in:
Imran Iqbal 2021-08-04 21:57:02 +01:00
parent 51541ce786
commit 4b05f272ef
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
2 changed files with 75 additions and 58 deletions

15
Gemfile
View File

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

View File

@ -1,3 +1,40 @@
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d
branch: ssf
specs:
inspec (4.41.0)
faraday_middleware (>= 0.12.2, < 1.1)
inspec-core (= 4.41.0)
mongo
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-core (4.41.0)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
faraday_middleware (~> 1.0)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (>= 1.5, < 2.0)
pry (~> 0.13)
rspec (>= 3.9, < 3.11)
rspec-its (~> 1.2)
rubyzip (>= 1.2.2, < 3.0)
semverse (~> 3.0)
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
GIT GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
@ -227,6 +264,7 @@ GEM
azure_mgmt_storage (0.23.0) azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
bson (4.12.1)
builder (3.2.4) builder (3.2.4)
chef-config (17.3.48) chef-config (17.3.48)
addressable addressable
@ -249,18 +287,27 @@ GEM
multi_json multi_json
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4) ed25519 (1.2.4)
erubi (1.10.0) erubi (1.10.0)
excon (0.85.0) excon (0.85.0)
faraday (0.17.4) faraday (1.4.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7) faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0) faraday (>= 0.8.0)
http-cookie (~> 1.0.0) http-cookie (~> 1.0.0)
faraday_middleware (0.12.2) faraday-em_http (1.0.0)
faraday (>= 0.7.4, < 1.0) faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.3) ffi (1.15.3)
fuzzyurl (0.9.0) fuzzyurl (0.9.0)
google-api-client (0.52.0) google-api-client (0.52.0)
@ -283,51 +330,15 @@ GEM
ffi (>= 1.0.1) ffi (>= 1.0.1)
gyoku (1.3.1) gyoku (1.3.1)
builder (>= 2.1.2) builder (>= 2.1.2)
hana (1.3.7) hashie (4.1.0)
hashie (3.6.0)
http-cookie (1.0.4) http-cookie (1.0.4)
domain_name (~> 0.5) domain_name (~> 0.5)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.8.10) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inifile (3.0.0) inifile (3.0.0)
inspec (4.22.22)
faraday_middleware (~> 0.12.2)
inspec-core (= 4.22.22)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-core (4.22.22)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json_schemer (>= 0.2.1, < 0.2.12)
license-acceptance (>= 0.2.13, < 2.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0.13)
rspec (~> 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
semverse (~> 3.0)
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (~> 1.2.0)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
jmespath (1.4.0) jmespath (1.4.0)
json (2.5.1) json (2.5.1)
json_schemer (0.2.11)
ecma-re-validator (~> 0.2)
hana (~> 1.3)
regexp_parser (~> 1.5)
uri_template (~> 0.7)
jwt (2.2.3) jwt (2.2.3)
kitchen-inspec (2.5.0) kitchen-inspec (2.5.0)
hashie (>= 3.4, <= 5.0) hashie (>= 3.4, <= 5.0)
@ -336,11 +347,11 @@ GEM
kitchen-salt (0.6.3) kitchen-salt (0.6.3)
hashie (>= 3.5) hashie (>= 3.5)
test-kitchen (>= 1.4) test-kitchen (>= 1.4)
license-acceptance (1.0.19) license-acceptance (2.1.13)
pastel (~> 0.7) pastel (~> 0.7)
tomlrb (~> 1.2) tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.3) tty-box (~> 0.6)
tty-prompt (~> 0.18) tty-prompt (~> 0.20)
little-plugger (1.1.4) little-plugger (1.1.4)
logging (2.3.0) logging (2.3.0)
little-plugger (~> 1.1) little-plugger (~> 1.1)
@ -359,6 +370,8 @@ GEM
mixlib-shellout (3.2.5) mixlib-shellout (3.2.5)
chef-utils chef-utils
mixlib-versioning (1.2.12) mixlib-versioning (1.2.12)
mongo (2.15.0)
bson (>= 4.8.2, < 5.0.0)
ms_rest (0.7.6) ms_rest (0.7.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0) faraday (>= 0.9, < 2.0.0)
@ -385,7 +398,6 @@ GEM
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
public_suffix (4.0.6) public_suffix (4.0.6)
regexp_parser (1.8.2)
representable (3.1.1) representable (3.1.1)
declarative (< 0.1.0) declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0) trailblazer-option (>= 0.1.1, < 0.2.0)
@ -408,8 +420,9 @@ GEM
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0) rspec-support (~> 3.10.0)
rspec-support (3.10.2) rspec-support (3.10.2)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3) rubyntlm (0.6.3)
rubyzip (1.3.0) rubyzip (2.3.2)
semverse (3.0.0) semverse (3.0.0)
signet (0.15.0) signet (0.15.0)
addressable (~> 2.3) addressable (~> 2.3)
@ -438,7 +451,7 @@ GEM
winrm-fs (~> 1.1) winrm-fs (~> 1.1)
thor (1.1.0) thor (1.1.0)
timeliness (0.3.10) timeliness (0.3.10)
tomlrb (1.2.9) tomlrb (1.3.0)
trailblazer-option (0.1.1) trailblazer-option (0.1.1)
train (3.8.1) train (3.8.1)
activesupport (>= 6.0.3.1) activesupport (>= 6.0.3.1)
@ -556,7 +569,6 @@ GEM
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (2.0.0) unicode-display_width (2.0.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
uri_template (0.7.0)
winrm (2.3.6) winrm (2.3.6)
builder (>= 2.1.2) builder (>= 2.1.2)
erubi (~> 1.8) erubi (~> 1.8)
@ -570,10 +582,10 @@ GEM
erubi (~> 1.8) erubi (~> 1.8)
winrm (~> 2.0) winrm (~> 2.0)
winrm-fs (~> 1.0) winrm-fs (~> 1.0)
winrm-fs (1.3.3) winrm-fs (1.3.5)
erubi (~> 1.8) erubi (~> 1.8)
logging (>= 1.6.1, < 3.0) logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1) rubyzip (~> 2.0)
winrm (~> 2.0) winrm (~> 2.0)
wisper (2.0.1) wisper (2.0.1)
zeitwerk (2.4.2) zeitwerk (2.4.2)
@ -582,7 +594,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
inspec (~> 4.22.22) inspec!
kitchen-docker! kitchen-docker!
kitchen-inspec (>= 2.5.0) kitchen-inspec (>= 2.5.0)
kitchen-salt (>= 0.6.3) kitchen-salt (>= 0.6.3)