Handle SQS QueueName using an AWSHelperFn (Fixes #773)

tests/test_sqs.py

@@ -0,0 +1,34 @@
+import unittest
+from troposphere import Join
+from troposphere.sqs import Queue
+
+
+class TestQueue(unittest.TestCase):
+    def test_QueueName(self):
+        Queue(
+            "q",
+            FifoQueue=False,
+        ).validate()
+
+        Queue(
+            "q",
+            FifoQueue=True,
+            QueueName="foobar.fifo",
+        ).validate()
+
+        Queue(
+            "q",
+            FifoQueue=True,
+            QueueName=Join("foo", "bar"),
+        ).validate()
+
+        with self.assertRaises(ValueError):
+            Queue(
+                "q",
+                FifoQueue=True,
+                QueueName="foobar",
+            ).validate()
+
+
+if __name__ == '__main__':
+    unittest.main()

troposphere/sqs.py

@@ -3,7 +3,7 @@
 #
 # See LICENSE file for full license.
 
-from . import AWSObject, AWSProperty
+from . import AWSHelperFn, AWSObject, AWSProperty
 from .validators import integer
 try:
     from awacs.aws import Policy
@@ -36,7 +36,10 @@ class Queue(AWSObject):
 
     def validate(self):
         if self.properties.get('FifoQueue'):
-            if not self.properties.get('QueueName', '').endswith('.fifo'):
+            queuename = self.properties.get('QueueName', '')
+            if isinstance(queuename, AWSHelperFn):
+                pass
+            elif not queuename.endswith('.fifo'):
                 raise ValueError("SQS: FIFO queues need to provide a "
                                  "QueueName that ends with '.fifo'")