tfwrapper 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a99a40047a490174b186e5bf5c6b58dedea114
-  data.tar.gz: f64131d4e1a68fae63dc3b86465b64480a3edae3
+  metadata.gz: c135173a4a6dbe8d20af3194d7709464d55f1cae
+  data.tar.gz: 1e8916123d75be89c7cac726147245412a334fe3
 SHA512:
-  metadata.gz: 7e3d6202be5a238dc9a358ed190aa6debbef62e5f56cac5b365935afe407a700e46a3166e24af34640f00a21667dd34adec292bb1c7125fe82129da98eefeeed
-  data.tar.gz: 1b4b83ca1147ae1955d3e571e087467f792db7107b76c2d9f421ff9fd37dd4512860ca719b32a7fd8b56e8861b1785ff45b439eea01faa454e4169b0dd1b040c
+  metadata.gz: 3e2429724f5641075d767180b3bb62f738188604a94d8bd435279c979773469c07fcb78672d8c291a570efdab38610d7492db9074aeab0c4e4d80c3573f8ecae
+  data.tar.gz: 69fbef7e6e4daf1ff99136bc9aad1963edb3f5ad86d3adcff88b589b4094c17874e9bf324b5a3b83cd2b0afff2407a178bc9c7b7ea20f3aff1d38c79f9b07be6

data/ChangeLog.md

@@ -1,3 +1,7 @@
+Version 0.5.1
+
+  - Fix bug where terraform plan errors were suppressed if a plan run with landscape support enabled exited non-zero.
+
 Version 0.5.0
 
   - Add support for using terraform_landscape gem, if present, to reformat plan output; see README for usage.

data/README.md

@@ -44,7 +44,7 @@ with 1.9.3 is simply too high to justify.
 Add to your ``Gemfile``:
 
 ```ruby
-gem 'tfwrapper', '~> 0.5.0'
+gem 'tfwrapper', '~> 0.5.1'
 ```
 
 ### Supported Terraform Versions

data/lib/tfwrapper/raketasks.rb

@@ -404,6 +404,8 @@ module TFWrapper
       end
       # end exponential backoff
       unless status.zero?
+        # if we weren't streaming output, send it now
+        STDERR.puts out_err unless stream_type == :stream
         raise StandardError, "Errors have occurred executing: '#{cmd}' " \
           "(exited #{status})"
       end

data/lib/tfwrapper/version.rb

@@ -4,5 +4,5 @@ module TFWrapper
   # version of the Gem/module; used in the gemspec and in messages.
   # NOTE: When updating this, also update the version in the "Installation"
   # section of README.md
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/acceptance/acceptance_spec.rb

@@ -922,6 +922,34 @@ describe 'tfwrapper' do
           end
         end
       end
+      context 'when terraform fails' do
+        describe 'failing_tf:plan' do
+          before(:all) do
+            @out_err, @ecode = Open3.capture2e(
+              'timeout -k 60 45 bundle exec rake failing_tf:plan',
+              chdir: @fixturepath
+            )
+            @varpath = File.join(@fixturepath, 'failing_build.tfvars.json')
+          end
+          after(:all) do
+            File.delete(@varpath) if File.file?(@varpath)
+          end
+          it 'does not time out' do
+            expect(@ecode.exitstatus).to_not eq(124)
+            expect(@ecode.exitstatus).to_not eq(137)
+          end
+          it 'exits 1' do
+            expect(@ecode.exitstatus).to eq(1)
+          end
+          it 'returns the terraform output' do
+            expected = clean_tf_plan_output(
+              File.read(File.join(@fixturepath, 'when_terraform_fails.out')),
+              latest_tf_ver, @fixturepath
+            )
+            expect(@out_err.strip).to eq(expected.strip)
+          end
+        end
+      end
     end
   end
 end

data/spec/fixtures/landscapeTest/Rakefile

@@ -30,3 +30,9 @@ TFWrapper::RakeTasks.install_tasks(
   namespace_prefix: 'lines',
   landscape_progress: :lines
 )
+
+TFWrapper::RakeTasks.install_tasks(
+  'failingTerraform/',
+  namespace_prefix: 'failing',
+  landscape_progress: :dots
+)

