tfwrapper 0.2.0.beta1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d770015f26d1cc19424567299a4cf0d300c7c9d
-  data.tar.gz: 682aecc64e4c300ff15140221f7b69b47a7042d1
+  metadata.gz: 546f4a0d5cfe06c3e1606071f6c09c74752d6ef0
+  data.tar.gz: 52178cde8c11eed2bed48df05c086ef9517d62c6
 SHA512:
-  metadata.gz: 0501b6c78f2c23afc807ab5f2942798929d177fdfd07230504135c5470360655bd5705c6b4086977b763f6337d0a5dc28d997c816d78519e1b0bef8c1243db4c
-  data.tar.gz: 2361518650e15fef68dab14983345195935b8a46bdd2fd88dc1c8a70813140a5f43ba57781efed2a0ce79e79867dda1e950e340bfe8e51d47feacf1e381ef449
+  metadata.gz: 296ea36c9f2c02ebe4fed3b94bd69f3e47bb31f938980e8b96ff7d2528e1b2db63d9d9934394cb2a3fdb83bda0507cdaa238ec6425fe8830d4466c6097704fce
+  data.tar.gz: 4d2ac178cdd25438debf5add32f007f76d1ca99b23d04dfa29e26d90ef1d819c8ceb6172e6f4c93e09893daa1ca02ccb4fa2ae2dd1e70d9cab09b79baa0281c1

data/ChangeLog.md

@@ -1,3 +1,7 @@
-Version 0.1.0
+Version 0.2.0
 
   - initial release (migrated from previous internal/private gem)
+
+Version 0.1.0
+
+  - no working public release

data/README.md

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

data/lib/tfwrapper/version.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module TFWrapper
-  # version of the Gem/module; used in the gemspec and in messages
-  VERSION = '0.2.0.beta1'
+  # 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.2.0'
 end

data/spec/acceptance/acceptance_spec.rb

@@ -120,7 +120,10 @@ describe 'tfwrapper' do
       )
       ENV['FOO'] = 'fooval'
     end
-    after(:all) { ENV.delete('FOO') }
+    after(:all) do
+      ENV.delete('FOO')
+      ENV.delete('TFSUFFIX')
+    end
     describe 'rake -T' do
       before(:all) do
         @out_err, @ecode = Open3.capture2e(
@@ -155,8 +158,69 @@ describe 'tfwrapper' do
         expect(@out_err).to include('rake tf:write_tf_vars')
       end
     end
-    describe 'tf:apply' do
+    describe 'tf:apply foo' do
+      before(:all) do
+        Diplomat::Kv.get('/', keys: true).each { |k| Diplomat::Kv.delete(k) }
+        ENV['TFSUFFIX'] = 'foo'
+        @out_err, @ecode = Open3.capture2e(
+          'timeout -k 60 45 bundle exec rake tf:apply',
+          chdir: @fixturepath
+        )
+        @varpath = File.join(@fixturepath, '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 zero' do
+        expect(@ecode.exitstatus).to eq(0)
+      end
+      it 'uses the correct Terraform version' do
+        expect(@out_err).to include("Terraform v#{TF_VERSION}")
+      end
+      it 'runs apply correctly and succeeds' do
+        expect(@out_err)
+          .to include('terraform_runner command: \'terraform apply -var-file')
+        expect(@out_err).to include('consul_keys.testTwo: Creating...')
+        expect(@out_err).to include(
+          'Apply complete! Resources: 1 added, 0 changed, 0 destroyed.'
+        )
+        expect(@out_err).to include(
+          "Outputs:\n\nbar_variable = barval\nfoo_variable = fooval"
+        )
+      end
+      it 'writes the vars file' do
+        expect(File.file?(@varpath)).to be(true)
+        c = File.open(@varpath, 'r').read
+        expect(JSON.parse(c))
+          .to eq('foo' => 'fooval', 'bar' => 'barval')
+      end
+      it 'sets the consul keys' do
+        expect(Diplomat::Kv.get('testTwo/foo')).to eq('fooval')
+        expect(Diplomat::Kv.get('testTwo/bar')).to eq('barval')
+      end
+      it 'writes remote state to consul' do
+        state = JSON.parse(Diplomat::Kv.get('terraform/testTwo/foo'))
+        expect(state['version']).to eq(3)
+        expect(state['terraform_version']).to eq(TF_VERSION)
+        expect(state['serial']).to eq(1)
+        expect(state['modules'].length).to eq(1)
+        expect(state['modules'][0]['outputs']['foo_variable']['value'])
+          .to eq('fooval')
+        expect(state['modules'][0]['outputs']['bar_variable']['value'])
+          .to eq('barval')
+        expect(state['modules'][0]['resources'])
+          .to include('consul_keys.testTwo')
+        expect(state['modules'][0]['resources'].length).to eq(1)
+      end
+    end
+    describe 'tf:apply bar' do
       before(:all) do
+        Diplomat::Kv.get('/', keys: true).each { |k| Diplomat::Kv.delete(k) }
+        ENV['TFSUFFIX'] = 'bar'
         @out_err, @ecode = Open3.capture2e(
           'timeout -k 60 45 bundle exec rake tf:apply',
           chdir: @fixturepath
@@ -198,7 +262,7 @@ describe 'tfwrapper' do
         expect(Diplomat::Kv.get('testTwo/bar')).to eq('barval')
       end
       it 'writes remote state to consul' do
-        state = JSON.parse(Diplomat::Kv.get('terraform/testTwo'))
+        state = JSON.parse(Diplomat::Kv.get('terraform/testTwo/bar'))
         expect(state['version']).to eq(3)
         expect(state['terraform_version']).to eq(TF_VERSION)
         expect(state['serial']).to eq(1)

data/spec/fixtures/testTwo/Rakefile

@@ -4,6 +4,9 @@ require 'tfwrapper/raketasks'
 
 TFWrapper::RakeTasks.install_tasks(
   'foo/bar',
+  backend_config: {
+    'path' => "terraform/testTwo/#{ENV['TFSUFFIX']}"
+  },
   tf_vars_from_env: { 'foo' => 'FOO' },
   tf_extra_vars: { 'bar' => 'barval' }
 )

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

@@ -2,7 +2,6 @@ terraform {
   required_version = "> 0.9.0"
   backend "consul" {
     address = "127.0.0.1:8500"
-    path    = "terraform/testTwo"
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfwrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta1
+  version: 0.2.0
 platform: ruby
 authors:
 - jantman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retries
@@ -393,9 +393,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2