tfctl 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a1d287bce54f0203c80b4814f67ddb3d5f38319796a185a69ccf1fe1b65f02
-  data.tar.gz: 924e81046fde7a921f66959893429c10fbcffd8a3f32e1b6257cde2935c1b5d1
+  metadata.gz: 44d5ce50b154467e2d5af92c7cc2e6158e98a9985b996bede69bbc17123681bf
+  data.tar.gz: e0a491172dbe115e3430f813ad2e44351de6c1c7aa905f50ed5e2391eb928400
 SHA512:
-  metadata.gz: 044ad7209c428aa8c1f7eaf11258089ed6ce304a2943b79739ba1b8337fbd6487f4cda758c73acfc9de35f17fc272ef98d74fe64c274ea4d5e0112bc1749329b
-  data.tar.gz: 22a221bb105a66c5b9512a604886eb458ff1ec2876ee8d3599f7c6c0cc5e6abb5fafd0d47aa2cd61fbc979b0ba5ca33a8f18a47a5afacfd27515ea5e333f0868
+  metadata.gz: b197b8eddde4e68bfde3a8ac7f78c9b873319b4f3d22677a1d0807b5af3a13aac9c9b16716f4fd8080f4a0c15d81e535b545d05a055cd21653c16cb0e04417b1
+  data.tar.gz: acfe2b108be56c12b5709c29b3e6ddfdfd8ca7d5c9a4e3d729590fb1340dc8b13a5442b07a2bc63807410ac46f4659e2a6c9f78d43aa549337a4e01a4f831c9c

data/lib/tfctl/executor.rb

@@ -41,18 +41,22 @@ module Tfctl
             # Create the command
             exec = [cmd] + [subcmd] + args
 
-            # Set environment variables for Terraform
-            env = {
-                'TF_INPUT'           => '0',
+            # Copy TF_* variables from process environment, but
+            # override those based on the following hash:
+            enforced_terraform_environment = {
                 'CHECKPOINT_DISABLE' => '1',
+                'TF_INPUT'           => '0',
                 'TF_IN_AUTOMATION'   => 'true',
-                # 'TF_LOG'             => 'TRACE'
             }
 
+            terraform_env = ENV.keep_if do |variable_name|
+                variable_name.start_with?('TF_')
+            end.merge(enforced_terraform_environment)
+
             log.debug "#{account_name}: Executing: #{exec.shelljoin}"
 
             FileUtils.cd path
-            Open3.popen3(env, exec.shelljoin) do |stdin, stdout, stderr, wait_thr|
+            Open3.popen3(terraform_env, exec.shelljoin) do |stdin, stdout, stderr, wait_thr|
                 stdin.close_write
 
                 # capture stdout and stderr in separate threads to prevent deadlocks

data/lib/tfctl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tfctl
-    VERSION = '1.1.1'
+    VERSION = '1.2.1'
 end

data/tfctl.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
     spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
     spec.require_paths = ['lib']
 
+    spec.required_ruby_version = '>= 2.5.0'
+
     # Think when adding new dependencies.  Is it really necessary?
     # "The things you own end up owning you" etc.
     spec.add_dependency 'aws-sdk-organizations', '~> 1.40'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfctl
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Wasilczuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-organizations
@@ -164,15 +164,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Terraform wrapper for managing multi-account AWS infrastructures