chef-dk 3.13.1 → 4.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ef0158e1e0599d93b618a2c3edae5cd51e6ef5bdbb8e86e8ab00c547a45ac97
-  data.tar.gz: '01397b1ef025eb72061c8c74000c3b4f85979a80fb33d81ddf2006d59e4dec3a'
+  metadata.gz: 829fbf7f0a0387613b55e7a1159623b850c17a18150b90040b332ed99d3fc436
+  data.tar.gz: d6e8416089cfed43113575af40cbef7a2f61975a2897e4dbc8cd709258e38d95
 SHA512:
-  metadata.gz: '0835bacc9355c2c50be952186931d9e985739eabfeb24b442d9942cf859275698397c96abca2cc5bf91f0c14d88c64016a10ac3dfc99472b860128483b18a376'
-  data.tar.gz: b09c74b90d96741573203724c0c98bb8988dbbfe98980e89c4d5898d9ad5b49342282e05c72b8c8ee28e3aa87fb526affd1fbff4a7c866ae82ae86d3a53ce906
+  metadata.gz: 827dc81d7dbe6fc8495d009cccb462cdec46a797525f965ae2dbde4d159cb8f0e09dc99800ba7139b80c508cccb229daedb21a22728ffe9a7c07e46747d6ed54
+  data.tar.gz: 7bac770452d7e646185dcd3dd8297292f2b325a1cbfdfbf9f24e8414e974c509d4700b1808bffb170129e2c5b748fbbb0a66d59451c31e856edde241eff371b2

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,20 +25,20 @@ group(:omnibus_package, :development, :test) do
   # we pin these gems as they are installed in the ruby source and if we let them
   # float we'll end up with 2 copies shipped in DK. When we bump Ruby we need to
   # look at these pins and adjust them
-  gem "rake", "<= 12.3.0"
+  gem "rake", "<= 12.3.2"
   gem "rdoc", "<= 6.0.1"
   gem "minitest", "<= 5.10.3"
 
   gem "pry"
   gem "yard"
   gem "guard"
-  gem "cookstyle", "~> 3.0" # bump this on the next DK major release
-  gem "foodcritic", "< 16"
-  gem "ffi-libarchive", ">= 0.4.0"
+  gem "cookstyle", "~> 4.0"
+  gem "foodcritic", ">= 16.0"
+  gem "ffi-libarchive"
 end
 
 group(:dep_selector) do
-  gem "dep_selector", ">= 1.0.0"
+  gem "dep_selector"
   gem "dep-selector-libgecode"
 end
 
@@ -47,45 +47,51 @@ end
 # We should only be using "~>" to work around bugs, or temporarily pinning some tech debt.
 # We equality pin the chef gem itself to assert which version we're shipping.
 group(:omnibus_package) do
-  gem "appbundler", "< 0.13"
-  gem "berkshelf", ">= 7.0.8"
-  gem "chef-provisioning", ">= 2.7.1", group: :provisioning
-  gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning
-  gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning
+  gem "appbundler"
+  gem "berkshelf", ">= 7.0.5"
   gem "chef-vault", ">= 3.4.1"
   # 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
   # fixes.
-  gem "chef", "= 14.14.29"
+  gem "chef", "= 15.0.300"
+  gem "chef-bin", "= 15.0.300"
   gem "cheffish", ">= 14.0.1"
-  gem "chefspec", ">= 7.3.0", "< 8.0.0" # 8.0 deps on chef-cli so we don't want that
-  gem "fauxhai", "~> 6.11" # bump this on the next DK major release
-  gem "inspec", "~> 3.9"
+  gem "chefspec", ">= 7.3.0"
+  gem "fauxhai", "~> 7.0"
+  gem "inspec-bin", "~> 4.3" # the actual inspec CLI binary
+  gem "inspec", "~> 4.3"
   gem "kitchen-azurerm", ">= 0.14"
-  gem "kitchen-ec2", ">= 2.3", "< 3.0"
+  gem "kitchen-ec2", ">= 3.0", "< 4"
   gem "kitchen-digitalocean", ">= 0.10.0"
   gem "kitchen-dokken", ">= 2.6.7"
   gem "kitchen-google", ">= 2.0.0"
   gem "kitchen-hyperv", ">= 0.5.1"
