tfwrapper 0.4.1 → 0.6.2

data/spec/fixtures/landscapeTest/with_landscape_dots.out

@@ -0,0 +1,45 @@
+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 %%FIXTUREPATH%%)
+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: %%FIXTUREPATH%%/dots_build.tfvars.json
+terraform_runner command: 'terraform plan -var-file %%FIXTUREPATH%%/dots_build.tfvars.json' (in %%FIXTUREPATH%%)
+Terraform vars:
+..........................terraform_runner command 'terraform plan -var-file %%FIXTUREPATH%%/dots_build.tfvars.json' finished and exited 0
+
+~ consul_key_prefix.landscapeTest
+    subkeys.foo:   {
+                   -  "bar": "barval",
+                   -  "baz": "bazval",
+                   -  "foo": "fooval"
+                   +  "bar": "bar2val",
+                   +  "baz": "baz2val",
+                   +  "foo": "foo2val"
+                    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.

data/spec/fixtures/landscapeTest/with_landscape_lines.out

@@ -0,0 +1,70 @@
+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 %%FIXTUREPATH%%)
+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: %%FIXTUREPATH%%/lines_build.tfvars.json
+terraform_runner command: 'terraform plan -var-file %%FIXTUREPATH%%/lines_build.tfvars.json' (in %%FIXTUREPATH%%)
+Terraform vars:
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+terraform_runner command 'terraform plan -var-file %%FIXTUREPATH%%/lines_build.tfvars.json' finished and exited 0
+~ consul_key_prefix.landscapeTest
+    subkeys.foo:   {
+                   -  "bar": "barval",
+                   -  "baz": "bazval",
+                   -  "foo": "fooval"
+                   +  "bar": "bar2val",
+                   +  "baz": "baz2val",
+                   +  "foo": "foo2val"
+                    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.

data/spec/fixtures/landscapeTest/with_landscape_stream.out

@@ -0,0 +1,71 @@
+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 %%FIXTUREPATH%%)
+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: %%FIXTUREPATH%%/stream_build.tfvars.json
+terraform_runner command: 'terraform plan -var-file %%FIXTUREPATH%%/stream_build.tfvars.json' (in %%FIXTUREPATH%%)
+Terraform vars:
+Refreshing Terraform state in-memory prior to plan...
+The refreshed state will be used to calculate this plan, but will not be
+persisted to local or remote state storage.
+
+consul_key_prefix.landscapeTest: Refreshing state... (ID: landscapeTest/)
+
+------------------------------------------------------------------------
+
+An execution plan has been generated and is shown below.
+Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  ~ consul_key_prefix.landscapeTest
+      subkeys.foo: "{\"bar\":\"barval\",\"baz\":\"bazval\",\"foo\":\"fooval\"}" => "{\"bar\":\"bar2val\",\"baz\":\"baz2val\",\"foo\":\"foo2val\"}"
+
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+------------------------------------------------------------------------
+
+Note: You didn't specify an "-out" parameter to save this plan, so Terraform
+can't guarantee that exactly these actions will be performed if
+"terraform apply" is subsequently run.
+
+terraform_runner command 'terraform plan -var-file %%FIXTUREPATH%%/stream_build.tfvars.json' finished and exited 0
+~ consul_key_prefix.landscapeTest
+    subkeys.foo:   {
+                   -  "bar": "barval",
+                   -  "baz": "bazval",
+                   -  "foo": "fooval"
+                   +  "bar": "bar2val",
+                   +  "baz": "baz2val",
+                   +  "foo": "foo2val"
+                    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+

data/spec/fixtures/landscapeTest/without_landscape.out

@@ -0,0 +1,62 @@
+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 %%FIXTUREPATH%%)
+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: %%FIXTUREPATH%%/default_build.tfvars.json
+terraform_runner command: 'terraform plan -var-file %%FIXTUREPATH%%/default_build.tfvars.json' (in %%FIXTUREPATH%%)
+Terraform vars:
+Refreshing Terraform state in-memory prior to plan...
+The refreshed state will be used to calculate this plan, but will not be
+persisted to local or remote state storage.
+
+
+------------------------------------------------------------------------
+
+An execution plan has been generated and is shown below.
+Resource actions are indicated with the following symbols:
+  + create
+
+Terraform will perform the following actions:
+
+  + consul_key_prefix.landscapeTest
+      id:          <computed>
+      datacenter:  <computed>
+      path_prefix: "landscapeTest/"
+      subkeys.%:   "1"
+      subkeys.foo: "{\"bar\":\"bar2val\",\"baz\":\"baz2val\",\"foo\":\"foo2val\"}"
+
+
+Plan: 1 to add, 0 to change, 0 to destroy.
+
+------------------------------------------------------------------------
+
+Note: You didn't specify an "-out" parameter to save this plan, so Terraform
+can't guarantee that exactly these actions will be performed if
+"terraform apply" is subsequently run.
+
+terraform_runner command 'terraform plan -var-file %%FIXTUREPATH%%/default_build.tfvars.json' finished and exited 0

