Merge branch 'maint'

Conflicts:
	doc/development/lint.txt
	misc/bcfg2.spec
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	testsuite/install.sh

2 files changed, 30 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/AWSTags.py b/src/lib/Bcfg2/Server/Lint/AWSTags.py
new file mode 100644
index 000000000..a6af63dd6
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Lint/AWSTags.py
@@ -0,0 +1,29 @@
+import re
+import sys
+import Bcfg2.Server.Lint
+
+
+class AWSTags(Bcfg2.Server.Lint.ServerPlugin):
+    """ ``bcfg2-lint`` plugin to check all given :ref:`AWSTags
+    <server-plugins-connectors-awstags>` patterns for validity. """
+
+    def Run(self):
+        cfg = self.core.plugins['AWSTags'].config
+        for entry in cfg.xdata.xpath('//Tag'):
+            self.check(entry, "name")
+            if entry.get("value"):
+                self.check(entry, "value")
+
+    @classmethod
+    def Errors(cls):
+        return {"pattern-fails-to-initialize": "error"}
+
+    def check(self, entry, attr):
+        """ Check a single attribute (``name`` or ``value``) of a
+        single entry for validity. """
+        try:
+            re.compile(entry.get(attr))
+        except re.error:
+            self.LintError("pattern-fails-to-initialize",
+                           "'%s' regex could not be compiled: %s\n    %s" %
+                           (attr, sys.exc_info()[1], entry.get("name")))
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index 2042382e7..e38619355 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -54,6 +54,7 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
              "Decisions/*.xml": "decisions.xsd",
              "Packages/sources.xml": "packages.xsd",
              "GroupPatterns/config.xml": "grouppatterns.xsd",
+             "AWSTags/config.xml": "awstags.xsd",
              "NagiosGen/config.xml": "nagiosgen.xsd",
              "FileProbes/config.xml": "fileprobes.xsd",
              "GroupLogic/groups.xml": "grouplogic.xsd"