Added Support to Amazon.Lambda.Annotations For Sqs (SQSEvent.SQSMessage)

.github/workflows/dotnet.yml

@@ -0,0 +1,45 @@
+name: .NET
+
+on:
+  push:
+    branches: [ "master","feature/annotations-enchilada","feature/annotations-queue" ]
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get Branch Name
+      run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
+    - name: Setup Version
+      run: echo "VERSION=0.6.${{ github.run_number }}-$BRANCH_NAME" >> $GITHUB_ENV
+    - name: Echo Branch Name
+      run: echo $BRANCH_NAME
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 6
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 6.0.x
+    - name: Setup .NET 7.0
+      uses: actions/setup-dotnet@v1
+      with:
+        include-prerelease: true
+        dotnet-version: 7.0.100-preview.6.22352.1
+    - name: Restore dependencies
+      run: dotnet restore Libraries/Libraries.sln
+    - name: Build
+      run: dotnet build Libraries/Libraries.sln --no-restore
+    - name: Test
+      run: dotnet test Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj
+
+#      - cd Libraries
+#      - dotnet build -c Release
+#      - dotnet test test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj --results-directory $CODEBUILD_SRC_DIR/TestResults --logger trx
+#      - VERSION="0.5.1-preview-$CODEBUILD_BUILD_NUMBER-$Branch"
+#      - dotnet pack -c Release src/Amazon.Lambda.Annotations/Amazon.Lambda.Annotations.csproj -p:NuspecFile=$CODEBUILD_SRC_DIR/Libraries/src/Amazon.Lambda.Annotations.nuspec -p:NuspecProperties="Version=0.5.1-preview-$CODEBUILD_BUILD_NUMBER-$Branch" -p:TargetFrameworks=netstandard2.0
+#      - dotnet pack -c Release src/Amazon.Lambda.Annotations.SourceGenerator/Amazon.Lambda.Annotations.SourceGenerator.csproj -p:NuspecProperties="Version=0.5.1-preview-$CODEBUILD_BUILD_NUMBER-$Branch" -p:TargetFrameworks=netstandard2.0
+

Libraries/Libraries.sln

@@ -107,6 +107,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServerlessApp", "test\TestServerlessApp\TestServerlessApp.csproj", "{3D322CAB-0DDD-4C84-B3ED-0862F244AF5C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.Annotations.SourceGenerators.Tests", "test\Amazon.Lambda.Annotations.SourceGenerators.Tests\Amazon.Lambda.Annotations.SourceGenerators.Tests.csproj", "{D76F2C74-3D7F-4DB3-BA1A-F2EA14749253}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3D322CAB-0DDD-4C84-B3ED-0862F244AF5C} = {3D322CAB-0DDD-4C84-B3ED-0862F244AF5C}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.Annotations", "src\Amazon.Lambda.Annotations\Amazon.Lambda.Annotations.csproj", "{ADA9AF37-A8C1-47E6-BBBD-5C7E49C26C0E}"
 EndProject
