Skip to content

Commit e8b381b

Browse files
authored
support both lists and tuples in var-file arg (#66)
1 parent a28c310 commit e8b381b

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

test/test_args.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
({'upgrade': False}, []),
4646
({'tf_var_file': None}, []),
4747
({'tf_var_file': 'foo.tfvar'}, ['-var-file=foo.tfvar']),
48+
({'tf_var_file': ['foo.tfvar', 'bar.tfvar']}, [
49+
'-var-file=foo.tfvar', '-var-file=bar.tfvar']),
4850
)
4951

5052

tftest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,8 @@ def parse_args(init_vars=None, tf_vars=None, targets=None, **kw):
151151
cmd_args += [("-target={}".format(t)) for t in targets]
152152
if kw.get('tf_var_file'):
153153
tf_var_file = kw['tf_var_file']
154-
if isinstance(tf_var_file, list):
155-
for x in tf_var_file:
156-
cmd_args.append('-var-file={}'.format(x))
154+
if isinstance(tf_var_file, (list, tuple)):
155+
cmd_args += ['-var-file={}'.format(v) for v in tf_var_file]
157156
else:
158157
cmd_args.append('-var-file={}'.format(tf_var_file))
159158
return cmd_args

0 commit comments

Comments
 (0)