pr comments

Author: GarrettBeatty

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/Attributes/AttributeModelBuilder.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Amazon.Lambda.Annotations.ALB;
-using Amazon.Lambda.Annotations.SNS;
 using Amazon.Lambda.Annotations.APIGateway;
 using Amazon.Lambda.Annotations.S3;
 using Amazon.Lambda.Annotations.SQS;
@@ -117,7 +116,7 @@ public static AttributeModel Build(AttributeData att, GeneratorExecutionContext
             else if (att.AttributeClass.Equals(context.Compilation.GetTypeByMetadataName(TypeFullNames.SNSEventAttribute), SymbolEqualityComparer.Default))
             {
                 var data = SNSEventAttributeBuilder.Build(att);
-                model = new AttributeModel<Amazon.Lambda.Annotations.SNS.SNSEventAttribute>
+                model = new AttributeModel<SNS.SNSEventAttribute>
                 {
                     Data = data,
                     Type = TypeModelBuilder.Build(att.AttributeClass, context)

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

@@ -697,10 +697,7 @@ private string ProcessSnsAttribute(ILambdaFunctionSerializable lambdaFunction, S
             else
             {
                 var topic = att.Topic.Substring(1);
-                if (_templateWriter.Exists($"{PARAMETERS}.{topic}"))
-                    SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, $"Topic.{REF}", topic);
-                else
-                    SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, $"Topic.{REF}", topic);
+                SetEventProperty(syncedEventProperties, lambdaFunction.ResourceName, eventName, $"Topic.{REF}", topic);
             }
 
             // FilterPolicy

Libraries/src/Amazon.Lambda.Annotations/SNS/SNSEventAttribute.cs

@@ -32,12 +32,20 @@ public string ResourceName
                 {
                     return resourceName;
                 }
+                if (string.IsNullOrEmpty(Topic))
+                {
+                    return string.Empty;
+                }
                 if (Topic.StartsWith("@"))
                 {
                     return Topic.Substring(1);
                 }
 
                 var arnTokens = Topic.Split(new char[] { ':' }, 6);
+                if (arnTokens.Length < 6)
+                {
+                    return Topic;
+                }
                 var topicName = arnTokens[5];
                 var sanitizedTopicName = string.Join(string.Empty, topicName.Where(char.IsLetterOrDigit));
                 return sanitizedTopicName;
@@ -61,7 +69,7 @@ public string ResourceName
         /// </summary>
         public bool Enabled
         {
-            get => enabled.GetValueOrDefault();
+            get => enabled.GetValueOrDefault(true);
             set => enabled = value;
         }
         private bool? enabled { get; set; }
@@ -80,6 +88,12 @@ internal List<string> Validate()
         {
             var validationErrors = new List<string>();
 
+            if (string.IsNullOrEmpty(Topic))
+            {
+                validationErrors.Add($"{nameof(SNSEventAttribute.Topic)} is required and must not be null or empty");
+                return validationErrors;
+            }
+
             if (!Topic.StartsWith("@"))
             {
                 var arnTokens = Topic.Split(new char[] { ':' }, 6);

Libraries/src/Amazon.Lambda.Annotations/SQS/SQSEventAttribute.cs

@@ -60,7 +60,7 @@ public string ResourceName
         /// </summary>
         public bool Enabled
         {
-            get => enabled.GetValueOrDefault();
+            get => enabled.GetValueOrDefault(true);
             set => enabled = value;
         }
         private bool? enabled { get; set; }

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/WriterTests/SNSEventsTests.cs

@@ -38,7 +38,7 @@ public void VerifySNSEventAttributes_AreCorrectlyApplied(CloudFormationTemplateF
 
             foreach (var att in snsEventAttributes)
             {
-                var eventName = att.Topic.StartsWith("@") ? att.Topic.Substring(1) : att.Topic.Split(':').ToList()[5];
+                var eventName = att.ResourceName;
                 var eventPath = $"Resources.{lambdaFunctionModel.ResourceName}.Properties.Events.{eventName}";
                 var eventPropertiesPath = $"{eventPath}.Properties";
 

Libraries/test/TestServerlessApp.IntegrationTests/SNSEventSubscription.cs

@@ -29,7 +29,7 @@ public async Task VerifySNSSubscriptionConfiguration()
 
             // Find the Lambda subscription
             var lambdaSub = subscriptions.Subscriptions.FirstOrDefault(s =>
-                s.Protocol == "lambda" && s.Endpoint.Contains("SNSMessageHandler"));
+                s.Protocol == "lambda" && s.Endpoint.Contains(lambdaFunctionName));
             Assert.NotNull(lambdaSub);
 
             // Verify filter policy