@@ -126,14 +129,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMinimalAPIApp", "test\T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.MQEvents", "src\Amazon.Lambda.MQEvents\Amazon.Lambda.MQEvents.csproj", "{BF85932E-2DFF-41CD-8090-A672468B8FBB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.Lambda.LexV2Events", "src\Amazon.Lambda.LexV2Events\Amazon.Lambda.LexV2Events.csproj", "{3C6AABF5-0372-41E0-874F-DF18ECCC7FB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.Lambda.LexV2Events", "src\Amazon.Lambda.LexV2Events\Amazon.Lambda.LexV2Events.csproj", "{3C6AABF5-0372-41E0-874F-DF18ECCC7FB6}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		test\EventsTests.Shared\EventsTests.Shared.projitems*{44e9d925-b61d-4234-97b7-61424c963ba6}*SharedItemsImports = 5
-		test\EventsTests.Shared\EventsTests.Shared.projitems*{a2cb78bb-e54f-48ca-bbfb-9553d27ef23d}*SharedItemsImports = 13
-		test\EventsTests.Shared\EventsTests.Shared.projitems*{c1bb30d2-3237-4cfc-ba93-627471148ec2}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -412,4 +410,9 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {503678A4-B8D1-4486-8915-405A3E9CF0EB}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		test\EventsTests.Shared\EventsTests.Shared.projitems*{44e9d925-b61d-4234-97b7-61424c963ba6}*SharedItemsImports = 5
+		test\EventsTests.Shared\EventsTests.Shared.projitems*{a2cb78bb-e54f-48ca-bbfb-9553d27ef23d}*SharedItemsImports = 13
+		test\EventsTests.Shared\EventsTests.Shared.projitems*{c1bb30d2-3237-4cfc-ba93-627471148ec2}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal

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

@@ -71,6 +71,15 @@ public static AttributeModel Build(AttributeData att, GeneratorExecutionContext
                     Type = TypeModelBuilder.Build(att.AttributeClass, context)
                 };
             }
+            else if (att.AttributeClass.Equals(context.Compilation.GetTypeByMetadataName(TypeFullNames.SqsMessageAttribute), SymbolEqualityComparer.Default))
+            {
+                var data = SqsMessageAttributeBuilder.Build(att);
+                model = new AttributeModel<SqsMessageAttribute>
+                {
+                    Data = data,
+                    Type = TypeModelBuilder.Build(att.AttributeClass, context)
+                };
+            }
             else
             {
                 model = new AttributeModel

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

@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Newtonsoft.Json.Linq;
+
+namespace Amazon.Lambda.Annotations.SourceGenerator.Models.Attributes
+{
+    internal class SqsMessageAttributeBuilder
+    {
+        private const string RedriveAllPolicyNotValidJsonExceptionMessage = "RedriveAllPolicy must be valid Json";
+
+        public static SqsMessageAttribute Build(AttributeData att)
+        {
+            var data = new SqsMessageAttribute();
+            foreach (var attNamedArgument in att.NamedArguments)
+            {
+                switch (attNamedArgument.Key)
+                {
+                    case nameof(ISqsMessage.EventQueueARN):
+                        data.EventQueueARN = attNamedArgument.Value.Value.ToString();
+                        break;
+                    case nameof(ISqsMessage.EventBatchSize):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.EventBatchSize = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    case nameof(ISqsMessage.VisibilityTimeout):
+                        data.VisibilityTimeout = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        break;
+                    case nameof(ISqsMessage.ContentBasedDeduplication):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value.ToString()))
+                        {
+                            data.ContentBasedDeduplication = bool.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    case nameof(ISqsMessage.DeduplicationScope):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.DeduplicationScope = attNamedArgument.Value.Value.ToString();
+                        }
+                        break;
+                    case nameof(ISqsMessage.DelaySeconds):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.DelaySeconds = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    case nameof(ISqsMessage.FifoQueue):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.FifoQueue = bool.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    case nameof(ISqsMessage.FifoThroughputLimit):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.FifoThroughputLimit = attNamedArgument.Value.Value.ToString();
+                        }
+                        break;
+                    case nameof(ISqsMessage.KmsDataKeyReusePeriodSeconds):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.KmsDataKeyReusePeriodSeconds = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    case nameof(ISqsMessage.KmsMasterKeyId):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.KmsMasterKeyId = attNamedArgument.Value.Value.ToString();
+                        }
+                        break;
+                    // MaximumMessageSize
+                    case nameof(ISqsMessage.MaximumMessageSize):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.MaximumMessageSize = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    // Queue
+                    case nameof(ISqsMessage.QueueName):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.QueueName = attNamedArgument.Value.Value.ToString();
+                        }
+                        break;
+                    // MessageRetentionPeriod
+                    case nameof(ISqsMessage.MessageRetentionPeriod):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.MessageRetentionPeriod = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    //ReceiveMessageWaitTimeSeconds
+                    case nameof(ISqsMessage.ReceiveMessageWaitTimeSeconds):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.ReceiveMessageWaitTimeSeconds = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+                    //RedriveAllowPolicy
+                    case nameof(ISqsMessage.RedriveAllowPolicy):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            var json = attNamedArgument.Value.Value.ToString();
+                            try
+                            {
+                                JObject.Parse(json);
+                            }
+                            catch (Exception e)
+                            {
+
+                                throw new ArgumentOutOfRangeException(nameof(ISqsMessage.RedriveAllowPolicy), SqsMessageAttributeBuilder.RedriveAllPolicyNotValidJsonExceptionMessage);
+                            }
+                            data.RedriveAllowPolicy = json;
+                        }
+                        break;
+                    // RedrivePolicy
+                    case nameof(ISqsMessage.RedrivePolicy):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.RedrivePolicy = attNamedArgument.Value.Value.ToString();
+                        }
+                        break;
+                    // Tags
+                    case nameof(ISqsMessage.Tags):
+                        if (attNamedArgument.Value.Values.Any())
+                        {
+                            var final = new List<string>();
+
+                            foreach (var pair in attNamedArgument.Value.Values)
+                            {
+                                final.Add(pair.Value.ToString());
+                            }
+
+                            data.Tags = final.ToArray();
+                        }
+                        break;
+                    case nameof(ISqsMessage.EventFilterCriteria):
+                        if (attNamedArgument.Value.Values.Any())
+                        {
+                            var final = new List<string>();
+
+                            foreach (var pair in attNamedArgument.Value.Values)
+                            {
+                                final.Add(pair.Value.ToString());
+                            }
+
+                            data.EventFilterCriteria = final.ToArray();
+                        }
+                        break;
+                    /// MaximumBatchingWindowInSeconds
+                    case nameof(ISqsMessage.EventMaximumBatchingWindowInSeconds):
+                        if (!string.IsNullOrEmpty(attNamedArgument.Value.Value?.ToString()))
+                        {
+                            data.EventMaximumBatchingWindowInSeconds = uint.Parse(attNamedArgument.Value.Value.ToString());
+                        }
+                        break;
+
+
+                    default:
+                        throw new NotSupportedException(attNamedArgument.Key);
+                }
+            }
+
+            //if (data.FifoQueue && !string.IsNullOrEmpty(data.QueueName) && !data.QueueName.EndsWith(".fifo"))
+            //{
+            //    throw new ArgumentOutOfRangeException(nameof(SqsMessageAttribute.QueueName), $"If using {nameof(SqsMessageAttribute.FifoQueue)} = true, {nameof(SqsMessageAttribute.QueueName)} must end in '.fifo'");
+            //}
+
+            return data;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Amazon.Lambda.Annotations.SourceGenerator.Models
+{
+    public interface ISqsMessageSerializable : ISqsMessage
+    {
+        string SourceGeneratorVersion { get; set; }
+    }
+}

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

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json.Linq;
+
+namespace Amazon.Lambda.Annotations.SourceGenerator.Models
+{
+    public interface ISqsQueueSerializable
+    {
+        string QueueLogicalId { get; set; }
+        JToken QueueName { get; set; }
+        uint EventBatchSize { get; set; }
+        string[] EventFilterCriteria { get; set; }
+        string EventQueueARN { get; set; }
+        bool ContentBasedDeduplication { get; set; }
+        uint EventMaximumBatchingWindowInSeconds { get; set; }
+        string DeduplicationScope { get; set; }
+        uint DelaySeconds { get; set; }
+        bool FifoQueue { get; set; }
+        string FifoThroughputLimit { get; set; }
+        uint KmsDataKeyReusePeriodSeconds { get; set; }
+        string KmsMasterKeyId { get; set; }
+        uint MaximumMessageSize { get; set; }
+        uint MessageRetentionPeriod { get; set; }
+        uint ReceiveMessageWaitTimeSeconds { get; set; }
+        string RedriveAllowPolicy { get; set; }
+        string RedrivePolicy { get; set; }
+        string[] Tags { get; set; }
+        uint VisibilityTimeout { get; set; }
+
+    }
+}

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

