add support for -var-file. Fixes #14

Author: ludoo

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.5.1]
+
+- add support for `-var-file` flag
+
 ## [1.5.0]
 
 - add an option to allow the use of targeted resources using the `-target` flag
@@ -63,7 +67,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - remove the `teardown` method
   - unify the `plan` and `plan_out` methods
 
-[Unreleased]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.5.0...HEAD
+[Unreleased]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.4.1...v1.5.0
 [1.4.1]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.3.0...v1.4.1
 [1.3.0]: https://github.com/GoogleCloudPlatform/terraform-python-testing-helper/compare/v1.2.0...v1.3.0

test/test_args.py

@@ -40,6 +40,8 @@
     ({'refresh': True}, []),
     ({'refresh': None}, []),
     ({'refresh': False}, ['-refresh=false']),
+    ({'tf_var_file': None}, []),
+    ({'tf_var_file': 'foo.tfvar'}, ['-var-file=foo.tfvar']),
 )
 
 
@@ -55,6 +57,7 @@ def test_var_args():
   assert sorted(tftest.parse_args(tf_vars={'a': 1, 'b': '["2"]'})) == sorted(
       ['-var', 'b=["2"]', '-var', 'a=1'])
 
+
 def test_targets():
-  assert tftest.parse_args(targets=['one','two']) == sorted(
-      ['-target=one','-target=two'])
+  assert tftest.parse_args(targets=['one', 'two']) == sorted(
+      ['-target=one', '-target=two'])

tftest.py

@@ -91,6 +91,8 @@ def parse_args(init_vars=None, tf_vars=None, targets=None, **kw):
     ))
   if targets:
     cmd_args += [("-target={}".format(t)) for t in targets]
+  if kw.get('tf_var_file'):
+    cmd_args.append('-var-file={}'.format(kw['tf_var_file']))
   return cmd_args
 
 
@@ -309,11 +311,11 @@ def init(self, input=False, color=False, force_copy=False, plugin_dir=None,
                           init_vars=init_vars)
     return self.execute_command('init', *cmd_args).out
 
-  def plan(self, input=False, color=False, refresh=True, tf_vars=None, targets=None, output=False):
+  def plan(self, input=False, color=False, refresh=True, tf_vars=None, targets=None, output=False, tf_var_file=None):
     "Run Terraform plan command, optionally returning parsed plan output."
     cmd_args = parse_args(input=input, color=color,
                           refresh=refresh, tf_vars=tf_vars,
-                          targets=targets)
+                          targets=targets,  tf_var_file=tf_var_file)
     if not output:
       return self.execute_command('plan', *cmd_args).out
     with tempfile.NamedTemporaryFile() as fp:
@@ -325,11 +327,11 @@ def plan(self, input=False, color=False, refresh=True, tf_vars=None, targets=Non
     except json.JSONDecodeError as e:
       raise TerraformTestError('Error decoding plan output: {}'.format(e))
 
-  def apply(self, input=False, color=False, auto_approve=True, tf_vars=None, targets=None):
+  def apply(self, input=False, color=False, auto_approve=True, tf_vars=None, targets=None, tf_var_file=None):
     """Run Terraform apply command."""
     cmd_args = parse_args(input=input, color=color,
                           auto_approve=auto_approve, tf_vars=tf_vars,
-                          targets=targets)
+                          targets=targets, tf_var_file=tf_var_file)
     return self.execute_command('apply', *cmd_args).out
 
   def output(self, name=None, color=False, json_format=True):
@@ -347,10 +349,11 @@ def output(self, name=None, color=False, json_format=True):
         _LOGGER.warning('error decoding output: {}'.format(e))
     return output
 
-  def destroy(self, color=False, auto_approve=True, tf_vars=None, targets=None):
+  def destroy(self, color=False, auto_approve=True, tf_vars=None, targets=None, tf_var_file=None):
     """Run Terraform destroy command."""
     cmd_args = parse_args(color=color, auto_approve=auto_approve,
-                          tf_vars=tf_vars, targets=targets)
+                          tf_vars=tf_vars, targets=targets,
+                          tf_var_file=tf_var_file)
     return self.execute_command('destroy', *cmd_args).out
 
   def refresh(self, color=False, lock=False, tf_vars=None, targets=None):