-  gem "kitchen-inspec", ">= 1.0", "< 1.2.0" # 1.2 starts warning on attributes vs. inputs
-  gem "kitchen-vagrant", ">= 1.6"
+  gem "kitchen-inspec", ">= 1.0"
+  gem "kitchen-vagrant", ">= 1.4"
   gem "knife-acl", ">= 1.0.3"
   gem "knife-ec2", ">= 0.19.10"
   gem "knife-google", ">= 3.3.3"
   gem "knife-tidy", ">= 1.2.0"
   gem "knife-windows", ">= 1.9.1"
   gem "knife-opc", ">= 0.4.0"
-  gem "knife-vsphere", ">= 3.0.1", "< 4.0"
+  gem "knife-vsphere", ">= 2.1.1"
   gem "mixlib-archive", ">= 0.4.16"
-  gem "ohai", "~> 14.0"
+  gem "ohai", ">= 14"
   gem "net-ssh", ">= 4.2.0"
-  gem "test-kitchen", ">= 1.23.0", "< 2"
+  gem "test-kitchen", ">= 1.23"
   gem "listen"
   gem "dco"
 
-  # this pin prevents pulling in 1.x that has breaking changes for our apps here
-  gem "chef-telemetry", "~> 0.1"
+  # many layers down these bring in ethon which uses ffi / libcurl and breaks on windows
+  # we want to get this working, but for now it's disabled so we can get a build out
+  # make sure to add curl back to the omnibus def before enabling this again
+  # gem "knife-vcenter", ">= 2.0"
+  # gem "kitchen-vcenter", ">= 2.0"
+
+  # ed25519 ssh key support done here as it's a native gem we can't put in train
+  gem "ed25519"
+  gem "bcrypt_pbkdf"
 
   # Right now we must import chef-apply as a gem into the ChefDK because this is where all the gem
   # dependency resolution occurs. Putting it elsewhere endangers older ChefDK issues of gem version
@@ -108,6 +114,7 @@ group(:omnibus_package) do
   gem "pry-remote"
   gem "pry-stack_explorer"
   gem "rb-readline"
+  gem "rubocop"
   gem "winrm-fs"
   gem "winrm-elevated"
   gem "cucumber"
@@ -119,14 +126,15 @@ group(:ruby_prof) do
   gem "ruby-prof"
 end
 
-# Everything except Windows
+# Everything except AIX and Windows
 group(:ruby_shadow) do
   gem "ruby-shadow", platform: :ruby
 end
 
 gem "chefstyle", group: :test
 
-# Ensure support for push-client on Windows
+# TODO delete this when we figure out how to include the pushy windows dependencies
+# correctly
 platforms :mswin, :mingw do
   gem "rdp-ruby-wmi"
   gem "windows-pr"

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    chef-dk (3.13.1)
+    chef-dk (4.0.60)
       addressable (>= 2.3.5, < 2.6)
-      chef (~> 14.0)
-      chef-provisioning (~> 2.0)
+      chef (~> 15.0)
       cookbook-omnifetch (~> 0.5)
       diff-lcs (~> 1.0)
       ffi-yajl (>= 1.0, < 3.0)
