Skip to content

Commit a39fcb9

Browse files
normjnormj
authored
Update AWS SDK dependencies (#298)
1 parent 3927e94 commit a39fcb9

File tree

11 files changed

+59
-36
lines changed

11 files changed

+59
-36
lines changed

‎.autover/changes/32ed76f9-11d9-41f0-afbe-6577cc63554e.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "AWS.Messaging.Lambda",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Update AWS SDK Dependencies"
8+
]
9+
}
10+
]
11+
}

‎.autover/changes/ff1384b4-5921-45cc-9596-0620d31d1375.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "AWS.Messaging",
5+
"Type": "Patch",
6+
"ChangelogMessages": [
7+
"Update AWS SDK Dependencies"
8+
]
9+
}
10+
]
11+
}

‎src/AWS.Messaging.Lambda/AWS.Messaging.Lambda.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.1" />
28+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
2929
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
3030
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3131
</ItemGroup>

‎src/AWS.Messaging/AWS.Messaging.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.0" />
31-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
32-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0" />
33-
<PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
30+
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.5.4" />
31+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
32+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.4" />
33+
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.2" />
3434
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
3535
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.*" />
3636
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />

‎src/AWS.Messaging/Configuration/AWSClientProvider.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace AWS.Messaging.Configuration;
1111
/// </summary>
1212
internal class AWSClientProvider : IAWSClientProvider
1313
{
14-
private const string _userAgentHeader = "User-Agent";
1514
private static readonly string _userAgentString = $"lib/aws-dotnet-messaging#{TelemetryKeys.AWSMessagingAssemblyVersion}";
1615

1716
private readonly IServiceProvider _serviceProvider;
@@ -37,9 +36,10 @@ public T GetServiceClient<T>() where T : IAmazonService
3736

3837
internal static void AWSServiceClient_BeforeServiceRequest(object sender, RequestEventArgs e)
3938
{
40-
if (e is not WebServiceRequestEventArgs args || !args.Headers.TryGetValue(_userAgentHeader, out var value) || value.Contains(_userAgentString))
41-
return;
42-
43-
args.Headers[_userAgentHeader] = value + " " + _userAgentString;
39+
WebServiceRequestEventArgs? args = e as WebServiceRequestEventArgs;
40+
if (args != null && args.Request is Amazon.Runtime.Internal.IAmazonWebServiceRequest internalRequest && !internalRequest.UserAgentDetails.GetCustomUserAgentComponents().Contains(_userAgentString))
41+
{
42+
internalRequest.UserAgentDetails.AddUserAgentComponent(_userAgentString);
43+
}
4444
}
4545
}

‎test/AWS.Messaging.IntegrationTests/AWS.Messaging.IntegrationTests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0" />
13-
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0" />
14-
<PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
15-
<PackageReference Include="AWSSDK.S3" Version="4.0.0" />
16-
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0" />
12+
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.9.2" />
13+
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.6" />
14+
<PackageReference Include="AWSSDK.Lambda" Version="4.0.6.2" />
15+
<PackageReference Include="AWSSDK.S3" Version="4.0.11.1" />
16+
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.4" />
1717
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*" />
1919
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
20-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0" />
21-
<PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
22-
<PackageReference Include="xunit" Version="2.6.2" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
20+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
21+
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.2" />
22+
<PackageReference Include="xunit" Version="2.9.3" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>
2727
<PackageReference Include="coverlet.collector" Version="6.0.4">
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
31+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎test/AWS.Messaging.IntegrationTests/SubscriberTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ await publisher.PublishAsync(new ChatMessage
134134
var inMemoryLogger = serviceProvider.GetRequiredService<InMemoryLogger>();
135135
var tempStorage = serviceProvider.GetRequiredService<TempStorage<ChatMessage>>();
136136

137-
Assert.Empty(inMemoryLogger.Logs.Where(x => x.Exception is AmazonSQSException ex && ex.ErrorCode.Equals("AWS.SimpleQueueService.TooManyEntriesInBatchRequest")));
137+
Assert.DoesNotContain(inMemoryLogger.Logs, (x => x.Exception is AmazonSQSException ex && ex.ErrorCode.Equals("AWS.SimpleQueueService.TooManyEntriesInBatchRequest")));
138138
Assert.Equal(numberOfMessages, tempStorage.Messages.Count);
139139
for (int i = 0; i < numberOfMessages; i++)
140140
{
@@ -216,7 +216,8 @@ await publisher.PublishAsync(new ChatMessage
216216

217217
var inMemoryLogger = serviceProvider.GetRequiredService<InMemoryLogger>();
218218

219-
Assert.Empty(inMemoryLogger.Logs.Where(x => x.Exception is AmazonSQSException ex && ex.ErrorCode.Equals("AWS.SimpleQueueService.TooManyEntriesInBatchRequest")));
219+
Assert.DoesNotContain(inMemoryLogger.Logs, (x => x.Exception is AmazonSQSException ex && ex.ErrorCode.Equals("AWS.SimpleQueueService.TooManyEntriesInBatchRequest")));
220+
220221
Assert.Equal(5, tempStorage.Messages.Count);
221222
for (int i = 0; i < 5; i++)
222223
{

‎test/AWS.Messaging.Tests.Common/AWS.Messaging.Tests.Common.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.0" />
13-
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.0" />
14-
<PackageReference Include="AWSSDK.Lambda" Version="4.0.0" />
15-
<PackageReference Include="AWSSDK.S3" Version="4.0.0" />
16-
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0" />
17-
<PackageReference Include="AWSSDK.SQS" Version="4.0.0" />
12+
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="4.0.9.2" />
13+
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.6" />
14+
<PackageReference Include="AWSSDK.Lambda" Version="4.0.6.2" />
15+
<PackageReference Include="AWSSDK.S3" Version="4.0.11.1" />
16+
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.4" />
17+
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.2" />
1818
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
1919
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*" />
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />

‎test/AWS.Messaging.Tests.LambdaFunctions/AWS.Messaging.Tests.LambdaFunctions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PublishReadyToRun>true</PublishReadyToRun>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.1" />
14+
<PackageReference Include="Amazon.Lambda.Core" Version="2.8.0" />
1515
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
1616
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
1717
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />

‎test/AWS.Messaging.UnitTests/AWS.Messaging.UnitTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.*" />
2323
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2525
<PackageReference Include="Moq" Version="4.18.4" />
2626
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.6.0" />
27-
<PackageReference Include="xunit" Version="2.6.2" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
27+
<PackageReference Include="xunit" Version="2.9.3" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>

0 commit comments

Comments
 (0)