data/spec/fixtures/testOne.tf

@@ -8,6 +8,7 @@ terraform {
 
 provider "consul" {
   address = "127.0.0.1:8500"
+  version = "1.0.0"
 }
 
 variable "foo" { default = "bar" }

data/spec/fixtures/testThree/bar/testThreeBar.tf

@@ -8,6 +8,7 @@ terraform {
 
 provider "consul" {
   address = "127.0.0.1:8500"
+  version = "1.0.0"
 }
 
 variable "foo" {}

data/spec/fixtures/testThree/baz/testThreeBaz.tf

@@ -8,6 +8,7 @@ terraform {
 
 provider "consul" {
   address = "127.0.0.1:8500"
+  version = "1.0.0"
 }
 
 variable "foo" {}

data/spec/fixtures/testThree/foo/testThreeFoo.tf

@@ -7,6 +7,7 @@ terraform {
 
 provider "consul" {
   address = "127.0.0.1:8500"
+  version = "1.0.0"
 }
 
 variable "foo" {}

data/spec/fixtures/testTwo/foo/bar/testTwo.tf

@@ -7,6 +7,7 @@ terraform {
 
 provider "consul" {
   address = "127.0.0.1:8500"
+  version = "1.0.0"
 }
 
 variable "foo" {}

data/spec/spec_helper.rb

@@ -4,6 +4,13 @@ require 'simplecov'
 require 'simplecov-console'
 require 'rspec_junit_formatter'
 
+begin
+  require 'terraform_landscape'
+  HAVE_LANDSCAPE = true
+rescue LoadError
+  HAVE_LANDSCAPE = false
+end
+
 ENV['CONSUL_ADDR'] ||= '127.0.0.1:8500'
 ENV['CONSUL_URL']  ||= "http://#{ENV['CONSUL_ADDR']}"
 

data/spec/unit/helpers_spec.rb

@@ -54,12 +54,91 @@ describe TFWrapper::Helpers do
         expect(Open3).to receive(:popen2e)
           .once.with('foo bar', chdir: '/foo')
         expect(STDOUT).to receive(:puts).once.with('mystdout')
+        expect(STDOUT).to_not receive(:print)
         expect($stdout).to receive(:sync=).once.with(true)
         expect($stdout).to receive(:sync=).once.with(false)
         expect(TFWrapper::Helpers.run_cmd_stream_output('foo bar', '/foo'))
           .to eq(['mystdout', 0])
       end
     end
+    context 'progress dots' do
+      it 'prints dots and returns output' do
+        dbl_wait_thread = double(Thread)
+        @outerrpipe_w.write('mystdout')
+        @outerrpipe_w.close
+        es = double('exitstatus', exitstatus: 0)
+        allow(dbl_wait_thread).to receive(:value).and_return(es)
+        allow($stdout).to receive(:sync).and_return(false)
+        allow($stdout).to receive(:sync=).with(true)
+        allow(Open3).to receive(:popen2e).and_yield(
+          @inpipe_w, @outerrpipe_r, dbl_wait_thread
+        )
+
+        expect(Open3).to receive(:popen2e)
+          .once.with('foo bar', chdir: '/foo')
+        expect(STDOUT).to receive(:puts).once.with('')
+        expect(STDOUT).to receive(:print).once.with('.')
+        expect($stdout).to receive(:sync=).once.with(true)
+        expect($stdout).to receive(:sync=).once.with(false)
+        expect(
+          TFWrapper::Helpers.run_cmd_stream_output(
+            'foo bar', '/foo', progress: :dots
+          )
+        ).to eq(['mystdout', 0])
+      end
+    end
+    context 'progress lines' do
+      it 'prints a dot per line and returns output' do
+        dbl_wait_thread = double(Thread)
+        @outerrpipe_w.write('mystdout')
+        @outerrpipe_w.close
+        es = double('exitstatus', exitstatus: 0)
+        allow(dbl_wait_thread).to receive(:value).and_return(es)
+        allow($stdout).to receive(:sync).and_return(false)
+        allow($stdout).to receive(:sync=).with(true)
+        allow(Open3).to receive(:popen2e).and_yield(
+          @inpipe_w, @outerrpipe_r, dbl_wait_thread
+        )
+
+        expect(Open3).to receive(:popen2e)
+          .once.with('foo bar', chdir: '/foo')
+        expect(STDOUT).to receive(:puts).once.with('.')
+        expect(STDOUT).to_not receive(:print)
+        expect($stdout).to receive(:sync=).once.with(true)
+        expect($stdout).to receive(:sync=).once.with(false)
+        expect(
+          TFWrapper::Helpers.run_cmd_stream_output(
+            'foo bar', '/foo', progress: :lines
+          )
+        ).to eq(['mystdout', 0])
+      end
+    end
+    context 'progress nil' do
+      it 'does not print anything but returns output' do
+        dbl_wait_thread = double(Thread)
+        @outerrpipe_w.write('mystdout')
+        @outerrpipe_w.close
+        es = double('exitstatus', exitstatus: 0)
+        allow(dbl_wait_thread).to receive(:value).and_return(es)
+        allow($stdout).to receive(:sync).and_return(false)
+        allow($stdout).to receive(:sync=).with(true)
+        allow(Open3).to receive(:popen2e).and_yield(
+          @inpipe_w, @outerrpipe_r, dbl_wait_thread
+        )
+
+        expect(Open3).to receive(:popen2e)
+          .once.with('foo bar', chdir: '/foo')
+        expect(STDOUT).to_not receive(:puts)
+        expect(STDOUT).to_not receive(:print)
+        expect($stdout).to receive(:sync=).once.with(true)
+        expect($stdout).to receive(:sync=).once.with(false)
+        expect(
+          TFWrapper::Helpers.run_cmd_stream_output(
+            'foo bar', '/foo', progress: nil
+          )
+        ).to eq(['mystdout', 0])
+      end
+    end
     context 'IOError' do
       it 'handles IOErrors gracefully' do
         dbl_wait_thread = double(Thread)
@@ -106,15 +185,44 @@ describe TFWrapper::Helpers do
           .to eq(["mystdout\nSTDERR\n", 23])
       end
     end
+    context 'invalid :progress option' do
+      it 'raises an error' do
+        dbl_wait_thread = double(Thread)
+        @outerrpipe_w.write('mystdout')
+        @outerrpipe_w.close
+        es = double('exitstatus', exitstatus: 0)
+        allow(dbl_wait_thread).to receive(:value).and_return(es)
+        allow($stdout).to receive(:sync).and_return(false)
+        allow($stdout).to receive(:sync=).with(true)
+        allow(Open3).to receive(:popen2e).and_yield(
+          @inpipe_w, @outerrpipe_r, dbl_wait_thread
+        )
+
+        expect(Open3).to_not receive(:popen2e)
+        expect(STDOUT).to_not receive(:puts)
+        expect($stdout).to_not receive(:sync=)
+        expect do
+          TFWrapper::Helpers.run_cmd_stream_output(
+            'foo bar', '/foo', progress: :foo
+          )
+        end.to raise_error(ArgumentError, /progress option must be one of/)
+      end
+    end
   end
   describe '#check_env_vars' do
     it 'returns nil if vars present' do
       ENV['foo'] = 'fooval'
       ENV['bar'] = 'barval'
-      expect(TFWrapper::Helpers.check_env_vars(%w[foo bar])).to be_nil
+      expect(TFWrapper::Helpers.check_env_vars(%w[foo bar], [])).to be_nil
       ENV.delete('foo')
       ENV.delete('bar')
     end
+    it 'returns nil if vars ignored' do
+      ENV['foo'] = ''
+      expect(TFWrapper::Helpers.check_env_vars(%w[foo bar], %w[foo bar]))
+        .to be_nil
+      ENV.delete('foo')
+    end
     it 'exits if not present' do
       ENV.delete('foo')
       ENV.delete('bar')
@@ -122,7 +230,7 @@ describe TFWrapper::Helpers do
         .with('ERROR: Environment variable \'foo\' must be set.')
       expect(STDOUT).to receive(:puts)
         .with('ERROR: Environment variable \'bar\' must be set.')
-      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar]) }
+      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar], %w[baz]) }
         .to raise_error StandardError, 'Missing or empty environment ' \
           'variables: ["foo", "bar"]'
     end
