Remove -check-variables. (#319)

* Remove `-check-variables`. This flag defaults to true and it will be obsolete for Terraform v0.12. * Implement specification * Document specification * Fix erroneous white space * Update version to 4.2.1 * Add entry to CHANGELOG * Update bundler to 2.0 on Travis
newcontext-oss · Jan 19, 2019 · 4065a99 · 4065a99
1 parent c814537
commit 4065a99
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 146 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ jobs:
     rvm: 2.3.4
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local gemfile ruby-2.3/Gemfile
     - bundle config --local deployment true
     - bundle config --local jobs $(nproc --ignore=1)
@@ -34,7 +34,7 @@ jobs:
     - CC_TEST_REPORTER_ID=7574433e1beed630cb9a171c688bb9e010d5028f00f7218d6e845fe138c65168
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local gemfile ruby-2.4/Gemfile
     - bundle config --local deployment true
     - bundle config --local jobs $(nproc --ignore=1)
@@ -58,7 +58,7 @@ jobs:
     rvm: '2.6'
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local deployment true
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh
@@ -78,7 +78,7 @@ jobs:
     - docker
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local gemfile ruby-2.4/Gemfile
     - bundle config --local deployment true
     - bundle config --local jobs $(nproc --ignore=1)
@@ -105,7 +105,7 @@ jobs:
     rvm: 2.4.3
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local gemfile ruby-2.4/Gemfile
     - bundle config --local deployment true
     - bundle config --local jobs $(expr $(sysctl -n hw.ncpu) - 1)
@@ -127,7 +127,7 @@ jobs:
     language: shell
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
@@ -152,7 +152,7 @@ jobs:
     - secure: BQD3quxFwkMat8deVbm4ynf1+7uG9xlVJoubCGjw26ZlcvclEC6bvBkkSKJBfnts599exjZI+03K3NC/zLj1l+frSVWtsuCN03oT1YtAiNqzodVpbOWGYhU3q67yN17KDa29AfglnVyCbB5PZAY1nt7ANJ0BWN5yDPiMky9EYRpzzh8dDixGJ7dG2T7JxvdsxZ5JRGTIk/MJQF4vcCar3ixxOUU9rv50jCk/pcHHNcHoIyiGTU4mue/YYTTfGuKtThIfheJGw5/1HnqYwKWCc3eHH0H0pN2H9p6lGLas1XqIg3Sv+98eoWNEQUjzgMdTFdbPSmi9NagxCCc9wuAKdZpdl8grTlO/2Rowd9orbGlPOhyQQ0thsqEhho0/YFxPPxU57T3pzXHm8N7+Qkyhwnko1M+ntu7e8ogVcV5s7S8Ro75ipTw9Jwn9R5k9EwGcSDggoNCScF0MbpsjH7cl54FtppitpsaMKQmVh215uPdrnhBU1epjg0dRhhuumiDQvSwqhWswFlZt/P4PZD6TM9nQpbyL94+m/+If2sn5le/IYssZRazw2qXsw/d3PNhx23BN4hLvOdRK2tHDtPSRBvC6n63SoQXeuXLbc0Ezkw3NWvN657CUJzOWvA2d1OKysggr9UlQ9CnF5ZHhy7zXy288q8fyQTO4fRwCpvwgexo=
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document --version="~>
-      1.17"
+      2.0"
     install:
     - echo $rubygems_api_key_password | gpg --output ~/.gem/credentials --passphrase-fd
       0 rubygems/credentials.gpg

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,14 @@ adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased][unreleased]
 
+## [4.2.1] - 2019-01-19
+
+### Changed
+
+- `terraform validate` is now called without `-check-variables=true`.
+  This flag already defaults to `true` and will be obsolete for
+  Terraform v0.12.
+
 ## [4.2.0] - 2018-12-29
 
 ### Added
@@ -580,7 +588,8 @@ Gandalf the Free-As-In-Beer
 
 - Initial release
 
-[unreleased]: https://github.com/newcontext/kitchen-terraform/compare/v4.2.0...HEAD
+[unreleased]: https://github.com/newcontext/kitchen-terraform/compare/v4.2.1...HEAD
+[4.2.1]: https://github.com/newcontext/kitchen-terraform/compare/v4.2.0...v4.2.1
 [4.2.0]: https://github.com/newcontext/kitchen-terraform/compare/v4.1.1...v4.2.0
 [4.1.1]: https://github.com/newcontext/kitchen-terraform/compare/v4.1.0...v4.1.1
 [4.1.0]: https://github.com/newcontext/kitchen-terraform/compare/v4.0.6...v4.1.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    kitchen-terraform (4.2.0)
+    kitchen-terraform (4.2.1)
       dry-types (~> 0.9)
       dry-validation (~> 0.10)
       inspec (~> 3.0)
@@ -30,17 +30,17 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    autoprefixer-rails (8.6.5)
+    autoprefixer-rails (9.4.5)
       execjs
