feat(bindings): add high throughput fifo properties (LEGO#135)

Gadam8 · adam.gloyne · web-flow · commit 44ffcf4ceaf0 · 2023-11-01T14:25:14.000+01:00
Co-authored-by: adam.gloyne &lt;adam.gloyne@justeattakeaway.com&gt;
diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/Queue.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/Queue.cs
@@ -2,12 +2,9 @@ namespace LEGO.AsyncAPI.Bindings.Sqs
 {
     using System;
     using System.Collections.Generic;
-    using LEGO.AsyncAPI.Models;
     using LEGO.AsyncAPI.Models.Interfaces;
     using LEGO.AsyncAPI.Writers;
-    using Extensions;
-    using LEGO.AsyncAPI.Readers;
-    using LEGO.AsyncAPI.Readers.ParseNodes;
+    using LEGO.AsyncAPI.Attributes;
 
     public class Queue : IAsyncApiExtensible
     {
@@ -21,6 +18,16 @@ public class Queue : IAsyncApiExtensible
         /// </summary>
         public bool FifoQueue { get; set; }
 
+        /// <summary>
+        /// Specifies whether message deduplication occurs at the message group or queue level. Valid values are messageGroup and queue (default).
+        /// </summary>
+        public DeduplicationScope? DeduplicationScope { get; set; }
+
+        /// <summary>
+        /// Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. Valid values are perQueue (default) and perMessageGroupId.
+        /// </summary>
+       public FifoThroughputLimit? FifoThroughputLimit { get; set; }
+
         /// <summary>
         /// The number of seconds to delay before a message sent to the queue can be received. used to create a delay queue.
         /// </summary>
@@ -68,6 +75,8 @@ public void Serialize(IAsyncApiWriter writer)
             writer.WriteStartObject();
             writer.WriteRequiredProperty("name", this.Name);
             writer.WriteOptionalProperty("fifoQueue", this.FifoQueue);
+            writer.WriteOptionalProperty("deduplicationScope", this.DeduplicationScope?.GetDisplayName());
+            writer.WriteOptionalProperty("fifoThroughputLimit", this.FifoThroughputLimit?.GetDisplayName());
             writer.WriteOptionalProperty("deliveryDelay", this.DeliveryDelay);
             writer.WriteOptionalProperty("visibilityTimeout", this.VisibilityTimeout);
             writer.WriteOptionalProperty("receiveMessageWaitTime", this.ReceiveMessageWaitTime);
@@ -79,4 +88,16 @@ public void Serialize(IAsyncApiWriter writer)
             writer.WriteEndObject();
         }
     }
+
+    public enum DeduplicationScope
+    {
+        [Display("queue")] Queue,
+        [Display("messageGroup")] MessageGroup,
+    }
+
+    public enum FifoThroughputLimit
+    {
+        [Display("perQueue")] PerQueue,
+        [Display("perMessageGroupId")] PerMessageGroupId,
+    }
 }
diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/SqsChannelBinding.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/SqsChannelBinding.cs
@@ -31,6 +31,8 @@ public class SqsChannelBinding : ChannelBinding<SqsChannelBinding>
         {
             { "name", (a, n) => { a.Name = n.GetScalarValue(); } },
             { "fifoQueue", (a, n) => { a.FifoQueue = n.GetBooleanValue(); } },
+            { "deduplicationScope", (a, n) => { a.DeduplicationScope = n.GetScalarValue().GetEnumFromDisplayName<DeduplicationScope>(); } },
+            { "fifoThroughputLimit", (a, n) => { a.FifoThroughputLimit = n.GetScalarValue().GetEnumFromDisplayName<FifoThroughputLimit>(); } },
             { "deliveryDelay", (a, n) => { a.DeliveryDelay = n.GetIntegerValue(); } },
             { "visibilityTimeout", (a, n) => { a.VisibilityTimeout = n.GetIntegerValue(); } },
             { "receiveMessageWaitTime", (a, n) => { a.ReceiveMessageWaitTime = n.GetIntegerValue(); } },
diff --git a/src/LEGO.AsyncAPI.Bindings/Sqs/SqsOperationBinding.cs b/src/LEGO.AsyncAPI.Bindings/Sqs/SqsOperationBinding.cs
@@ -23,6 +23,8 @@ public class SqsOperationBinding : OperationBinding<SqsOperationBinding>
         {
             { "name", (a, n) => { a.Name = n.GetScalarValue(); } },
             { "fifoQueue", (a, n) => { a.FifoQueue = n.GetBooleanValue(); } },
+            { "deduplicationScope", (a, n) => { a.DeduplicationScope = n.GetScalarValue().GetEnumFromDisplayName<DeduplicationScope>(); } },
+            { "fifoThroughputLimit", (a, n) => { a.FifoThroughputLimit = n.GetScalarValue().GetEnumFromDisplayName<FifoThroughputLimit>(); } },
             { "deliveryDelay", (a, n) => { a.DeliveryDelay = n.GetIntegerValue(); } },
             { "visibilityTimeout", (a, n) => { a.VisibilityTimeout = n.GetIntegerValue(); } },
             { "receiveMessageWaitTime", (a, n) => { a.ReceiveMessageWaitTime = n.GetIntegerValue(); } },
diff --git a/test/LEGO.AsyncAPI.Tests/Bindings/Sqs/SqsBindings_should.cs b/test/LEGO.AsyncAPI.Tests/Bindings/Sqs/SqsBindings_should.cs
@@ -23,6 +23,8 @@ public void SqsChannelBinding_WithFilledObject_SerializesAndDeserializes()
     queue:
       name: myQueue
       fifoQueue: true
+      deduplicationScope: messageGroup
+      fifoThroughputLimit: perMessageGroupId
       deliveryDelay: 30
       visibilityTimeout: 60
       receiveMessageWaitTime: 0
@@ -78,6 +80,8 @@ public void SqsChannelBinding_WithFilledObject_SerializesAndDeserializes()
                 {
                     Name = "myQueue",
                     FifoQueue = true,
+                    DeduplicationScope = DeduplicationScope.MessageGroup,
+                    FifoThroughputLimit = FifoThroughputLimit.PerMessageGroupId,
                     DeliveryDelay = 30,
                     VisibilityTimeout = 60,
                     ReceiveMessageWaitTime = 0,
@@ -233,7 +237,6 @@ public void SqsOperationBinding_WithFilledObject_SerializesAndDeserializes()
   sqs:
     queues:
       - name: myQueue
-        fifoQueue: true
         deliveryDelay: 30
         visibilityTimeout: 60
         receiveMessageWaitTime: 0
@@ -291,7 +294,9 @@ public void SqsOperationBinding_WithFilledObject_SerializesAndDeserializes()
                     new Queue()
                     {
                         Name = "myQueue",
-                        FifoQueue = true,
+                        FifoQueue = false,
+                        DeduplicationScope = null,
+                        FifoThroughputLimit = null,
                         DeliveryDelay = 30,
                         VisibilityTimeout = 60,
                         ReceiveMessageWaitTime = 0,

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ public class SqsChannelBinding : ChannelBinding<SqsChannelBinding>`
`31`	`31`	`{`
`32`	`32`	`{ "name", (a, n) => { a.Name = n.GetScalarValue(); } },`
`33`	`33`	`{ "fifoQueue", (a, n) => { a.FifoQueue = n.GetBooleanValue(); } },`
	`34`	`+ { "deduplicationScope", (a, n) => { a.DeduplicationScope = n.GetScalarValue().GetEnumFromDisplayName<DeduplicationScope>(); } },`
	`35`	`+ { "fifoThroughputLimit", (a, n) => { a.FifoThroughputLimit = n.GetScalarValue().GetEnumFromDisplayName<FifoThroughputLimit>(); } },`
`34`	`36`	`{ "deliveryDelay", (a, n) => { a.DeliveryDelay = n.GetIntegerValue(); } },`
`35`	`37`	`{ "visibilityTimeout", (a, n) => { a.VisibilityTimeout = n.GetIntegerValue(); } },`
`36`	`38`	`{ "receiveMessageWaitTime", (a, n) => { a.ReceiveMessageWaitTime = n.GetIntegerValue(); } },`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ public class SqsOperationBinding : OperationBinding<SqsOperationBinding>`
`23`	`23`	`{`
`24`	`24`	`{ "name", (a, n) => { a.Name = n.GetScalarValue(); } },`
`25`	`25`	`{ "fifoQueue", (a, n) => { a.FifoQueue = n.GetBooleanValue(); } },`
	`26`	`+ { "deduplicationScope", (a, n) => { a.DeduplicationScope = n.GetScalarValue().GetEnumFromDisplayName<DeduplicationScope>(); } },`
	`27`	`+ { "fifoThroughputLimit", (a, n) => { a.FifoThroughputLimit = n.GetScalarValue().GetEnumFromDisplayName<FifoThroughputLimit>(); } },`
`26`	`28`	`{ "deliveryDelay", (a, n) => { a.DeliveryDelay = n.GetIntegerValue(); } },`
`27`	`29`	`{ "visibilityTimeout", (a, n) => { a.VisibilityTimeout = n.GetIntegerValue(); } },`
`28`	`30`	`{ "receiveMessageWaitTime", (a, n) => { a.ReceiveMessageWaitTime = n.GetIntegerValue(); } },`