Skip to content

Bump AWSSDK.Core and 18 others #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
+31 −60
Closed

Bump AWSSDK.Core and 18 others #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
773f712
Bump AWSSDK.Core and 18 others
dependabot[bot] Dec 2, 2025
a113076
Merge branch 'main' into dependabot/nuget/BtmsGateway/minor-and-patch…
t11omas Dec 3, 2025
9650f9b
Merge branch 'main' into dependabot/nuget/BtmsGateway/minor-and-patch…
t11omas Dec 3, 2025
746e8a0
fixed breaking changes
t11omas Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions BtmsGateway/BtmsGateway.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Amazon.CloudWatch.EMF" Version="2.2.0" />
<PackageReference Include="AWSSDK.Core" Version="3.7.402.68" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.400.162" />
<PackageReference Include="AWSSDK.SQS" Version="3.7.400.162" />
<PackageReference Include="AWSSDK.Core" Version="4.0.3.3" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.14" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.7" />
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.5" />
<PackageReference Include="Defra.TradeImportsDataApi.Domain" Version="0.32.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.19.0" />
<PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="8.19.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
<PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="9.0.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
<PackageReference Include="Humanizer.Core" Version="3.0.1" />
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization" Version="9.8.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0" />
<PackageReference Include="Polly" Version="8.6.3" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.11" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageReference Include="Polly" Version="8.6.5" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageReference Include="SlimMessageBus" Version="3.0.0" />
<PackageReference Include="SlimMessageBus.Host.AmazonSQS" Version="3.3.1" />
<PackageReference Include="SlimMessageBus.Host.Serialization.SystemTextJson" Version="3.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.4.0" />
<PackageReference Include="SlimMessageBus.Host.AmazonSQS" Version="3.3.6" />
<PackageReference Include="SlimMessageBus.Host.Serialization.SystemTextJson" Version="3.3.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.7.0" />
</ItemGroup>
<ItemGroup>
<None Update="Services\Fixtures\DecisionNotification.xml">
Expand Down
34 changes: 0 additions & 34 deletions BtmsGateway/Config/BasicAuthRequirementFilter.cs
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions BtmsGateway/Config/Swagger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using BtmsGateway.Authentication;
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;

namespace BtmsGateway.Config;

Expand All @@ -23,7 +23,10 @@ public static void ConfigureSwaggerBuilder(this WebApplicationBuilder builder)
Scheme = BasicAuthenticationHandler.SchemeName,
}
);
c.OperationFilter<BasicAuthRequirementFilter>();
c.AddSecurityRequirement(document => new OpenApiSecurityRequirement
{
[new OpenApiSecuritySchemeReference("Basic", document)] = [],
});
});
}
}
Expand Down
12 changes: 8 additions & 4 deletions BtmsGateway/Services/Admin/ResourceEventsDeadLetterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public async Task<string> Remove(string messageId, CancellationToken cancellatio
};

var response = await amazonSqs.ReceiveMessageAsync(request, cancellationToken);
if (response.Messages.Count == 0)
if (response.Messages is null || response.Messages.Count == 0)
{
return $"No messages found (visibility timeout used was {request.VisibilityTimeout} seconds, therefore wait before retrying)";
}
Expand Down Expand Up @@ -152,18 +152,22 @@ public async Task<bool> Drain(CancellationToken cancellationToken)
};

var deleteResponse = await amazonSqs.DeleteMessageBatchAsync(deleteRequest, cancellationToken);
if (deleteResponse.HttpStatusCode != HttpStatusCode.OK || deleteResponse.Failed.Count > 0)
if (
deleteResponse.HttpStatusCode != HttpStatusCode.OK
|| (deleteResponse.Failed is not null && deleteResponse.Failed.Count > 0)
)
{
logger.LogWarning("Failed to remove a batch of message(s), stopping");

return false;
}

removed += deleteResponse.Successful.Count;
var successfulCount = deleteResponse.Successful?.Count ?? 0;
removed += successfulCount;

logger.LogInformation(
"Removed batch of {Total} message(s), total so far {Removed}",
deleteResponse.Successful.Count,
successfulCount,
removed
);

Expand Down
2 changes: 0 additions & 2 deletions tests/BtmsGateway.Test/BtmsGateway.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
<Using Include="Xunit" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SQS" Version="3.7.400.162" />
<PackageReference Include="FluentAssertions" Version="7.2.0" />
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
Expand Down
Loading