Test sending arrays to props and fix output bug

Author: ericzbeard

awscli/customizations/cloudformation/module_conditions.py

@@ -20,6 +20,7 @@
 We have to be able to fully resolve it locally.
 """
 
+from collections import OrderedDict
 from awscli.customizations.cloudformation import exceptions
 
 AND = "Fn::And"
@@ -56,19 +57,21 @@ def resolve_if(v, find_ref, prior):
 # pylint: disable=too-many-branches,too-many-statements
 def istrue(v, find_ref, prior):
     "Recursive function to evaluate a Condition"
+    if not isdict(v):
+        return False
     retval = False
     if EQUALS in v:
         eq = v[EQUALS]
         if len(eq) == 2:
             val0 = eq[0]
             val1 = eq[1]
-            if IF in val0:
+            if isdict(val0) and IF in val0:
                 val0 = resolve_if(val0[IF], find_ref, prior)
-            if IF in val1:
+            if isdict(val1) and IF in val1:
                 val1 = resolve_if(val1[IF], find_ref, prior)
-            if REF in val0:
+            if isdict(val0) and REF in val0:
                 val0 = find_ref(val0[REF])
-            if REF in val1:
+            if isdict(val1) and REF in val1:
                 val1 = find_ref(val1[REF])
             retval = val0 == val1
         else:
@@ -114,3 +117,8 @@ def istrue(v, find_ref, prior):
             # We are depending on the author putting them in order
 
     return retval
+
+
+def isdict(v):
+    "Returns True if the type is a dict or OrderedDict"
+    return isinstance(v, (dict, OrderedDict))

awscli/customizations/cloudformation/modules.py

@@ -544,6 +544,8 @@ def resolve_output_sub(self, v, d, n):
                         resolved = "${" + self.name + ".".join(getatt) + "}"
                     elif SUB in output:
                         resolved = "${" + self.name + output[SUB] + "}"
+                    elif REF in output:
+                        resolved = "${" + self.name + output[REF] + "}"
                 sub += resolved
 
         d[n] = {SUB: sub}
@@ -715,8 +717,6 @@ def resolve(self, k, v, d, n):
             k = BucketName, v = {!Ref, Name}, d = Bucket{}, n = Properties
         """
 
-        # print(f"k: {k}, v: {v}, d: {d}, n: {n}")
-
         if k == REF:
             self.resolve_ref(v, d, n)
         elif k == SUB:
@@ -766,7 +766,6 @@ def resolve_sub(self, v, d, n):
 
         Use the same logic as with resolve_ref.
         """
-        # print(f"resolve_sub v: {v}, d: {d}, n: {n}")
         words = parse_sub(v, True)
         sub = ""
         need_sub = False
@@ -830,7 +829,6 @@ def find_ref(self, name):
         :param name The name to search for
         :return The referenced element or None
         """
-        # print(f"find_ref {name}, props: {self.props}, params: {self.params}")
         if name in self.props:
             if name not in self.params:
                 # The parent tried to set a property that doesn't exist

tests/unit/customizations/cloudformation/modules/output-expect.yaml

@@ -15,3 +15,8 @@ Resources:
     Type: AWS::S3::Bucket
     Properties:
       BucketName: foo
+  A:
+    Type: A::B::C
+    Properties:
+      Object:
+        Arn: !Sub ${ContentBucket.Arn}

tests/unit/customizations/cloudformation/modules/output-template.yaml

@@ -3,6 +3,12 @@ Modules:
     Source: ./output-module.yaml
     Properties:
       Name: foo
+Resources:
+  A:
+    Type: A::B::C
+    Properties:
+      Object:
+        Arn: !Sub ${Content.BucketArn}
 Outputs:
   ExampleOutput:
     Value: !GetAtt Content.BucketArn

tests/unit/customizations/cloudformation/modules/proparray-expect.yaml

@@ -0,0 +1,7 @@
+Resources:
+  FooBaz:
+    Type: A::B::C
+    Properties:
+      AnArray:
+      - a
+      - b

tests/unit/customizations/cloudformation/modules/proparray-module.yaml

@@ -0,0 +1,9 @@
+Parameters:
+  Bar:
+    Type: Array
+
+Resources:
+  Baz:
+    Type: A::B::C
+    Properties:
+      AnArray: !Ref Bar

tests/unit/customizations/cloudformation/modules/proparray-template.yaml

@@ -0,0 +1,8 @@
+Resources:
+  Foo:
+    Type: LocalModule
+    Source: proparray-module.yaml
+    Properties:
+      Bar:
+        - a
+        - b

tests/unit/customizations/cloudformation/test_modules.py

@@ -101,6 +101,7 @@ def test_main(self):
             "example",
             "getatt",
             "constant",
+            "proparray",
         ]
         for test in tests:
             base = "unit/customizations/cloudformation/modules"