Reffed prop lists

Author: ericzbeard

awscli/customizations/cloudformation/modules.py

@@ -219,7 +219,7 @@ def process_module_section(
     fn_select(template)
 
     fn_merge(template)
-    
+
     fn_insertfile(template, base_path)
 
     # Remove the Modules section from the template
@@ -548,10 +548,17 @@ def resolve_output_getatt(self, v, d, n):
 
         This function sets d[n] and returns True if it resolved.
         """
+
         if not isinstance(v, list) or len(v) < 2:
             msg = f"GetAtt {v} invalid"
             raise exceptions.InvalidModuleError(msg=msg)
 
+        # print("")
+        # print("resolve_output_getatt")
+        # print("  v:", v)
+        # print("  d:", d)
+        # print("  n:", n)
+
         # For example, Content.Arn or Content[0].Arn
 
         mapped = self.parent_module.mapped
@@ -579,23 +586,43 @@ def resolve_output_getatt(self, v, d, n):
         if index > -1:
             name = f"{name}{index}"
 
-        r = None
+        reffed_prop = None
         if name == self.name:
             if prop_name in self.module_outputs:
-                r = self.module_outputs[prop_name]
+                reffed_prop = self.module_outputs[prop_name]
             elif prop_name in self.props:
-                r = self.props[prop_name]
+                reffed_prop = self.props[prop_name]
 
-        if r is None:
+        if reffed_prop is None:
+            # print("  reffed_prop is None")
+            # print("")
             return False
 
+        # print("  reffed_prop:", reffed_prop)
+
+        if isinstance(reffed_prop, list):
+            for i, r in enumerate(reffed_prop):
+                self.replace_reffed_prop(r, reffed_prop, i)
+                d[n] = reffed_prop
+        else:
+            self.replace_reffed_prop(reffed_prop, d, n)
+
+        return True
+
+    def replace_reffed_prop(self, r, d, n):
+        """
+        Replace a reffed prop in an output getatt.
+
+        Sets d[n].
+        """
+
         if REF in r:
             ref = r[REF]
             d[n] = {REF: self.name + ref}
         elif GETATT in r:
             getatt = r[GETATT]
             if len(getatt) < 2:
-                msg = f"GetAtt {getatt} in Output {v[1]} is invalid"
+                msg = f"GetAtt {getatt} in {self.name} is invalid"
                 raise exceptions.InvalidModuleError(msg=msg)
             s = getatt_map_list(getatt)
             if s is not None and s in self.mapped:
@@ -637,7 +664,6 @@ def resolve_output_getatt(self, v, d, n):
         else:
             # Handle scalars in Properties
             d[n] = r
-        return True
 
     def resolve_output_getatt_map(self, mapped, name, prop_name):
         "Resolve GetAtts that reference all Outputs from a mapped module"

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

@@ -27,6 +27,14 @@ Resources:
       - Fn::GetAtt:
         - OutputTestB1Bucket
         - Arn
+  OutputTest2B0Bucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: b-x
+  OutputTest2B1Bucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: b-y
   OutputTestB0Bucket:
     Type: AWS::S3::Bucket
     Properties:

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

@@ -1,6 +1,8 @@
 Modules:
   OutputTest:
     Source: ./map-output-module.yaml
+  OutputTest2:
+    Source: ./map-output-module.yaml
   ListTest:
     Source: ./map-list-module.yaml
     Properties:

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

@@ -9,15 +9,23 @@ Resources:
           Fn::GetAtt:
           - ContentBucket
           - Arn
+        GetAttToSubList:
+        - Fn::Sub: ${ContentBucket.Arn}
+        - Fn::Sub: ${ContentBucket2.Arn}
   ContentBucket:
     Type: AWS::S3::Bucket
     Properties:
       BucketName: foo
+  ContentBucket2:
+    Type: AWS::S3::Bucket
   AnotherModuleFoo:
     Type: A::B::C
     Properties:
       AName:
         Fn::Sub: another-${ContentBucket.Arn}
+      TestOverrideList:
+      - Fn::Sub: ${ContentBucket.Arn}
+      - Fn::Sub: ${ContentBucket2.Arn}
 Outputs:
   ExampleOutput:
     Value:

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

@@ -6,11 +6,17 @@ Resources:
     Type: AWS::S3::Bucket
     Properties:
       BucketName: !Ref Name
+  Bucket2:
+    Type: AWS::S3::Bucket
 Outputs:
   BucketArn:
     Value: !GetAtt Bucket.Arn
   BucketArnSub:
     Value: !Sub ${Bucket.Arn}
   BucketRef:
     Value: !Ref Bucket
+  ArnList:
+    Value:
+      - !Sub ${Bucket.Arn}
+      - !Sub ${Bucket2.Arn}
 

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

@@ -7,6 +7,10 @@ Modules:
     Source: ./output-module2.yaml
     Properties:
       Name: !GetAtt ContentBucket.Arn
+    Overrides:
+      Foo:
+        Properties:
+          TestOverrideList: !GetAtt Content.ArnList
 
 Resources:
   A:
@@ -15,6 +19,7 @@ Resources:
       Object:
         Arn: !Sub ${Content.BucketArn}
         ArnGetAtt: !GetAtt Content.BucketArn
+        GetAttToSubList: !GetAtt Content.ArnList 
 Outputs:
   ExampleOutput:
     Value: !GetAtt Content.BucketArn