Skip to content

Commit

Permalink
Merge pull request #1027 from chef/unpin_inspec
Browse files Browse the repository at this point in the history
Unpinning Inspec because its sudo bug got fixed
  • Loading branch information
tyler-ball authored Mar 9, 2020
2 parents 4f01964 + 41e9d1b commit f6d3c80
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 32 deletions.
9 changes: 2 additions & 7 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,8 @@ group(:omnibus_package) do
gem "fauxhai-ng", "~> 7.5"

# inspec
# TODO pinned while we solve some escaped defects
# https://github.com/inspec/inspec/issues/4899
# https://github.com/inspec/train/pull/576
# https://github.com/inspec/inspec/pull/4934
# https://github.com/inspec/inspec/pull/4932
gem "inspec-bin", "= 4.18.51" # the actual inspec CLI binary
gem "inspec", "= 4.18.51"
gem "inspec-bin", "~> 4.18" # the actual inspec CLI binary
gem "inspec", "~> 4.18"

# test-kitchen and plugins
gem "test-kitchen", ">= 2.0"
Expand Down
61 changes: 36 additions & 25 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GEM
artifactory (3.0.12)
ast (2.4.0)
aws-eventstream (1.0.3)
aws-partitions (1.279.0)
aws-partitions (1.281.0)
aws-sdk-apigateway (1.36.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -71,7 +71,7 @@ GEM
aws-sdk-dynamodb (1.44.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.146.0)
aws-sdk-ec2 (1.148.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.25.0)
Expand All @@ -80,7 +80,7 @@ GEM
aws-sdk-ecs (1.57.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-eks (1.31.0)
aws-sdk-eks (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.29.0)
Expand Down Expand Up @@ -176,7 +176,7 @@ GEM
ms_rest_azure (~> 0.11.1)
azure_mgmt_storage (0.19.3)
ms_rest_azure (~> 0.11.1)
backports (3.16.1)
backports (3.17.0)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
bcrypt_pbkdf (1.0.1-x86-mingw32)
Expand Down Expand Up @@ -371,6 +371,8 @@ GEM
kartograph (~> 0.2.3)
resource_kit (~> 0.1.5)
virtus (~> 1.0.3)
ecma-re-validator (0.2.0)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
equalizer (0.0.11)
equatable (0.6.1)
Expand All @@ -382,7 +384,7 @@ GEM
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.14.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fauxhai-ng (7.6.0)
net-ssh
Expand Down Expand Up @@ -441,6 +443,7 @@ GEM
thor (>= 0.18.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hana (1.3.5)
hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
Expand All @@ -459,44 +462,50 @@ GEM
ice_nine (0.11.2)
inifile (3.0.0)
iniparse (1.5.0)
inspec (4.18.51)
inspec (4.18.100)
faraday_middleware (~> 0.12.2)
inspec-core (= 4.18.100)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
inspec-bin (4.18.100)
inspec (= 4.18.100)
inspec-core (4.18.100)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
faraday_middleware (~> 0.12)
hashie (~> 3.4)
htmlentities
json-schema (~> 2.8)
htmlentities (~> 4.3)
json_schemer (~> 0.2.1)
license-acceptance (>= 0.2.13, < 2.0)
method_source (~> 0.8)
mixlib-log
multipart-post
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
rspec (~> 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
semverse
semverse (~> 3.0)
sslshake (~> 1.2)
term-ansicolor
thor (~> 0.20)
term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0)
tomlrb (~> 1.2)
train (~> 3.0)
train-aws (~> 0.1)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
inspec-bin (4.18.51)
inspec (= 4.18.51)
ipaddress (0.8.3)
iso8601 (0.12.1)
jaro_winkler (1.5.4)
jmespath (1.4.0)
json (2.3.0)
json-schema (2.8.1)
addressable (>= 2.4)
json_schemer (0.2.10)
ecma-re-validator (~> 0.2)
hana (~> 1.3)
regexp_parser (~> 1.5)
uri_template (~> 0.7)
jwt (2.2.1)
kartograph (0.2.7)
kitchen-azurerm (0.15.1)
Expand Down Expand Up @@ -723,6 +732,7 @@ GEM
nokogiri (~> 1.5)
optimist (~> 3.0)
rdp-ruby-wmi (0.3.1)
regexp_parser (1.7.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
Expand Down Expand Up @@ -890,7 +900,7 @@ GEM
tty-cursor (~> 0.7)
tty-color (0.5.1)
tty-cursor (0.7.1)
tty-prompt (0.20.0)
tty-prompt (0.21.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
tty-reader (~> 0.7.0)
Expand All @@ -917,6 +927,7 @@ GEM
unf_ext (0.0.7.2-x86-mingw32)
unicode-display_width (1.6.1)
unicode_utils (1.4.0)
uri_template (0.7.0)
uuidtools (2.1.5)
virtus (1.0.5)
axiom-types (~> 0.1)
Expand Down Expand Up @@ -1024,8 +1035,8 @@ DEPENDENCIES
ffi-rzmq-core
foodcritic (>= 16.2)
guard
inspec (= 4.18.51)
inspec-bin (= 4.18.51)
inspec (~> 4.18)
inspec-bin (~> 4.18)
kitchen-azurerm (>= 0.14)
kitchen-digitalocean (>= 0.10.0)
kitchen-dokken (>= 2.8.1)
Expand Down

0 comments on commit f6d3c80

Please sign in to comment.