+      license-acceptance (~> 1.0, >= 1.0.11)
       minitar (~> 0.6)
       mixlib-cli (>= 1.7, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -17,22 +17,72 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     app_conf (0.4.2)
     appbundler (0.12.5)
       mixlib-cli (>= 1.4, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-    artifactory (3.0.12)
+    artifactory (3.0.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-sdk (2.11.430)
-      aws-sdk-resources (= 2.11.430)
-    aws-sdk-core (2.11.430)
-      aws-sigv4 (~> 1.0)
+    aws-partitions (1.167.0)
+    aws-sdk-cloudtrail (1.14.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatch (1.23.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatchlogs (1.20.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.30.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.53.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.430)
-      aws-sdk-core (= 2.11.430)
+    aws-sdk-costandusagereportservice (1.13.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ec2 (1.87.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.40.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-eks (1.19.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancing (1.15.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-iam (1.23.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.21.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-rds (1.54.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.40.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sns (1.16.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.16.0)
+      aws-sdk-core (~> 3, >= 3.53.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     axiom-types (0.1.1)
@@ -41,13 +91,16 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     azure_graph_rbac (0.17.1)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_key_vault (0.17.5)
-      ms_rest_azure (~> 0.11.1)
-    azure_mgmt_network (0.23.0)
+    azure_mgmt_key_vault (0.17.4)
+      ms_rest_azure (~> 0.11.0)
+    azure_mgmt_network (0.18.8)
       ms_rest_azure (~> 0.11.1)
-    azure_mgmt_resources (0.17.8)
+    azure_mgmt_resources (0.17.5)
       ms_rest_azure (~> 0.11.1)
     backports (3.15.0)
+    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.0.1-x64-mingw32)
+    bcrypt_pbkdf (1.0.1-x86-mingw32)
     berkshelf (7.0.8)
       chef (>= 13.6.52)
       chef-config
@@ -63,68 +116,68 @@ GEM
       thor (>= 0.20)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.4)
+    builder (3.2.3)
     byebug (11.0.1)
-    chef (14.14.29)
+    chef (15.0.300)
       addressable
+      bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 14.14.29)
-      chef-zero (>= 13.0)
+      chef-config (= 15.0.300)
+      chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
       ffi (~> 1.9, >= 1.9.25)
+      ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
+      license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
       mixlib-cli (>= 1.7, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (~> 4.2)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 14.0)
+      ohai (~> 15.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
       syslog-logger (~> 1.6)
+      train-core (~> 2.0, >= 2.0.12)
+      tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (14.14.29-universal-mingw32)
+    chef (15.0.300-universal-mingw32)
       addressable
+      bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 14.14.29)
-      chef-zero (>= 13.0)
+      chef-config (= 15.0.300)
+      chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
       ffi (~> 1.9, >= 1.9.25)
+      ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
       iso8601 (~> 0.12.1)
+      license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
       mixlib-cli (>= 1.7, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (~> 4.2)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 14.0)
+      ohai (~> 15.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
       syslog-logger (~> 1.6)
+      train-core (~> 2.0, >= 2.0.12)
+      tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
       win32-certstore (~> 0.3)
@@ -134,10 +187,10 @@ GEM
       win32-mmap (~> 0.4.1)
       win32-mutex (~> 0.4.2)
       win32-process (~> 0.8.2)
-      win32-service (>= 1.0, < 3.0)
+      win32-service (>= 2.1.2, < 3.0)
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
-    chef-api (0.10.2)
+    chef-api (0.9.0)
       logify (~> 0.1)
       mime-types
     chef-apply (0.2.13)
@@ -154,71 +207,46 @@ GEM
       toml-rb
       train
       tty-spinner
-    chef-config (14.14.29)
+    chef-bin (15.0.300)
+      chef (= 15.0.300)
+    chef-config (15.0.300)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-provisioning (2.7.6)
-      cheffish (>= 4.0, < 15.0)
-      inifile (>= 2.0.2)
-      mixlib-install (>= 1.0)
-      net-scp (~> 1.0)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (> 1.2, < 3.0)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.0)
-    chef-provisioning-aws (3.0.7)
-      aws-sdk (>= 2.2.18, < 3.0)
-      chef-provisioning (>= 1.0, < 3.0)
-      retryable (~> 2.0, >= 2.0.1)
-      ubuntu_ami (~> 0.4, >= 0.4.1)
-    chef-provisioning-fog (0.26.3)
-      chef-provisioning (>= 1.0, < 3.0)
-      cheffish (>= 13.1.0, < 15.0)
-      fog-digitalocean
-      fog-joyent
-      fog-openstack
-      fog-rackspace
-      fog-scaleway
-      fog-softlayer
-      fog-xenserver
-      retryable
-      winrm-elevated
-    chef-sugar (5.1.9)
+    chef-sugar (5.0.1)
     chef-telemetry (0.1.8)
       chef-config
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
       http (~> 2.2)
-    chef-vault (4.0.1)
-    chef-zero (14.0.17)
+    chef-vault (3.4.3)
+    chef-zero (14.0.12)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
-    cheffish (14.0.13)
+    cheffish (14.0.4)
       chef-zero (~> 14.0)
       net-ssh
-    chefspec (7.4.0)
-      chef (>= 13)
-      fauxhai (>= 6.11)
+    chefspec (7.3.4)
+      chef (>= 12.16.42)
+      fauxhai (>= 4)
       rspec (~> 3.0)
-    chefstyle (0.11.2)
-      rubocop (= 0.55.0)
+    chefstyle (0.12.0)
+      rubocop (= 0.62.0)
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.5)
-    cookbook-omnifetch (0.9.0)
+    cookbook-omnifetch (0.8.1)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (3.0.2)
-      rubocop (= 0.55.0)
+    cookstyle (4.0.0)
+      rubocop (= 0.62.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
@@ -252,31 +280,32 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    domain_name (0.5.20190701)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    droplet_kit (3.5.0)
+    droplet_kit (2.9.0)
+      activesupport (> 3.0, < 6)
       faraday (~> 0.15)
       kartograph (~> 0.2.3)
       resource_kit (~> 0.1.5)
       virtus (~> 1.0.3)
+    ed25519 (1.2.4)
     equalizer (0.0.11)
-    equatable (0.6.1)
-    erubi (1.9.0)
+    equatable (0.5.0)
     erubis (2.7.0)
-    excon (0.71.1)
-    faraday (0.17.3)
+    excon (0.64.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fauxhai (6.11.0)
+    fauxhai (7.3.0)
       net-ssh
-    ffi (1.12.1)
-    ffi (1.12.1-x64-mingw32)
-    ffi (1.12.1-x86-mingw32)
-    ffi-libarchive (1.0.0)
+    ffi (1.11.1)
+    ffi (1.11.1-x64-mingw32)
+    ffi (1.11.1-x86-mingw32)
+    ffi-libarchive (0.4.6)
       ffi (~> 1.0)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
@@ -284,52 +313,26 @@ GEM
       ffi
     ffi-win32-extensions (1.0.3)
       ffi
-    ffi-yajl (2.3.3)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     filesize (0.1.1)
-    fog-aws (2.0.1)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
+    fog-aws (3.5.0)
+      fog-core (~> 2.1)
+      fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.45.0)
+    fog-core (2.1.2)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-digitalocean (0.4.0)
-      fog-core
-      fog-json
-      fog-xml
-      ipaddress (>= 0.5)
-    fog-joyent (0.0.1)
-      fog-core (~> 1.42)
-      fog-json (>= 1.0)
+      mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (0.3.10)
-      fog-core (>= 1.45, <= 2.1.0)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    fog-rackspace (0.1.6)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-scaleway (0.5.0)
-      fog-core (~> 1.42)
-      fog-json (~> 1.0)
-    fog-softlayer (1.1.4)
-      fog-core
-      fog-json
-    fog-xenserver (1.0.0)
-      fog-core
-      fog-xml
-      xmlrpc
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foodcritic (15.1.0)
+    foodcritic (16.0.0)
       cucumber-core (>= 1.3, < 4.0)
       erubis
       ffi-yajl (~> 2.0)
@@ -360,7 +363,7 @@ GEM
       signet (~> 0.7)
     gssapi (1.3.0)
       ffi (>= 1.0.1)
-    guard (2.16.1)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -384,16 +387,19 @@ GEM
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (3.9.3)
+    inspec (4.3.2)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
       hashie (~> 3.4)
       htmlentities
       json (>= 1.8, < 3.0)
+      license-acceptance (>= 0.2.13, < 2.0)
       method_source (~> 0.8)
       mixlib-log
       multipart-post
@@ -408,37 +414,41 @@ GEM
       term-ansicolor
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train (~> 1.5, >= 1.7.2)
+      train (~> 2.0)
+      train-aws (~> 0.1)
       train-habitat (~> 0.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
+    inspec-bin (4.3.2)
+      inspec (= 4.3.2)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
+    jaro_winkler (1.5.2)
     jmespath (1.4.0)
-    json (2.3.0)
-    jwt (2.2.1)
+    json (2.2.0)
+    jwt (2.2.0)
     kartograph (0.2.7)
-    kitchen-azurerm (0.15.1)
+    kitchen-azurerm (0.14.8)
       azure_mgmt_network (~> 0.18, >= 0.18.2)
       azure_mgmt_resources (~> 0.17, >= 0.17.2)
       inifile (~> 3.0, >= 3.0.0)
-      sshkey (>= 1.0.0, < 3)
-    kitchen-digitalocean (0.10.5)
-      droplet_kit (>= 2.8, < 4.0)
+      sshkey (~> 1, >= 1.0.0)
+    kitchen-digitalocean (0.10.3)
+      droplet_kit (~> 2.8)
       test-kitchen (>= 1.17, < 3)
-    kitchen-dokken (2.8.1)
+    kitchen-dokken (2.6.9)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)
-    kitchen-ec2 (2.5.0)
-      aws-sdk (~> 2)
+    kitchen-ec2 (3.0.1)
+      aws-sdk-ec2 (~> 1.0)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (>= 1.4.1, < 3)
-    kitchen-google (2.0.3)
+    kitchen-google (2.0.1)
       gcewinpass (~> 1.1)
-      google-api-client (>= 0.23.9, < 0.36.0)
+      google-api-client (~> 0.19)
       test-kitchen
     kitchen-hyperv (0.5.3)
       test-kitchen (>= 1.4, < 3)
@@ -446,9 +456,9 @@ GEM
       hashie (~> 3.4)
       inspec (>= 1.47, < 5.0)
       test-kitchen (>= 1.6, < 3)
-    kitchen-vagrant (1.6.1)
+    kitchen-vagrant (1.5.2)
       test-kitchen (>= 1.4, < 3)
-    knife-acl (1.0.6)
+    knife-acl (1.0.3)
     knife-cloud (1.2.3)
       excon (>= 0.50)
       knife-windows (>= 1.0)
@@ -461,67 +471,68 @@ GEM
       google-api-client (>= 0.19.8, < 0.25)
       knife-cloud (~> 1.2.0)
     knife-opc (0.4.1)
-    knife-push (1.1.5)
+    knife-push (1.1.2)
       chef (>= 13.0)
     knife-spork (1.7.2)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
-    knife-tidy (2.0.9)
-    knife-vsphere (3.0.1)
+    knife-tidy (2.0.1)
+    knife-vsphere (2.1.3)
       chef-vault (>= 2.6.0)
       filesize (~> 0.1.1)
-      knife-windows (< 4)
+      knife-windows (~> 1.0)
       netaddr (~> 1.5)
       rbvmomi (~> 1.8)
     knife-windows (1.9.6)
       winrm (~> 2.1)
       winrm-elevated (~> 1.0)
     libyajl2 (1.2.0)
-    license-acceptance (1.0.13)
+    license-acceptance (1.0.12)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     lockfile (2.1.3)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     logify (0.2.0)
-    lumberjack (1.1.1)
-    memoist (0.16.2)
+    lumberjack (1.0.13)
+    memoist (0.16.0)
     method_source (0.9.2)
-    mime-types (3.3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
-    minitar (0.9)
+    minitar (0.8)
     minitest (5.10.3)
-    mixlib-archive (1.0.5)
+    mixlib-archive (1.0.1)
       mixlib-log
-    mixlib-archive (1.0.5-universal-mingw32)
+    mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
-    mixlib-cli (2.1.5)
-    mixlib-config (3.0.6)
+    mixlib-cli (2.0.6)
+    mixlib-config (3.0.1)
       tomlrb
-    mixlib-install (3.11.26)
+    mixlib-install (3.11.18)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (3.0.8)
+    mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.2.12)
+    mixlib-versioning (1.2.7)
     molinillo (0.6.6)
-    ms_rest (0.7.5)
+    ms_rest (0.7.4)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       timeliness (~> 0.3.10)
@@ -531,38 +542,36 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.4)
       unf_ext (= 0.0.7.2)
-    multi_json (1.14.1)
+    multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    necromancer (0.5.1)
+    necromancer (0.4.0)
     nenv (0.3.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
     netaddr (1.5.1)
-    nokogiri (1.10.7)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.7-x64-mingw32)
+    nokogiri (1.10.3-x64-mingw32)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.7-x86-mingw32)
+    nokogiri (1.10.3-x86-mingw32)
       mini_portile2 (~> 2.4.0)
     nori (2.6.0)
-    notiffany (0.1.3)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.15.0)
-      faraday (>= 0.9)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.14.0)
-      chef-config (>= 12.8, < 15)
+    ohai (15.0.35)
+      chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -580,13 +589,13 @@ GEM
       uuidtools
     os (1.0.1)
     paint (1.0.1)
-    parallel (1.19.1)
-    parser (2.7.0.2)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
-    pastel (0.7.3)
-      equatable (~> 0.6)
-      tty-color (~> 0.5)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
     plist (3.5.0)
     polyglot (0.3.5)
     powerpack (0.1.2)
@@ -603,15 +612,15 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (3.0.3)
     r18n-core (3.2.0)
     r18n-desktop (3.2.0)
       r18n-core (= 3.2.0)
-    rack (2.1.1)
+    rack (2.0.7)
     rainbow (3.0.0)
-    rake (12.3.0)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.1)
+    rb-inotify (0.10.0)
       ffi (~> 1.0)
     rb-readline (0.5.5)
     rbvmomi (1.13.0)
@@ -629,86 +638,74 @@ GEM
       addressable (>= 2.3.6, < 3.0.0)
     retriable (3.1.2)
     retryable (2.0.4)
-    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)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.55.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.62.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-prof (1.1.0)
-    ruby-prof (1.1.0-x64-mingw32)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (~> 1.4.0)
+    ruby-prof (0.17.0)
+    ruby-progressbar (1.10.0)
     ruby-shadow (2.5.0)
+    ruby_dep (1.5.0)
     rubyntlm (0.6.2)
-    rubyzip (1.3.0)
+    rubyzip (1.2.3)
     rufus-lru (1.1.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semverse (3.0.0)
-    serverspec (2.41.5)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
     shellany (0.0.1)
-    signet (0.12.0)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     slop (3.6.0)
-    solve (4.0.3)
+    solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.82.7)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
-    sshkey (2.0.0)
+    sshkey (1.9.0)
     sslshake (1.3.0)
-    stove (7.1.5)
+    stove (7.1.0)
       chef-api (~> 0.5)
       logify (~> 0.2)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    structured_warnings (0.4.0)
-    sync (0.5.0)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
+      unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
+    structured_warnings (0.3.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (1.25.0)
+    test-kitchen (2.2.5)
+      bcrypt_pbkdf (~> 1.0)
+      ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (>= 1.1, < 3.0)
-      net-ssh (>= 2.9, < 5.0)
+      net-ssh (>= 2.9, < 6.0)
       net-ssh-gateway (>= 1.2, < 3.0)
       thor (~> 0.19)
       winrm (~> 2.0)
@@ -717,13 +714,12 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timeliness (0.3.10)
-    tins (1.24.0)
-      sync
-    toml-rb (2.0.1)
+    timers (4.3.0)
+    tins (1.20.2)
+    toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.9)
-    train (1.7.6)
-      aws-sdk (~> 2)
+    tomlrb (1.2.8)
+    train (2.1.7)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
@@ -732,46 +728,75 @@ GEM
       googleauth (~> 0.6.6)
       inifile
       json (>= 1.8, < 3.0)
-      mixlib-shellout (>= 2.0)
-      net-scp (~> 1.2)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 3.0)
       net-ssh (>= 2.9, < 6.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    train-habitat (0.2.13)
+    train-aws (0.1.0)
+      aws-sdk-cloudtrail (~> 1.8)
+      aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchlogs (~> 1.13)
+      aws-sdk-configservice (~> 1.21)
+      aws-sdk-core (~> 3.0)
+      aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-ec2 (~> 1.70)
+      aws-sdk-ecs (~> 1.30)
+      aws-sdk-eks (~> 1.9)
+      aws-sdk-elasticloadbalancing (~> 1.8)
+      aws-sdk-iam (~> 1.13)
+      aws-sdk-kms (~> 1.13)
+      aws-sdk-rds (~> 1.43)
+      aws-sdk-s3 (~> 1.30)
+      aws-sdk-sns (~> 1.9)
+      aws-sdk-sqs (~> 1.10)
+      train (~> 2.0)
+    train-core (2.1.7)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    train-habitat (0.1.1)
+      train (>= 1.7.5, < 3.0)
     treetop (1.6.10)
       polyglot (~> 0.3)
-    trollop (2.9.10)
-    tty-box (0.5.0)
+    trollop (2.9.9)
+    tty-box (0.3.0)
       pastel (~> 0.7.2)
-      strings (~> 0.1.6)
-      tty-cursor (~> 0.7)
-    tty-color (0.5.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.20.0)
-      necromancer (~> 0.5.0)
+      strings (~> 0.1.4)
+      tty-cursor (~> 0.6.0)
+    tty-color (0.4.3)
+    tty-cursor (0.6.1)
+    tty-prompt (0.18.1)
+      necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
+      timers (~> 4.0)
+      tty-cursor (~> 0.6.0)
+      tty-reader (~> 0.5.0)
+    tty-reader (0.5.0)
+      tty-cursor (~> 0.6.0)
+      tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    tty-spinner (0.9.2)
-      tty-cursor (~> 0.7)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
+    tty-screen (0.6.5)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
+    tty-table (0.10.0)
+      equatable (~> 0.5.0)
+      necromancer (~> 0.4.0)
       pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
+      strings (~> 0.1.0)
+      tty-screen (~> 0.6.4)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     uber (0.1.0)
-    ubuntu_ami (0.4.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
     unf_ext (0.0.7.2-x64-mingw32)
     unf_ext (0.0.7.2-x86-mingw32)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.4.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     virtus (1.0.5)
@@ -780,7 +805,7 @@ GEM
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.4.0)
+    win32-certstore (0.3.0)
       ffi
       mixlib-shellout
     win32-dir (0.5.1)
@@ -808,28 +833,26 @@ GEM
     windows-pr (1.2.6)
       win32-api (>= 1.4.5)
       windows-api (>= 0.4.0)
-    winrm (2.3.4)
+    winrm (2.3.2)
       builder (>= 2.1.2)
-      erubi (~> 1.8)
+      erubis (~> 2.7)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.2)
-      erubi (~> 1.8)
+    winrm-elevated (1.1.1)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.3)
-      erubi (~> 1.8)
+    winrm-fs (1.3.2)
+      erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
-    wisper (2.0.1)
-    wmi-lite (1.0.5)
-    xmlrpc (0.3.0)
-    yard (0.9.24)
+    wisper (2.0.0)
+    wmi-lite (1.0.2)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -837,41 +860,41 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  appbundler (< 0.13)
+  appbundler
   artifactory
-  berkshelf (>= 7.0.8)
+  bcrypt_pbkdf
+  berkshelf (>= 7.0.5)
   bundler
-  chef (= 14.14.29)
+  chef (= 15.0.300)
   chef-apply
+  chef-bin (= 15.0.300)
   chef-dk!
-  chef-provisioning (>= 2.7.1)
-  chef-provisioning-aws (>= 3.0.2)
-  chef-provisioning-fog (>= 0.26.1)
   chef-sugar
-  chef-telemetry (~> 0.1)
   chef-vault (>= 3.4.1)
   cheffish (>= 14.0.1)
-  chefspec (>= 7.3.0, < 8.0.0)
+  chefspec (>= 7.3.0)
   chefstyle
-  cookstyle (~> 3.0)
+  cookstyle (~> 4.0)
   cucumber
   dco
   dep-selector-libgecode
-  dep_selector (>= 1.0.0)
-  fauxhai (~> 6.11)
-  ffi-libarchive (>= 0.4.0)
+  dep_selector
+  ed25519
+  fauxhai (~> 7.0)
+  ffi-libarchive
   ffi-rzmq-core
-  foodcritic (< 16)
+  foodcritic (>= 16.0)
   guard
-  inspec (~> 3.9)
+  inspec (~> 4.3)
+  inspec-bin (~> 4.3)
   kitchen-azurerm (>= 0.14)
   kitchen-digitalocean (>= 0.10.0)
   kitchen-dokken (>= 2.6.7)
-  kitchen-ec2 (>= 2.3, < 3.0)
+  kitchen-ec2 (>= 3.0, < 4)
   kitchen-google (>= 2.0.0)
   kitchen-hyperv (>= 0.5.1)
-  kitchen-inspec (>= 1.0, < 1.2.0)
-  kitchen-vagrant (>= 1.6)
+  kitchen-inspec (>= 1.0)
+  kitchen-vagrant (>= 1.4)
   knife-acl (>= 1.0.3)
   knife-ec2 (>= 0.19.10)
   knife-google (>= 3.3.3)
@@ -879,7 +902,7 @@ DEPENDENCIES
   knife-push
   knife-spork
   knife-tidy (>= 1.2.0)
-  knife-vsphere (>= 3.0.1, < 4.0)
+  knife-vsphere (>= 2.1.1)
   knife-windows (>= 1.9.1)
   listen
   minitest (<= 5.10.3)
@@ -888,23 +911,24 @@ DEPENDENCIES
   mixlib-versioning
   net-ssh (>= 4.2.0)
   nokogiri
-  ohai (~> 14.0)
+  ohai (>= 14)
   opscode-pushy-client (>= 2.99)
   pry
   pry-byebug
   pry-remote
   pry-stack_explorer
-  rake (<= 12.3.0)
+  rake (<= 12.3.2)
   rb-readline
   rdoc (<= 6.0.1)
   rdp-ruby-wmi
   rspec-core (~> 3.0)
   rspec-expectations (~> 3.0)
   rspec-mocks (~> 3.0)
+  rubocop
   ruby-prof
   ruby-shadow
   stove
-  test-kitchen (>= 1.23.0, < 2)
+  test-kitchen (>= 1.23)
   win32-api
   win32-dir
   win32-event