fix(ir): implement support for ResourceValue::Objects containing a nested TypeReference::Unions in deserialized templates

src/ir/constructor/mod.rs

@@ -2,6 +2,7 @@ use crate::{parser::parameters::Parameter, Hasher};
 use indexmap::IndexMap;
 use voca_rs::case::camel_case;
 
+#[derive(Debug)]
 pub struct Constructor {
     pub inputs: Vec<ConstructorParameter>,
 }
@@ -42,6 +43,7 @@ impl Constructor {
     }
 }
 
+#[derive(Debug)]
 pub struct ConstructorParameter {
     pub name: String,
     pub description: Option<String>,

src/ir/mappings/mod.rs

@@ -4,6 +4,7 @@ use crate::ir::mappings::OutputType::{Complex, Consistent};
 use crate::parser::lookup_table::{MappingInnerValue, MappingTable};
 use crate::Hasher;
 
+#[derive(Debug)]
 pub struct MappingInstruction {
     pub name: String,
     pub map: IndexMap<String, IndexMap<String, MappingInnerValue, Hasher>, Hasher>,

src/ir/mod.rs

@@ -20,6 +20,7 @@ pub mod reference;
 pub mod resources;
 pub mod sub;
 
+#[derive(Debug)]
 pub struct CloudformationProgramIr {
     pub description: Option<String>,
     pub transforms: Vec<String>,

src/ir/resources/mod.rs

@@ -130,6 +130,9 @@ impl<'a, 'b> ResourceTranslator<'a, 'b> {
                     Some(TypeReference::Primitive(Primitive::Json)) => {
                         Box::new(MapOf(&TypeReference::Primitive(Primitive::Json)))
                     }
+                    Some(TypeReference::Union(type_union)) => {
+                        Box::new(UnionOf(type_union))
+                    }
                     other => unimplemented!("{other:?}"),
                 };
 
@@ -359,6 +362,17 @@ impl PropertyBag for MapOf<'_> {
     }
 }
 
+struct UnionOf<'a>(&'a TypeUnion);
+impl PropertyBag for UnionOf<'_> {
+    fn property(&self, key: &str) -> Option<Property> {
+        Some(Property {
+            name: voca_rs::case::camel_case(key).into(),
+            required: false,
+            value_type: TypeReference::Union(self.0.clone()),
+        })
+    }
+}
+
 // ResourceInstruction is all the information needed to output a resource assignment.
 #[derive(Clone, Debug, PartialEq)]
 pub struct ResourceInstruction {

tests/end-to-end.rs

@@ -83,6 +83,7 @@ test_case!(batch, "BatchStack", &["golang", "java"]); //java fails cdk synth bc
 test_case!(cloudwatch, "CloudwatchStack", &["golang"]);
 test_case!(ecs, "EcsStack", &["java", "golang"]);
 test_case!(ec2, "Ec2Stack", &["java", "golang"]);
+test_case!(sam_serverless, "SamServerlessStack", &["java", "csharp", "golang"]);
 
 // Add new test cases here
 

tests/end-to-end/sam_serverless/python/Stack.diff

@@ -0,0 +1,57 @@
+diff --git a/./tests/end-to-end/sam_serverless/template.json b/tests/end-to-end/sam_serverless-python-working-dir/cdk.out/Stack.template.json
+index ef393b7..612089e 100644
+--- a/./tests/end-to-end/sam_serverless/template.json
++++ b/tests/end-to-end/sam_serverless-python-working-dir/cdk.out/Stack.template.json
+@@ -1,28 +1,38 @@
+ {
+-  "AWSTemplateFormatVersion": "2010-09-09",
+-  "Transform": "AWS::Serverless-2016-10-31",
++ "Transform": [
++  "AWS::Serverless-2016-10-31"
++ ],
+  "Resources": {
+   "ClientFunction": {
+    "Type": "AWS::Serverless::Function",
+    "Properties": {
++    "CodeUri": "./pricing-client/",
++    "Events": {
++     "ApiEvent": {
++      "Properties": {
++       "Method": "get",
++       "Path": "/path"
++      },
++      "Type": "Api"
++     }
++    },
+     "FunctionName": "pricing-client",
+     "Handler": "client_lambda.lambda_handler",
+     "MemorySize": 512,
+-        "Timeout": 300,
+-        "CodeUri": "./pricing-client/",
+     "PermissionsBoundary": {
+-          "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:policy/GithubActionsIamResourcePermissionsBoundary"
++     "Fn::Join": [
++      "",
++      [
++       "arn:aws:iam::",
++       {
++        "Ref": "AWS::AccountId"
++       },
++       ":policy/GithubActionsIamResourcePermissionsBoundary"
++      ]
++     ]
+     },
+     "Runtime": "python3.11",
+-        "Events": {
+-          "ApiEvent": {
+-            "Type": "Api",
+-            "Properties": {
+-              "Path": "/path",
+-              "Method": "get"
+-            }
+-          }
+-        }
++    "Timeout": 300
+    }
+   }
+  }

tests/end-to-end/sam_serverless/python/Stack.template.json

@@ -0,0 +1,39 @@
+{
+ "Transform": [
+  "AWS::Serverless-2016-10-31"
+ ],
+ "Resources": {
+  "ClientFunction": {
+   "Type": "AWS::Serverless::Function",
+   "Properties": {
+    "CodeUri": "./pricing-client/",
+    "Events": {
+     "ApiEvent": {
+      "Properties": {
+       "Method": "get",
+       "Path": "/path"
+      },
+      "Type": "Api"
+     }
+    },
+    "FunctionName": "pricing-client",
+    "Handler": "client_lambda.lambda_handler",
+    "MemorySize": 512,
+    "PermissionsBoundary": {
+     "Fn::Join": [
+      "",
+      [
+       "arn:aws:iam::",
+       {
+        "Ref": "AWS::AccountId"
+       },
+       ":policy/GithubActionsIamResourcePermissionsBoundary"
+      ]
+     ]
+    },
+    "Runtime": "python3.11",
+    "Timeout": 300
+   }
+  }
+ }
+}

tests/end-to-end/sam_serverless/python/app.py

@@ -0,0 +1,11 @@
+# autogenerated
+import aws_cdk as cdk
+from stack import SamServerlessStack
+app = cdk.App(
+    default_stack_synthesizer=cdk.DefaultStackSynthesizer(
+        generate_bootstrap_version_rule=False
+        )
+    )
+
+SamServerlessStack(app, 'Stack')
+app.synth()

tests/end-to-end/sam_serverless/python/stack.py

@@ -0,0 +1,33 @@
+from aws_cdk import Stack
+import aws_cdk as cdk
+import aws_cdk.aws_sam as sam
+from constructs import Construct
+
+class SamServerlessStack(Stack):
+  def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
+    super().__init__(scope, construct_id, **kwargs)
+
+    # Transforms
+    Stack.add_transform(self, 'AWS::Serverless-2016-10-31')
+
+    # Resources
+    clientFunction = sam.CfnFunction(self, 'ClientFunction',
+          function_name = 'pricing-client',
+          handler = 'client_lambda.lambda_handler',
+          memory_size = 512,
+          timeout = 300,
+          code_uri = './pricing-client/',
+          permissions_boundary = f"""arn:aws:iam::{self.account}:policy/GithubActionsIamResourcePermissionsBoundary""",
+          runtime = 'python3.11',
+          events = {
+            'ApiEvent': {
+              'type': 'Api',
+              'properties': {
+                'path': '/path',
+                'method': 'get',
+              },
+            },
+          },
+        )
+
+

tests/end-to-end/sam_serverless/template.json

@@ -0,0 +1,29 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Transform": "AWS::Serverless-2016-10-31",
+  "Resources": {
+    "ClientFunction": {
+        "Type": "AWS::Serverless::Function",
+        "Properties": {
+        "FunctionName": "pricing-client",
+        "Handler": "client_lambda.lambda_handler",
+        "MemorySize": 512,
+        "Timeout": 300,
+        "CodeUri": "./pricing-client/",
+        "PermissionsBoundary": {
+          "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:policy/GithubActionsIamResourcePermissionsBoundary"
+        },
+        "Runtime": "python3.11",
+        "Events": {
+          "ApiEvent": {
+            "Type": "Api",
+            "Properties": {
+              "Path": "/path",
+              "Method": "get"
+            }
+          }
+        }
+      }
+    }
+  }
+}

tests/end-to-end/sam_serverless/typescript/Stack.diff

@@ -0,0 +1,57 @@
+diff --git a/./tests/end-to-end/sam_serverless/template.json b/tests/end-to-end/sam_serverless-typescript-working-dir/cdk.out/Stack.template.json
+index ef393b7..612089e 100644
+--- a/./tests/end-to-end/sam_serverless/template.json
++++ b/tests/end-to-end/sam_serverless-typescript-working-dir/cdk.out/Stack.template.json
+@@ -1,28 +1,38 @@
+ {
+-  "AWSTemplateFormatVersion": "2010-09-09",
+-  "Transform": "AWS::Serverless-2016-10-31",
++ "Transform": [
++  "AWS::Serverless-2016-10-31"
++ ],
+  "Resources": {
+   "ClientFunction": {
+    "Type": "AWS::Serverless::Function",
+    "Properties": {
++    "CodeUri": "./pricing-client/",
++    "Events": {
++     "ApiEvent": {
++      "Properties": {
++       "Method": "get",
++       "Path": "/path"
++      },
++      "Type": "Api"
++     }
++    },
+     "FunctionName": "pricing-client",
+     "Handler": "client_lambda.lambda_handler",
+     "MemorySize": 512,
+-        "Timeout": 300,
+-        "CodeUri": "./pricing-client/",
+     "PermissionsBoundary": {
+-          "Fn::Sub": "arn:aws:iam::${AWS::AccountId}:policy/GithubActionsIamResourcePermissionsBoundary"
++     "Fn::Join": [
++      "",
++      [
++       "arn:aws:iam::",
++       {
++        "Ref": "AWS::AccountId"
++       },
++       ":policy/GithubActionsIamResourcePermissionsBoundary"
++      ]
++     ]
+     },
+     "Runtime": "python3.11",
+-        "Events": {
+-          "ApiEvent": {
+-            "Type": "Api",
+-            "Properties": {
+-              "Path": "/path",
+-              "Method": "get"
+-            }
+-          }
+-        }
++    "Timeout": 300
+    }
+   }
+  }

tests/end-to-end/sam_serverless/typescript/Stack.template.json

@@ -0,0 +1,39 @@
+{
+ "Transform": [
+  "AWS::Serverless-2016-10-31"
+ ],
+ "Resources": {
+  "ClientFunction": {
+   "Type": "AWS::Serverless::Function",
+   "Properties": {
+    "CodeUri": "./pricing-client/",
+    "Events": {
+     "ApiEvent": {
+      "Properties": {
+       "Method": "get",
+       "Path": "/path"
+      },
+      "Type": "Api"
+     }
+    },
+    "FunctionName": "pricing-client",
+    "Handler": "client_lambda.lambda_handler",
+    "MemorySize": 512,
+    "PermissionsBoundary": {
+     "Fn::Join": [
+      "",
+      [
+       "arn:aws:iam::",
+       {
+        "Ref": "AWS::AccountId"
+       },
+       ":policy/GithubActionsIamResourcePermissionsBoundary"
+      ]
+     ]
+    },
+    "Runtime": "python3.11",
+    "Timeout": 300
+   }
+  }
+ }
+}

tests/end-to-end/sam_serverless/typescript/app.ts

@@ -0,0 +1,10 @@
+// auto-generated! a human should update this!
+import * as cdk from "aws-cdk-lib";
+import { SamServerlessStack } from "./stack";
+const app = new cdk.App({
+    defaultStackSynthesizer: new cdk.DefaultStackSynthesizer({
+        generateBootstrapVersionRule: false,
+    }),
+});
+new SamServerlessStack(app, "Stack");
+app.synth();

tests/end-to-end/sam_serverless/typescript/stack.ts

@@ -0,0 +1,34 @@
+import * as cdk from 'aws-cdk-lib';
+import * as sam from 'aws-cdk-lib/aws-sam';
+
+export interface SamServerlessStackProps extends cdk.StackProps {
+}
+
+export class SamServerlessStack extends cdk.Stack {
+  public constructor(scope: cdk.App, id: string, props: SamServerlessStackProps = {}) {
+    super(scope, id, props);
+
+    // Transforms
+    this.addTransform('AWS::Serverless-2016-10-31');
+
+    // Resources
+    const clientFunction = new sam.CfnFunction(this, 'ClientFunction', {
+      functionName: 'pricing-client',
+      handler: 'client_lambda.lambda_handler',
+      memorySize: 512,
+      timeout: 300,
+      codeUri: './pricing-client/',
+      permissionsBoundary: `arn:aws:iam::${this.account}:policy/GithubActionsIamResourcePermissionsBoundary`,
+      runtime: 'python3.11',
+      events: {
+        ApiEvent: {
+          type: 'Api',
+          properties: {
+            path: '/path',
+            method: 'get',
+          },
+        },
+      },
+    });
+  }
+}