First pass at Jinja2 support for Cfg.

3 files changed, 57 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py
index e2d1ec597..fc4506c12 100644
--- a/src/lib/Bcfg2/Server/Lint/Comments.py
+++ b/src/lib/Bcfg2/Server/Lint/Comments.py
@@ -9,6 +9,7 @@ from Bcfg2.Server.Plugins.Cfg.CfgPlaintextGenerator \
     import CfgPlaintextGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgCheetahGenerator import CfgCheetahGenerator
+from Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator import CfgJinja2Generator
 from Bcfg2.Server.Plugins.Cfg.CfgInfoXML import CfgInfoXML
 
 
@@ -76,6 +77,14 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin):
             type=Bcfg2.Options.Types.comma_list, default=[],
             help="Required comments for Cheetah-templated Cfg files"),
         Bcfg2.Options.Option(
+            cf=("Comments", "jinja2_keywords"),
+            type=Bcfg2.Options.Types.comma_list, default=[],
+            help="Required keywords for Jinja2-templated Cfg files"),
+        Bcfg2.Options.Option(
+            cf=("Comments", "jinja2_comments"),
+            type=Bcfg2.Options.Types.comma_list, default=[],
+            help="Required comments for Jinja2-templated Cfg files"),
+        Bcfg2.Options.Option(
             cf=("Comments", "infoxml_keywords"),
             type=Bcfg2.Options.Types.comma_list, default=[],
             help="Required keywords for info.xml files"),
@@ -235,6 +244,8 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin):
                         rtype = "cfg"
                     elif isinstance(entry, CfgCheetahGenerator):
                         rtype = "cheetah"
+                    elif isinstance(entry, CfgJinja2Generator):
+                        rtype = "jinja2"
                     elif isinstance(entry, CfgInfoXML):
                         self.check_xml(entry.infoxml.name,
                                        entry.infoxml.pnode.data,
diff --git a/src/lib/Bcfg2/Server/Lint/Jinja2.py b/src/lib/Bcfg2/Server/Lint/Jinja2.py
new file mode 100755
index 000000000..3112d2a6e
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Lint/Jinja2.py
@@ -0,0 +1,40 @@
+""" Check Jinja2 templates for syntax errors. """
+
+import sys
+import Bcfg2.Server.Lint
+from jinja2 import Template, TemplateSyntaxError
+from Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator import CfgJinja2Generator
+
+
+class Jinja2(Bcfg2.Server.Lint.ServerPlugin):
+    """ Check Jinja2 templates for syntax errors. """
+
+    def Run(self):
+        if 'Cfg' in self.core.plugins:
+            self.check_cfg()
+
+    @classmethod
+    def Errors(cls):
+        return {"jinja2-syntax-error": "error",
+                "unknown-jinja2-error": "error"}
+
+    def check_template(self, entry):
+        """ Generic check for all jinja2 templates (XML and text) """
+        try:
+            Template(entry.data.decode(entry.encoding))
+        except TemplateSyntaxError:
+            err = sys.exc_info()[1]
+            self.LintError("jinja2-syntax-error",
+                           "Jinja2 syntax error in %s: %s" % (entry.name, err))
+        except:
+            err = sys.exc_info()[1]
+            self.LintError("unknown-jinja2-error",
+                           "Unknown Jinja2 error in %s: %s" % (entry.name, err))
+
+    def check_cfg(self):
+        """ Check jinja2 templates in Cfg for syntax errors. """
+        for entryset in self.core.plugins['Cfg'].entries.values():
+            for entry in entryset.entries.values():
+                if (self.HandlesFile(entry.name) and
+                        isinstance(entry, CfgJinja2Generator)):
+                    self.check_template(entry)
diff --git a/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py b/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
index 202a1487d..5a80a5884 100644
--- a/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
+++ b/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
@@ -8,16 +8,20 @@ from Bcfg2.Server.Plugin import default_path_metadata
 from Bcfg2.Server.Plugins.Cfg.CfgInfoXML import CfgInfoXML
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgCheetahGenerator import CfgCheetahGenerator
+from Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator import CfgJinja2Generator
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenshiGenerator import \
     CfgEncryptedGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedCheetahGenerator import \
     CfgEncryptedCheetahGenerator
+from Bcfg2.Server.Plugins.Cfg.CfgEncryptedJinja2Generator import \
+    CfgEncryptedJinja2Generator
 
 
 class TemplateAbuse(Bcfg2.Server.Lint.ServerPlugin):
     """ Check for templated scripts or executables. """
-    templates = [CfgGenshiGenerator, CfgCheetahGenerator,
-                 CfgEncryptedGenshiGenerator, CfgEncryptedCheetahGenerator]
+    templates = [CfgGenshiGenerator, CfgCheetahGenerator, CfgJinja2Generator,
+                 CfgEncryptedGenshiGenerator, CfgEncryptedCheetahGenerator,
+                 CfgEncryptedJinja2Generator]
     extensions = [".pl", ".py", ".sh", ".rb"]
 
     def Run(self):