@@ -0,0 +1,28 @@
+using Newtonsoft.Json.Linq;
+
+namespace Amazon.Lambda.Annotations.SourceGenerator.Models
+{
+    public class SqsQueueModel : ISqsQueueSerializable
+    {
+        public string QueueLogicalId { get; set; }
+        public JToken QueueName { get; set; }
+        public uint EventBatchSize { get; set; }
+        public string[] EventFilterCriteria { get; set; }
+        public string EventQueueARN { get; set; }
+        public bool ContentBasedDeduplication { get; set; }
+        public uint EventMaximumBatchingWindowInSeconds { get; set; }
+        public string DeduplicationScope { get; set; }
+        public uint DelaySeconds { get; set; }
+        public bool FifoQueue { get; set; }
+        public string FifoThroughputLimit { get; set; }
+        public uint KmsDataKeyReusePeriodSeconds { get; set; }
+        public string KmsMasterKeyId { get; set; }
+        public uint MaximumMessageSize { get; set; }
+        public uint MessageRetentionPeriod { get; set; }
+        public uint ReceiveMessageWaitTimeSeconds { get; set; }
+        public string RedriveAllowPolicy { get; set; }
+        public string RedrivePolicy { get; set; }
+        public string[] Tags { get; set; }
+        public uint VisibilityTimeout { get; set; }
+    }
+}