From 773f712159afb53335a0a5def93458343a1dd2e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Dec 2025 02:30:09 +0000 Subject: [PATCH 1/2] Bump AWSSDK.Core and 18 others Bumps AWSSDK.Core from 3.7.402.68 to 4.0.3.3 Bumps AWSSDK.Extensions.NETCore.Setup from 3.7.400 to 4.0.3.14 Bumps AWSSDK.SimpleNotificationService from 3.7.400.162 to 4.0.2.7 Bumps AWSSDK.SQS from 3.7.400.162 to 4.0.2.5 Bumps Elastic.CommonSchema.Serilog from 8.19.0 to 9.0.0 Bumps Elastic.Serilog.Enrichers.Web from 8.19.0 to 9.0.0 Bumps FluentValidation.DependencyInjectionExtensions from 12.0.0 to 12.1.0 Bumps Humanizer.Core from 2.14.1 to 3.0.1 Bumps Microsoft.AspNetCore.HeaderPropagation from 9.0.8 to 9.0.11 Bumps Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization from 9.8.0 to 10.0.0 Bumps Microsoft.Extensions.Http.Polly from 9.0.8 to 10.0.0 Bumps Microsoft.Extensions.Http.Resilience from 9.8.0 to 10.0.0 Bumps Polly from 8.6.3 to 8.6.5 Bumps Serilog.AspNetCore from 9.0.0 to 10.0.0 Bumps Serilog.Enrichers.ClientInfo from 2.4.0 to 2.7.0 Bumps Serilog.Settings.Configuration from 9.0.0 to 10.0.0 Bumps SlimMessageBus.Host.AmazonSQS from 3.3.1 to 3.3.6 Bumps SlimMessageBus.Host.Serialization.SystemTextJson from 3.3.1 to 3.3.6 Bumps Swashbuckle.AspNetCore from 9.0.3 to 10.0.1 --- updated-dependencies: - dependency-name: AWSSDK.Core dependency-version: 4.0.3.3 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: AWSSDK.Extensions.NETCore.Setup dependency-version: 4.0.3.14 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: AWSSDK.SimpleNotificationService dependency-version: 4.0.2.7 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: AWSSDK.SQS dependency-version: 4.0.2.5 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Elastic.CommonSchema.Serilog dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Elastic.Serilog.Enrichers.Web dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: FluentValidation.DependencyInjectionExtensions dependency-version: 12.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: Humanizer.Core dependency-version: 3.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Microsoft.AspNetCore.HeaderPropagation dependency-version: 9.0.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Microsoft.Extensions.Http.Polly dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Microsoft.Extensions.Http.Resilience dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Polly dependency-version: 8.6.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: Serilog.AspNetCore dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Serilog.Settings.Configuration dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch - dependency-name: Serilog.Enrichers.ClientInfo dependency-version: 2.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: SlimMessageBus.Host.AmazonSQS dependency-version: 3.3.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: SlimMessageBus.Host.Serialization.SystemTextJson dependency-version: 3.3.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch - dependency-name: Swashbuckle.AspNetCore dependency-version: 10.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] --- BtmsGateway/BtmsGateway.csproj | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/BtmsGateway/BtmsGateway.csproj b/BtmsGateway/BtmsGateway.csproj index 035f900..88374ba 100644 --- a/BtmsGateway/BtmsGateway.csproj +++ b/BtmsGateway/BtmsGateway.csproj @@ -24,29 +24,29 @@ - - - - + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + From 746e8a0b5c8cc63ec55f1077e0d6013b410d8ece Mon Sep 17 00:00:00 2001 From: Thomas Andoerson Date: Wed, 3 Dec 2025 07:13:29 +0000 Subject: [PATCH 2/2] fixed breaking changes --- .../Config/BasicAuthRequirementFilter.cs | 34 ------------------- BtmsGateway/Config/Swagger.cs | 7 ++-- .../Admin/ResourceEventsDeadLetterService.cs | 12 ++++--- .../BtmsGateway.Test/BtmsGateway.Test.csproj | 2 -- 4 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 BtmsGateway/Config/BasicAuthRequirementFilter.cs diff --git a/BtmsGateway/Config/BasicAuthRequirementFilter.cs b/BtmsGateway/Config/BasicAuthRequirementFilter.cs deleted file mode 100644 index ff58717..0000000 --- a/BtmsGateway/Config/BasicAuthRequirementFilter.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using BtmsGateway.Authentication; -using Microsoft.AspNetCore.Authorization; -using Microsoft.OpenApi.Models; -using Swashbuckle.AspNetCore.SwaggerGen; - -namespace BtmsGateway.Config; - -[ExcludeFromCodeCoverage] -public class BasicAuthRequirementFilter : IOperationFilter -{ - public void Apply(OpenApiOperation operation, OperationFilterContext context) - { - if (!context.ApiDescription.ActionDescriptor.EndpointMetadata.OfType().Any()) - return; - - operation.Security = new List - { - new OpenApiSecurityRequirement - { - [ - new OpenApiSecurityScheme - { - Reference = new OpenApiReference - { - Type = ReferenceType.SecurityScheme, - Id = BasicAuthenticationHandler.SchemeName, - }, - } - ] = new List(), - }, - }; - } -} diff --git a/BtmsGateway/Config/Swagger.cs b/BtmsGateway/Config/Swagger.cs index 89675a7..dab73ca 100644 --- a/BtmsGateway/Config/Swagger.cs +++ b/BtmsGateway/Config/Swagger.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; using BtmsGateway.Authentication; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; namespace BtmsGateway.Config; @@ -23,7 +23,10 @@ public static void ConfigureSwaggerBuilder(this WebApplicationBuilder builder) Scheme = BasicAuthenticationHandler.SchemeName, } ); - c.OperationFilter(); + c.AddSecurityRequirement(document => new OpenApiSecurityRequirement + { + [new OpenApiSecuritySchemeReference("Basic", document)] = [], + }); }); } } diff --git a/BtmsGateway/Services/Admin/ResourceEventsDeadLetterService.cs b/BtmsGateway/Services/Admin/ResourceEventsDeadLetterService.cs index e7bdfcb..ed3616f 100644 --- a/BtmsGateway/Services/Admin/ResourceEventsDeadLetterService.cs +++ b/BtmsGateway/Services/Admin/ResourceEventsDeadLetterService.cs @@ -72,7 +72,7 @@ public async Task 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)"; } @@ -152,18 +152,22 @@ public async Task 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 ); diff --git a/tests/BtmsGateway.Test/BtmsGateway.Test.csproj b/tests/BtmsGateway.Test/BtmsGateway.Test.csproj index 94e481a..d32c903 100644 --- a/tests/BtmsGateway.Test/BtmsGateway.Test.csproj +++ b/tests/BtmsGateway.Test/BtmsGateway.Test.csproj @@ -9,13 +9,11 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive -