added logical id

Author: hounddog22030

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Models/IQueueSerializable.cs

@@ -6,7 +6,7 @@ namespace Amazon.Lambda.Annotations.SourceGenerator.Models
 {
     public interface IQueueSerializable
     {
-        string Name { get; set; }
+        string LogicalId { get; set; }
         string QueueName { get; set; }
     }
 }

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

@@ -54,7 +54,7 @@ public void ApplyReport(AnnotationReport report)
                 if (!ShouldProcessQueue(queueModelSerializable))
                     continue;
                 ProcessQueue(queueModelSerializable, relativeProjectUri);
-                processedQueues.Add(queueModelSerializable.Name);
+                processedQueues.Add(queueModelSerializable.LogicalId);
 
             }
 
@@ -81,7 +81,7 @@ private bool ShouldProcessLambdaFunction(ILambdaFunctionSerializable lambdaFunct
         }
         private bool ShouldProcessQueue(IQueueSerializable queue)
         {
-            var queuePath = $"Resources.{queue.Name}";
+            var queuePath = $"Resources.{queue.LogicalId}";
 
             if (!_jsonWriter.Exists(queuePath))
                 return true;
@@ -103,7 +103,7 @@ private void ProcessLambdaFunction(ILambdaFunctionSerializable lambdaFunction, s
         }
         private void ProcessQueue(IQueueSerializable queue, string relativeProjectUri)
         {
-            var queuePath = $"Resources.{queue.Name}";
+            var queuePath = $"Resources.{queue.LogicalId}";
             var propertiesPath = $"{queuePath}.Properties";
 
             if (!_jsonWriter.Exists(queuePath))

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

@@ -379,9 +379,10 @@ public void PackageTypePropertyTest()
         [Fact]
         public void AddQueueToEmptyTemplate()
         {
+            const string queueLogicalId = "MyQueue";
             // ARRANGE
             var mockFileManager = GetMockFileManager(string.Empty);
-            var queueModel = GetQueueModel();
+            var queueModel = GetQueueModel(queueLogicalId);
             var cloudFormationJsonWriter = new CloudFormationJsonWriter(mockFileManager, _mockDirectoryManager, _jsonWriter, _diagnosticReporter);
             var report = GetAnnotationReport(new List<IQueueSerializable>() { queueModel });
 
@@ -390,7 +391,7 @@ public void AddQueueToEmptyTemplate()
 
             // ASSERT
             var rootToken = JObject.Parse(mockFileManager.ReadAllText(ServerlessTemplateFilePath));
-            var queueToken = rootToken["Resources"]["TestQueue"];
+            var queueToken = rootToken["Resources"][queueLogicalId];
             var propertiesToken = queueToken["Properties"];
 
             Assert.Equal("2010-09-09", rootToken["AWSTemplateFormatVersion"]);
@@ -428,9 +429,9 @@ private LambdaFunctionModelTest GetLambdaFunctionModel(string handler, string na
                 Role = role
             };
         }
-        private QueueTest GetQueueModel()
+        private QueueTest GetQueueModel(string queueLogicalId)
         {
-            return new QueueTest() { Name = "TestQueue", QueueName = "QueueName"};
+            return new QueueTest() { LogicalId = queueLogicalId, QueueName = "QueueName"};
         }
 
         private AnnotationReport GetAnnotationReport(List<ILambdaFunctionSerializable> lambdaFunctionModels)
@@ -477,7 +478,7 @@ public class LambdaFunctionModelTest : ILambdaFunctionSerializable
 
         public class QueueTest : IQueueSerializable
         {
-            public string Name { get; set; }
+            public string LogicalId { get; set; }
             public string QueueName { get; set; }
         }
     }