data/spec/fixtures/landscapeTest/failingTerraform/main.tf

@@ -0,0 +1,28 @@
+terraform {
+  required_version = "> 0.9.0"
+  backend "consul" {
+    address = "127.0.0.1:8500"
+    path    = "terraform/landscapeTestFailure"
+  }
+}
+
+provider "consul" {
+  address = "127.0.0.1:8500"
+  version = "~> 1.0"
+}
+
+locals {
+  keys = {
+    foo = "foo2val"
+    bar = "bar2val"
+    baz = "baz2val"
+  }
+}
+
+variable "foo" { default = "bar" }
+
+resource "consul_key_prefix" "landscapeTest" {
+  invalid_param = "whoCares"
+}
+
+output "foo_variable" { value = "${var.foo}" }

data/spec/fixtures/landscapeTest/when_terraform_fails.out

@@ -0,0 +1,67 @@
+Terraform v0.11.2
+
+Your version of Terraform is out of date! The latest version
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
+terraform_runner command: 'terraform init -input=false' (in /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest/failingTerraform)
+Running with: Terraform v0.11.2
+
+Your version of Terraform is out of date! The latest version
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
+
+Initializing the backend...
+
+Successfully configured the backend "consul"! Terraform will automatically
+use this backend unless the backend configuration changes.
+
+Initializing provider plugins...
+- Checking for available provider plugins on https://releases.hashicorp.com...
+- Downloading plugin for provider "consul" (1.0.0)...
+
+Terraform has been successfully initialized!
+
+You may now begin working with Terraform. Try running "terraform plan" to see
+any changes that are required for your infrastructure. All Terraform commands
+should now work.
+
+If you ever set or change modules or backend configuration for Terraform,
+rerun this command to reinitialize your working directory. If you forget, other
+commands will detect it and remind you to do so if necessary.
+terraform_runner command 'terraform init -input=false' finished and exited 0
+Terraform vars written to: /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest/failing_build.tfvars.json
+terraform_runner command: 'terraform plan -var-file /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest/failing_build.tfvars.json' (in /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest/failingTerraform)
+Terraform vars:
+............
+Error: consul_key_prefix.landscapeTest: "path_prefix": required field is not set
+
+
+
+Error: consul_key_prefix.landscapeTest: "subkeys": required field is not set
+
+
+
+Error: consul_key_prefix.landscapeTest: : invalid or unknown key: invalid_param
+
+
+rake aborted!
+StandardError: Errors have occurred executing: 'terraform plan -var-file /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest/failing_build.tfvars.json' (exited 1)
+/home/jantman/manheim/git/github_dot_com/tfwrapper/lib/tfwrapper/raketasks.rb:409:in `terraform_runner'
+/home/jantman/manheim/git/github_dot_com/tfwrapper/lib/tfwrapper/raketasks.rb:202:in `block (2 levels) in install_plan'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `load'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `kernel_load'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:28:in `run'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli.rb:424:in `exec'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/command.rb:27:in `run'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/invocation.rb:126:in `invoke_command'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor.rb:387:in `dispatch'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli.rb:27:in `dispatch'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/base.rb:466:in `start'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/cli.rb:18:in `start'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/exe/bundle:30:in `block in <top (required)>'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/lib/bundler/friendly_errors.rb:122:in `with_friendly_errors'
+/home/jantman/.rvm/gems/ruby-2.4.1/gems/bundler-1.16.1/exe/bundle:22:in `<top (required)>'
+/home/jantman/.rvm/gems/ruby-2.4.1/bin/bundle:23:in `load'
+/home/jantman/.rvm/gems/ruby-2.4.1/bin/bundle:23:in `<main>'
+/home/jantman/.rvm/gems/ruby-2.4.1/bin/ruby_executable_hooks:15:in `eval'
+/home/jantman/.rvm/gems/ruby-2.4.1/bin/ruby_executable_hooks:15:in `<main>'
+Tasks: TOP => failing_tf:plan
+(See full trace by running task with --trace)

data/spec/fixtures/landscapeTest/with_landscape_dots.out

@@ -1,12 +1,12 @@
 Terraform v0.11.2
 
 Your version of Terraform is out of date! The latest version
-is 0.11.5. You can update by downloading from www.terraform.io/downloads.html
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
 terraform_runner command: 'terraform init -input=false' (in /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest)
 Running with: Terraform v0.11.2
 
 Your version of Terraform is out of date! The latest version
-is 0.11.5. You can update by downloading from www.terraform.io/downloads.html
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
 
 Initializing the backend...
 
@@ -43,4 +43,3 @@ Terraform vars:
                     }
 
 Plan: 0 to add, 1 to change, 0 to destroy.
-

data/spec/fixtures/landscapeTest/with_landscape_lines.out

@@ -1,12 +1,12 @@
 Terraform v0.11.2
 
 Your version of Terraform is out of date! The latest version
-is 0.11.5. You can update by downloading from www.terraform.io/downloads.html
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
 terraform_runner command: 'terraform init -input=false' (in /home/jantman/manheim/git/github_dot_com/tfwrapper/spec/fixtures/landscapeTest)
 Running with: Terraform v0.11.2
 
 Your version of Terraform is out of date! The latest version
-is 0.11.5. You can update by downloading from www.terraform.io/downloads.html
+is %%TF_LATEST_VER%%. You can update by downloading from www.terraform.io/downloads.html
 
 Initializing the backend...
 
@@ -68,4 +68,3 @@ terraform_runner command 'terraform plan -var-file /home/jantman/manheim/git/git
                     }
 
 Plan: 0 to add, 1 to change, 0 to destroy.
-

data/spec/unit/raketasks_spec.rb

@@ -1306,6 +1306,18 @@ describe TFWrapper::RakeTasks do
       expect { subject.terraform_runner('foo') }
         .to raise_error('Errors have occurred executing: \'foo\' (exited 1)')
     end
+    it 'prints output to STDERR if plan exits non-zero and not :stream' do
+      allow(TFWrapper::Helpers).to receive(:run_cmd_stream_output)
+        .and_return(['myoutput', 1])
+      expect(TFWrapper::Helpers).to receive(:run_cmd_stream_output).once
+        .with('foo', 'tfdir', progress: :dots)
+      expect(STDERR).to receive(:puts).once
+        .with('terraform_runner command: \'foo\' (in tfdir)')
+      expect(STDERR).to receive(:puts).once
+        .with('myoutput')
+      expect { subject.terraform_runner('foo', progress: :dots) }
+        .to raise_error('Errors have occurred executing: \'foo\' (exited 1)')
+    end
     it 'raises an error if the progress option is invalid' do
       allow(TFWrapper::Helpers).to receive(:run_cmd_stream_output)
         .and_return(['', 1])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfwrapper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - jantman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retries
@@ -367,8 +367,10 @@ files:
 - spec/acceptance/consulserver.rb
 - spec/fixtures/Rakefile
 - spec/fixtures/landscapeTest/Rakefile
+- spec/fixtures/landscapeTest/failingTerraform/main.tf
 - spec/fixtures/landscapeTest/main.tf
 - spec/fixtures/landscapeTest/state.json
+- spec/fixtures/landscapeTest/when_terraform_fails.out
 - spec/fixtures/landscapeTest/with_landscape_default.out
 - spec/fixtures/landscapeTest/with_landscape_dots.out
 - spec/fixtures/landscapeTest/with_landscape_lines.out
@@ -406,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rake tasks for running Hashicorp Terraform sanely
@@ -416,8 +418,10 @@ test_files:
 - spec/acceptance/consulserver.rb
 - spec/fixtures/Rakefile
 - spec/fixtures/landscapeTest/Rakefile
+- spec/fixtures/landscapeTest/failingTerraform/main.tf
 - spec/fixtures/landscapeTest/main.tf
 - spec/fixtures/landscapeTest/state.json
+- spec/fixtures/landscapeTest/when_terraform_fails.out
 - spec/fixtures/landscapeTest/with_landscape_default.out
 - spec/fixtures/landscapeTest/with_landscape_dots.out
 - spec/fixtures/landscapeTest/with_landscape_lines.out