Merge pull request #885 from chef/pins

Update InSpec to 4.18.51 and pin train to 3.2.0
chef · Jan 24, 2020 · d1d4462 · d1d4462
2 parents 593eaf3 + 3677104
commit d1d4462
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/components/gems/Gemfile b/components/gems/Gemfile
@@ -46,6 +46,10 @@ end
 group(:omnibus_package) do
   gem "appbundler"
 
+  ## Until we resolve https://github.com/inspec/train/issues/548
+  gem "train", "=3.2.0"
+  gem "train-core", "=3.2.0"
+
   # Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef
   # gems to Rubygems now, so letting this float on latest should always give us the latest
   # stable release. May have to re-pin around major version bumping time, or during patch
@@ -60,8 +64,8 @@ group(:omnibus_package) do
   gem "fauxhai-ng", "~> 7.5"
 
   # inspec #TODO revert this pin when we solve build failures
-  gem "inspec-bin", "= 4.18.39" # the actual inspec CLI binary
-  gem "inspec", "= 4.18.39"
+  gem "inspec-bin", "~> 4.18" # the actual inspec CLI binary
+  gem "inspec", "~> 4.18"
 
   # test-kitchen and plugins
   gem "test-kitchen", ">= 2.0"
@@ -90,7 +94,7 @@ group(:omnibus_package) do
   gem "ed25519"
   gem "bcrypt_pbkdf"
   gem "chef-cli", ">= 1.0.9"
-  gem "chef-apply", ">= 0.3.3"
+  gem "chef-apply", ">= 0.4.13"
 
   # For Delivery build node
   gem "chef-sugar"

diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
@@ -279,10 +279,10 @@ GEM
     chef-api (0.10.2)
       logify (~> 0.1)
       mime-types
-    chef-apply (0.4.12)
+    chef-apply (0.4.13)
       chef (>= 15.0)
       chef-cli (>= 1.0.3)
-      chef-telemetry (<= 0.1.10)
+      chef-telemetry (>= 1.0.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-cli
       mixlib-config (>= 3.0.5)
@@ -316,7 +316,7 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-telemetry (0.1.8)
+    chef-telemetry (1.0.2)
       chef-config
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
@@ -385,7 +385,7 @@ GEM
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     fauxhai-ng (7.5.1)
       net-ssh
@@ -465,10 +465,11 @@ GEM
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (4.18.39)
+    inspec (4.18.51)
       addressable (~> 2.4)
+      chef-telemetry (~> 1.0)
       faraday (>= 0.9.0)
-      faraday_middleware (~> 0.12.2)
+      faraday_middleware (~> 0.12)
       hashie (~> 3.4)
       htmlentities
       json-schema (~> 2.8)
@@ -479,7 +480,7 @@ GEM
       parallel (~> 1.9)
       parslet (~> 1.5)
       pry (~> 0)
-      rspec (~> 3.0, < 3.9)
+      rspec (~> 3.9)
       rspec-its (~> 1.2)
       rubyzip (~> 1.2, >= 1.2.2)
       semverse
@@ -493,8 +494,8 @@ GEM
       train-winrm (~> 0.2)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-bin (4.18.39)
-      inspec (= 4.18.39)
+    inspec-bin (4.18.51)
+      inspec (= 4.18.51)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.4)
@@ -741,22 +742,22 @@ GEM
       addressable (>= 2.3.6, < 3.0.0)
     retriable (3.1.2)
     retryable (3.0.5)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.2)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -831,13 +832,12 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.9)
-    train (3.2.14)
+    train (3.2.0)
       activesupport (~> 5.2.3)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
       azure_mgmt_security (~> 0.18)
-      azure_mgmt_storage (~> 0.18)
       docker-api (~> 1.26)
       google-api-client (>= 0.23.9, < 0.35.0)
       googleauth (>= 0.6.6, < 0.11.0)
@@ -893,7 +893,7 @@ GEM
       aws-sdk-sns (~> 1.9)
       aws-sdk-sqs (~> 1.10)
       aws-sdk-ssm (~> 1.0)
-    train-core (3.2.14)
+    train-core (3.2.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
@@ -1031,7 +1031,7 @@ DEPENDENCIES
   berkshelf (>= 7.0.8)
   bundler (< 2)
   chef (= 15.7.31)
-  chef-apply (>= 0.3.3)
+  chef-apply (>= 0.4.13)
   chef-bin (= 15.7.31)
   chef-cli (>= 1.0.9)
   chef-sugar
@@ -1048,8 +1048,8 @@ DEPENDENCIES
   ffi-rzmq-core
   foodcritic (>= 16.0)
   guard
-  inspec (= 4.18.39)
-  inspec-bin (= 4.18.39)
+  inspec (~> 4.18)
+  inspec-bin (~> 4.18)
   kitchen-azurerm (>= 0.14)
   kitchen-digitalocean (>= 0.10.0)
   kitchen-dokken (>= 2.8.1)
@@ -1090,6 +1090,8 @@ DEPENDENCIES
   ruby-shadow
   stove (>= 7.1.5)
   test-kitchen (>= 2.0)
+  train (= 3.2.0)
+  train-core (= 3.2.0)
   win32-api
   win32-dir
   win32-event