Skip to content

Commit 7366003

Browse files
philasmarphilasmar
committed
Merge branch 'dev'
2 parents 0b3e1bf + d19d5d1 commit 7366003

File tree

11 files changed

+74
-30
lines changed

11 files changed

+74
-30
lines changed

‎Libraries/src/Amazon.Lambda.MQEvents/Amazon.Lambda.MQEvents.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
77
<Description>Amazon Lambda .NET Core support - MQEvents package.</Description>
88
<AssemblyTitle>Amazon.Lambda.MQEvents</AssemblyTitle>
9-
<VersionPrefix>1.1.0</VersionPrefix>
9+
<VersionPrefix>2.0.0</VersionPrefix>
1010
<AssemblyName>Amazon.Lambda.MQEvents</AssemblyName>
1111
<PackageId>Amazon.Lambda.MQEvents</PackageId>
1212
<PackageTags>AWS;Amazon;Lambda;Amazon MQ;Rabbit MQ;Apache Active MQ</PackageTags>

‎Libraries/src/Amazon.Lambda.MQEvents/RabbitMQEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class BasicProperties
7474
/// <summary>
7575
/// Priority
7676
/// </summary>
77-
public int Priority { get; set; }
77+
public int? Priority { get; set; }
7878

7979
/// <summary>
8080
/// Correlation ID

‎Libraries/test/EventsTests.Shared/EventTests.cs

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,26 +2823,47 @@ public void RabbitMQEventTest(Type serializerType)
28232823
Assert.Equal("arn:aws:mq:us-west-2:112556298976:broker:pizzaBroker:b-9bcfa592-423a-4942-879d-eb284b418fc8", rabbitmqEvent.EventSourceArn);
28242824

28252825
Assert.Equal(1, rabbitmqEvent.RmqMessagesByQueue.Count);
2826-
Assert.Equal(1, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"].Count);
2827-
Assert.NotNull(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties);
2828-
Assert.Equal("text/plain", rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.ContentType);
2829-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.ContentEncoding);
2830-
Assert.Equal(3, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.Headers.Count);
2831-
Assert.Equal(1, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.DeliveryMode);
2832-
Assert.Equal(34, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.Priority);
2833-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.CorrelationId);
2834-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.ReplyTo);
2835-
Assert.Equal("60000", rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.Expiration);
2836-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.MessageId);
2837-
Assert.NotNull(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.Timestamp);
2838-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.Type);
2839-
Assert.Equal("AIDACKCEVSQ6C2EXAMPLE", rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.UserId);
2840-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.AppId);
2841-
Assert.Null(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.ClusterId);
2842-
Assert.Equal(80, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].BasicProperties.BodySize);
2843-
2844-
Assert.False(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].Redelivered);
2845-
Assert.Equal("{\"timeout\":0,\"data\":\"CZrmf0Gw8Ov4bqLQxD4E\"}", Encoding.UTF8.GetString(Convert.FromBase64String(rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0].Data)));
2826+
Assert.Equal(2, rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"].Count);
2827+
2828+
var firstMessage = rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][0];
2829+
Assert.NotNull(firstMessage.BasicProperties);
2830+
Assert.Equal("text/plain", firstMessage.BasicProperties.ContentType);
2831+
Assert.Null(firstMessage.BasicProperties.ContentEncoding);
2832+
Assert.Equal(3, firstMessage.BasicProperties.Headers.Count);
2833+
Assert.Equal(1, firstMessage.BasicProperties.DeliveryMode);
2834+
Assert.Equal(34, firstMessage.BasicProperties.Priority);
2835+
Assert.Null(firstMessage.BasicProperties.CorrelationId);
2836+
Assert.Null(firstMessage.BasicProperties.ReplyTo);
2837+
Assert.Equal("60000", firstMessage.BasicProperties.Expiration);
2838+
Assert.Null(firstMessage.BasicProperties.MessageId);
2839+
Assert.NotNull(firstMessage.BasicProperties.Timestamp);
2840+
Assert.Null(firstMessage.BasicProperties.Type);
2841+
Assert.Equal("AIDACKCEVSQ6C2EXAMPLE", firstMessage.BasicProperties.UserId);
2842+
Assert.Null(firstMessage.BasicProperties.AppId);
2843+
Assert.Null(firstMessage.BasicProperties.ClusterId);
2844+
Assert.Equal(80, firstMessage.BasicProperties.BodySize);
2845+
Assert.False(firstMessage.Redelivered);
2846+
Assert.Equal("{\"timeout\":0,\"data\":\"CZrmf0Gw8Ov4bqLQxD4E\"}", Encoding.UTF8.GetString(Convert.FromBase64String(firstMessage.Data)));
2847+
2848+
var secondMessage = rabbitmqEvent.RmqMessagesByQueue["pizzaQueue::/"][1];
2849+
Assert.NotNull(secondMessage.BasicProperties);
2850+
Assert.Null(secondMessage.BasicProperties.ContentType);
2851+
Assert.Null(secondMessage.BasicProperties.ContentEncoding);
2852+
Assert.Equal(0, secondMessage.BasicProperties.Headers.Count);
2853+
Assert.Equal(1, secondMessage.BasicProperties.DeliveryMode);
2854+
Assert.Null(secondMessage.BasicProperties.Priority);
2855+
Assert.Null(secondMessage.BasicProperties.CorrelationId);
2856+
Assert.Null(secondMessage.BasicProperties.ReplyTo);
2857+
Assert.Null(secondMessage.BasicProperties.Expiration);
2858+
Assert.Null(secondMessage.BasicProperties.MessageId);
2859+
Assert.Null(secondMessage.BasicProperties.Timestamp);
2860+
Assert.Null(secondMessage.BasicProperties.Type);
2861+
Assert.Null(secondMessage.BasicProperties.UserId);
2862+
Assert.Null(secondMessage.BasicProperties.AppId);
2863+
Assert.Null(secondMessage.BasicProperties.ClusterId);
2864+
Assert.Equal(11, secondMessage.BasicProperties.BodySize);
2865+
Assert.True(secondMessage.Redelivered);
2866+
Assert.Equal("Hello World", Encoding.UTF8.GetString(Convert.FromBase64String(secondMessage.Data)));
28462867
}
28472868
}
28482869