-    aws-sdk (2.11.197)
-      aws-sdk-resources (= 2.11.197)
-    aws-sdk-core (2.11.197)
+    aws-sdk (2.11.208)
+      aws-sdk-resources (= 2.11.208)
+    aws-sdk-core (2.11.208)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.197)
-      aws-sdk-core (= 2.11.197)
+    aws-sdk-resources (2.11.208)
+      aws-sdk-core (= 2.11.208)
     aws-sigv4 (1.0.3)
     azure_graph_rbac (0.17.0)
       ms_rest_azure (~> 0.11.0)
@@ -56,8 +56,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
     concurrent-ruby (1.1.4)
     contracts (0.13.0)
     coolline (0.5.0)
@@ -71,7 +69,7 @@ GEM
       multi_json
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.5.0)
+    dotenv (2.6.0)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)
@@ -104,7 +102,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     equatable (0.5.0)
     erubis (2.7.0)
-    ethon (0.11.0)
+    ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     excon (0.62.0)
@@ -148,8 +146,8 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
+    guard-bundler (2.2.1)
+      bundler (>= 1.3.0, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -174,7 +172,8 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     inspec (3.2.6)
       addressable (~> 2.4)
@@ -217,24 +216,22 @@ GEM
     lumberjack (1.0.13)
     memoist (0.16.0)
     method_source (0.9.2)
-    middleman (4.2.1)
+    middleman (4.3.2)
       coffee-script (~> 2.2)
-      compass-import-once (= 1.0.5)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-cli (= 4.2.1)
-      middleman-core (= 4.2.1)
-      sass (>= 3.4.0, < 4.0)
-    middleman-autoprefixer (2.9.0)
-      autoprefixer-rails (~> 8.0)
+      middleman-cli (= 4.3.2)
+      middleman-core (= 4.3.2)
+    middleman-autoprefixer (2.10.0)
+      autoprefixer-rails (>= 9.1.4)
       middleman-core (>= 3.3.3)
-    middleman-cli (4.2.1)
+    middleman-cli (4.3.2)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.2.1)
+    middleman-core (4.3.2)
       activesupport (>= 4.2, < 5.1)
       addressable (~> 2.3)
       backports (~> 3.6)
-      bundler (~> 1.1)
+      bundler
       contracts (~> 0.13.0)
       dotenv
       erubis
@@ -243,15 +240,15 @@ GEM
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.7.0)
+      i18n (~> 0.9.0)
       listen (~> 3.0.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.13.0)
       parallel
       rack (>= 1.4.5, < 3)
-      sass (>= 3.4)
+      sassc (~> 2.0)
       servolux
-      tilt (~> 2.0)
+      tilt (~> 2.0.9)
       uglifier (~> 3.0)
     middleman-favicon-maker (4.1.0)
       favicon_maker (~> 1.3, >= 1.3.1)
@@ -273,7 +270,7 @@ GEM
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (2.0.9)
+    mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-versioning (1.2.7)
     ms_rest (0.7.3)
@@ -307,7 +304,7 @@ GEM
       tilt (>= 1.4.1, < 3)
     padrino-support (0.13.3.4)
       activesupport (>= 3.1)
-    parallel (1.12.1)
+    parallel (1.13.0)
     parslet (1.8.2)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -356,7 +353,9 @@ GEM
     rspec-support (3.8.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.2)
-    sass (3.4.25)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
     semverse (3.0.0)
     servolux (0.13.0)
     shellany (0.0.1)
@@ -377,7 +376,7 @@ GEM
       unicode_utils (~> 1.4.0)
     strings-ansi (0.1.0)
     temple (0.8.0)
-    term-ansicolor (1.7.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
@@ -504,4 +503,4 @@ RUBY VERSION
    ruby 2.6.0p0
 
 BUNDLED WITH
-   1.17.2
+   2.0.1
diff --git a/lib/kitchen/driver/terraform.rb b/lib/kitchen/driver/terraform.rb
@@ -335,7 +335,6 @@ def apply_run_get
   def apply_run_validate
     ::Kitchen::Terraform::ShellOut.run(
       command: "validate " \
-      "-check-variables=true " \
       "#{color_flag} " \
       "#{variables_flags} " \
       "#{variable_files_flags}",

diff --git a/lib/kitchen/provisioner/terraform.rb b/lib/kitchen/provisioner/terraform.rb
@@ -46,7 +46,7 @@ module ::Kitchen::Provisioner
 # ===== Validating the Terraform Root Module
 #
 #   terraform validate \
-#     -check-variables=true \
+
 #     [-no-color] \
 #     [-var=<variables.first>...] \
 #     [-var-file=<variable_files.first>...] \

diff --git a/lib/kitchen/terraform/version.rb b/lib/kitchen/terraform/version.rb
@@ -72,7 +72,7 @@ def temporarily_override(version:)
 
     # @api private
     def value
-      self.value = ::Gem::Version.new "4.2.0" if not @value
+      self.value = ::Gem::Version.new "4.2.1" if not @value
       @value
     end