Merge pull request terraform-google-modules#335 from bharathkkb/featu…

…re/fix-templating Improve templating by removing *.tf in autogen and using *.tf.tmpl
WALTER-GROUP · Nov 20, 2019 · 312a559 · 312a559
2 parents 9e5adf9 + d94749d
commit 312a559
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 2 deletions.
diff --git a/autogen/auth.tf → autogen/auth.tf.tmpl b/autogen/auth.tf → autogen/auth.tf.tmpl
diff --git a/autogen/cluster.tf → autogen/cluster.tf.tmpl b/autogen/cluster.tf → autogen/cluster.tf.tmpl
diff --git a/autogen/dns.tf → autogen/dns.tf.tmpl b/autogen/dns.tf → autogen/dns.tf.tmpl
diff --git a/autogen/main.tf → autogen/main.tf.tmpl b/autogen/main.tf → autogen/main.tf.tmpl
diff --git a/autogen/masq.tf → autogen/masq.tf.tmpl b/autogen/masq.tf → autogen/masq.tf.tmpl
diff --git a/autogen/networks.tf → autogen/networks.tf.tmpl b/autogen/networks.tf → autogen/networks.tf.tmpl
diff --git a/autogen/outputs.tf → autogen/outputs.tf.tmpl b/autogen/outputs.tf → autogen/outputs.tf.tmpl
diff --git a/autogen/sa.tf → autogen/sa.tf.tmpl b/autogen/sa.tf → autogen/sa.tf.tmpl
diff --git a/autogen/variables.tf → autogen/variables.tf.tmpl b/autogen/variables.tf → autogen/variables.tf.tmpl
diff --git a/autogen/versions.tf → autogen/versions.tf.tmpl b/autogen/versions.tf → autogen/versions.tf.tmpl
diff --git a/helpers/generate_modules/generate_modules.py b/helpers/generate_modules/generate_modules.py
@@ -82,9 +82,11 @@ def main(argv):
         lstrip_blocks=True,
     )
     templates = env.list_templates()
-    for template_file in templates:
-        for module in MODULES:
+    for module in MODULES:
+        for template_file in templates:
             template = env.get_template(template_file)
+            if template_file.endswith(".tf.tmpl"):
+                template_file = template_file.replace(".tf.tmpl", ".tf")
             rendered = template.render(
                 module.template_options(BASE_TEMPLATE_OPTIONS)
             )