PR comments

Author: GarrettBeatty

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Writers/CloudFormationWriter.cs

@@ -626,30 +626,19 @@ private string ProcessS3Attribute(ILambdaFunctionSerializable lambdaFunction, S3
             // Filter - S3 key filter rules
             if (att.IsFilterPrefixSet || att.IsFilterSuffixSet)
             {
+                var rules = new List<Dictionary<string, string>>();
+
                 if (att.IsFilterPrefixSet)
                 {
-                    var prefixRules = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "Name", "prefix" }, { "Value", att.FilterPrefix } } };
-                    SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, "Filter.S3Key.Rules", prefixRules, TokenType.List);
+                    rules.Add(new Dictionary<string, string> { { "Name", "prefix" }, { "Value", att.FilterPrefix } });
                 }
+
                 if (att.IsFilterSuffixSet)
                 {
-                    var suffixRule = new Dictionary<string, string> { { "Name", "suffix" }, { "Value", att.FilterSuffix } };
-                    if (att.IsFilterPrefixSet)
-                    {
-                        // Append suffix rule to existing rules list
-                        var rules = new List<Dictionary<string, string>>
-                        {
-                            new Dictionary<string, string> { { "Name", "prefix" }, { "Value", att.FilterPrefix } },
-                            suffixRule
-                        };
-                        SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, "Filter.S3Key.Rules", rules, TokenType.List);
-                    }
-                    else
-                    {
-                        var suffixRules = new List<Dictionary<string, string>> { suffixRule };
-                        SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, "Filter.S3Key.Rules", suffixRules, TokenType.List);
-                    }
+                    rules.Add(new Dictionary<string, string> { { "Name", "suffix" }, { "Value", att.FilterSuffix } });
                 }
+
+                SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, "Filter.S3Key.Rules", rules, TokenType.List);
             }
 
             // Enabled

Libraries/src/Amazon.Lambda.Annotations/S3/S3EventAttribute.cs

@@ -7,7 +7,7 @@ namespace Amazon.Lambda.Annotations.S3
     /// <summary>
     /// This attribute defines the S3 event source configuration for a Lambda function.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
     public class S3EventAttribute : Attribute
     {
         private static readonly Regex _resourceNameRegex = new Regex("^[a-zA-Z0-9]+$");

Libraries/test/IntegrationTests.Helpers/S3Helper.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
-using Amazon.S3.Util;
 
 namespace IntegrationTests.Helpers
 {

Libraries/test/TestServerlessApp/aws-lambda-tools-defaults.json

@@ -13,7 +13,7 @@
   "template": "serverless.template",
   "template-parameters": "",
   "docker-host-build-output-dir": "./bin/Release/lambda-publish",
-"s3-bucket" : "test-serverless-app-843e7392",
-"stack-name" : "test-serverless-app-843e7392",
-"function-architecture" : "x86_64"
-}
+  "s3-bucket": "test-serverless-app",
+  "stack-name": "test-serverless-app",
+  "function-architecture": "x86_64"
+}