‎Libraries/test/EventsTests.Shared/amazonmq-rabbitmq.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@
4545
},
4646
"redelivered": false,
4747
"data": "eyJ0aW1lb3V0IjowLCJkYXRhIjoiQ1pybWYwR3c4T3Y0YnFMUXhENEUifQ=="
48+
},
49+
{
50+
"basicProperties": {
51+
"contentType": null,
52+
"contentEncoding": null,
53+
"headers": {},
54+
"deliveryMode": 1,
55+
"priority": null,
56+
"correlationId": null,
57+
"replyTo": null,
58+
"expiration": null,
59+
"messageId": null,
60+
"timestamp": null,
61+
"type": null,
62+
"userId": null,
63+
"appId": null,
64+
"clusterId": null,
65+
"bodySize": 11
66+
},
67+
"redelivered": true,
68+
"data": "SGVsbG8gV29ybGQ="
4869
}
4970
]
5071
}

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<OutputType>Exe</OutputType>
77
<Description>A tool to help debug and test your .NET Core AWS Lambda functions locally.</Description>
88
<LangVersion>Latest</LangVersion>
9-
<VersionPrefix>0.14.0</VersionPrefix>
9+
<VersionPrefix>0.14.1</VersionPrefix>
1010
<Product>AWS .NET Lambda Test Tool</Product>
1111
<Copyright>Apache 2</Copyright>
1212
<PackageTags>AWS;Amazon;Lambda</PackageTags>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester31-pack.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
77
<Description>A tool to help debug and test your .NET Core 3.1 AWS Lambda functions locally.</Description>
8-
<VersionPrefix>0.14.0</VersionPrefix>
8+
<VersionPrefix>0.14.1</VersionPrefix>
99
<Product>AWS .NET Lambda Test Tool</Product>
1010
<Copyright>Apache 2</Copyright>
1111
<PackageTags>AWS;Amazon;Lambda</PackageTags>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester50-pack.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
77
<Description>A tool to help debug and test your .NET 5.0 AWS Lambda functions locally.</Description>
8-
<VersionPrefix>0.14.0</VersionPrefix>
8+
<VersionPrefix>0.14.1</VersionPrefix>
99
<Product>AWS .NET Lambda Test Tool</Product>
1010
<Copyright>Apache 2</Copyright>
1111
<PackageTags>AWS;Amazon;Lambda</PackageTags>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
77
<Description>A tool to help debug and test your .NET 6.0 AWS Lambda functions locally.</Description>
8-
<VersionPrefix>0.14.0</VersionPrefix>
8+
<VersionPrefix>0.14.1</VersionPrefix>
99
<Product>AWS .NET Lambda Test Tool</Product>
1010
<Copyright>Apache 2</Copyright>
1111
<PackageTags>AWS;Amazon;Lambda</PackageTags>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester70-pack.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
77
<Description>A tool to help debug and test your .NET 7.0 AWS Lambda functions locally.</Description>
8-
<VersionPrefix>0.14.0</VersionPrefix>
8+
<VersionPrefix>0.14.1</VersionPrefix>
99
<Product>AWS .NET Lambda Test Tool</Product>
1010
<Copyright>Apache 2</Copyright>
1111
<PackageTags>AWS;Amazon;Lambda</PackageTags>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
13+
<PackageReference Include="AWSSDK.SSO" Version="3.7.200.18" />
14+
<PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.200.18" />
1315
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1416
<PackageReference Include="YamlDotNet.Signed" Version="5.2.1" />
1517

16-
<PackageReference Include="AWSSDK.Core" Version="3.7.0" />
17-
<PackageReference Include="AWSSDK.SQS" Version="3.7.0" />
18+
<PackageReference Include="AWSSDK.Core" Version="3.7.200.18" />
19+
<PackageReference Include="AWSSDK.SQS" Version="3.7.200.19" />
1820
</ItemGroup>
1921

2022
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

‎Tools/LambdaTestTool/tests/Amazon.Lambda.TestTool.Tests.NETCore31/Amazon.Lambda.TestTool.Tests.NETCore31.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="xunit" Version="2.3.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1818
<PackageReference Include="LitJson" Version="0.13.0" />
19-
<PackageReference Include="AWSSDK.SQS" Version="3.7.0" />
19+
<PackageReference Include="AWSSDK.SQS" Version="3.7.200.19" />
2020
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2121
</ItemGroup>
2222
<ItemGroup>

0 commit comments

Comments
 (0)