@@ -133,11 +241,31 @@ describe TFWrapper::Helpers do
         .with("ERROR: Environment variable 'foo' must not be empty.")
       expect(STDOUT).to receive(:puts)
         .with("ERROR: Environment variable 'bar' must not be empty.")
-      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar]) }
+      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar], %w[baz]) }
         .to raise_error StandardError, 'Missing or empty environment ' \
           'variables: ["foo", "bar"]'
       ENV.delete('foo')
       ENV.delete('bar')
     end
+    it 'exits if not present and partially ignored' do
+      ENV.delete('foo')
+      ENV.delete('bar')
+      expect(STDOUT).to receive(:puts)
+        .with('ERROR: Environment variable \'foo\' must be set.')
+      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar], %w[bar]) }
+        .to raise_error StandardError, 'Missing or empty environment ' \
+          'variables: ["foo"]'
+    end
+    it 'exits if empty and partially ignored' do
+      ENV['foo'] = ''
+      ENV['bar'] = '    '
+      expect(STDOUT).to receive(:puts)
+        .with("ERROR: Environment variable 'foo' must not be empty.")
+      expect { TFWrapper::Helpers.check_env_vars(%w[foo bar], %w[bar]) }
+        .to raise_error StandardError, 'Missing or empty environment ' \
+          'variables: ["foo"]'
+      ENV.delete('foo')
+      ENV.delete('bar')
+    end
   end
 end