chore: fix static analysis for AWS impls

Author: jeastham1993

user-management/CodeAnalysis.props

@@ -13,6 +13,6 @@
         <_SkipUpgradeNetAnalyzersNuGetWarning>false</_SkipUpgradeNetAnalyzersNuGetWarning>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
         <!-- CA2007 is calling .ConfigureAwait(false), which isn't required for non-libraries -->
-        <NoWarn>$(NoWarn);CA2007</NoWarn>
+        <NoWarn>$(NoWarn);CA2007;CA1016</NoWarn>
     </PropertyGroup>
 </Project>

user-management/src/Stickerlandia.UserManagement.AWS/AwsConfiguration.cs

@@ -2,6 +2,9 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2025 Datadog, Inc.
 
+// The SQS queue URL is required as a string
+#pragma warning disable CA1056
+
 namespace Stickerlandia.UserManagement.AWS;
 
 public class AwsConfiguration

user-management/src/Stickerlandia.UserManagement.AWS/ServiceExtensions.cs

@@ -15,14 +15,16 @@ public static class ServiceExtensions
 {
     public static IServiceCollection AddAwsAdapters(this IServiceCollection services, IConfiguration configuration)
     {
+        ArgumentNullException.ThrowIfNull(configuration);
+        
         services.AddPostgresAuthServices(configuration);
 
         services.Configure<AwsConfiguration>(
             configuration.GetSection("Aws"));
 
         services.AddSingleton<IMessagingWorker, SqsStickerClaimedWorker>();
-        services.AddSingleton(new AmazonSQSClient());
-        services.AddSingleton(new AmazonSimpleNotificationServiceClient());
+        services.AddSingleton(sp => new AmazonSQSClient());
+        services.AddSingleton(sp => new AmazonSimpleNotificationServiceClient());
 
         services.AddSingleton<IUserEventPublisher, SnsEventPublisher>();
 

user-management/src/Stickerlandia.UserManagement.AWS/SnsEventPublisher.cs

@@ -10,8 +10,10 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Saunter.Attributes;
+using Stickerlandia.UserManagement.Agnostic.Observability;
 using Stickerlandia.UserManagement.Core;
 using Stickerlandia.UserManagement.Core.RegisterUser;
+using Log = Stickerlandia.UserManagement.Core.Observability.Log;
 
 namespace Stickerlandia.UserManagement.AWS;
 
@@ -25,6 +27,8 @@ public class SnsEventPublisher(
     [PublishOperation(typeof(UserRegisteredEvent))]
     public async Task PublishUserRegisteredEventV1(UserRegisteredEvent userRegisteredEvent)
     {
+        ArgumentNullException.ThrowIfNull(userRegisteredEvent, nameof(userRegisteredEvent));
+        
         var cloudEvent = new CloudEvent(CloudEventsSpecVersion.V1_0)
         {
             Id = Guid.NewGuid().ToString(),
@@ -62,8 +66,9 @@ private async Task Publish(CloudEvent cloudEvent)
         }
         catch (Exception ex)
         {
-            logger.LogError(ex, "Failure publishing message");
+            Log.MessagePublishingError(logger, "Failure publishing event", ex);
             processScope?.Span.SetException(ex);
+            throw;
         }
         finally
         {

user-management/src/Stickerlandia.UserManagement.AWS/SqsStickerClaimedWorker.cs

@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Options;
 using Saunter.Attributes;
 using Stickerlandia.UserManagement.Core;
+using Stickerlandia.UserManagement.Core.Observability;
 using Stickerlandia.UserManagement.Core.StickerClaimedEvent;
 
 namespace Stickerlandia.UserManagement.AWS;
@@ -40,7 +41,7 @@ private async Task ProcessMessageAsync(Message message)
         using var processSpan = Tracer.Instance.StartActive($"process users.stickerClaimed.v1");
 
         using var scope = _serviceScopeFactory.CreateScope();
-        var handler = scope.ServiceProvider.GetRequiredService<StickerClaimedEventHandler>();
+        var handler = scope.ServiceProvider.GetRequiredService<StickerClaimedHandler>();
 
         var evtData = JsonSerializer.Deserialize<StickerClaimedEventV1>(message.Body);
 
@@ -58,7 +59,8 @@ private async Task ProcessMessageAsync(Message message)
         }
         catch (InvalidUserException ex)
         {
-            _logger.LogWarning(ex, "User with account in this event not found");
+            Log.InvalidUser(_logger, ex);
+            
             await _sqsClient.SendMessageAsync(_awsConfiguration.Value.StickerClaimedDLQUrl, message.Body);
         }
 
@@ -67,12 +69,11 @@ private async Task ProcessMessageAsync(Message message)
 
     public Task StartAsync()
     {
-        _logger.LogInformation("Starting SQS processor");
-        
+        Log.StartingMessageProcessor(_logger, "sqs");
         return Task.CompletedTask;
     }
 
-    public async Task PollAsync(CancellationToken cancellationToken)
+    public async Task PollAsync(CancellationToken stoppingToken)
     {
         var request = new ReceiveMessageRequest
         {
@@ -81,13 +82,13 @@ public async Task PollAsync(CancellationToken cancellationToken)
             MaxNumberOfMessages = 10 // Fetch up to 10 messages per call
         };
 
-        var messages = await _sqsClient.ReceiveMessageAsync(request, cancellationToken);
+        var messages = await _sqsClient.ReceiveMessageAsync(request, stoppingToken);
         foreach (var message in messages.Messages) await ProcessMessageAsync(message);
     }
 
     public async Task StopAsync(CancellationToken cancellationToken)
     {
-        _logger.LogInformation("Stopping SQS processor");
+        Log.StoppingMessageProcessor(_logger, "sqs");
         // No specific stop logic for SQS, as it is a pull-based system.
         await Task.CompletedTask;
     }

user-management/src/Stickerlandia.UserManagement.Api/Configurations/AuthorizeOperationFilter.cs

@@ -2,34 +2,17 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2025 Datadog, Inc.
 
-<<<<<<< chore/update-user-docs
-=======
 // This is a class that is not intended to be instantiated directly, so we suppress the warning.
 #pragma warning disable CA1812
-
->>>>>>> main
 using System.Net;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Stickerlandia.UserManagement.Api.Configurations;
-
-<<<<<<< chore/update-user-docs
 /// <summary>
 /// Operation filter to add authorization responses and security requirements to Swagger operations.
 /// </summary>
-internal class AuthorizeOperationFilter
-    : IOperationFilter
-{
-    public void Apply(OpenApiOperation operation, OperationFilterContext context)
-    {
-        var authAttributes = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
-            .Union(context.MethodInfo.GetCustomAttributes(true))
-            .OfType<AuthorizeAttribute>();
-
-        if (authAttributes.Any())
-=======
 internal sealed class AuthorizeOperationFilter
     : IOperationFilter
 {
@@ -44,37 +27,24 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
             .ToList();
 
         if (authAttributes.Count > 0)
->>>>>>> main
         {
             operation.Responses.Add(StatusCodes.Status401Unauthorized.ToString(), new OpenApiResponse { Description = nameof(HttpStatusCode.Unauthorized) });
             operation.Responses.Add(StatusCodes.Status403Forbidden.ToString(), new OpenApiResponse { Description = nameof(HttpStatusCode.Forbidden) });
         }
-
-<<<<<<< chore/update-user-docs
-        if (authAttributes.Any())
-=======
+        
         if (authAttributes.Count > 0)
->>>>>>> main
         {
             operation.Security = new List<OpenApiSecurityRequirement>();
 
             var oauth2SecurityScheme = new OpenApiSecurityScheme()
             {
-<<<<<<< chore/update-user-docs
                 Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "oauth2" },
-=======
-                Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "OAuth2" },
->>>>>>> main
             };
 
 
             operation.Security.Add(new OpenApiSecurityRequirement()
             {
-<<<<<<< chore/update-user-docs
-                [oauth2SecurityScheme] = new[] { "oauth2" }
-=======
                 [oauth2SecurityScheme] = item
->>>>>>> main
             });
         }
     }

user-management/src/Stickerlandia.UserManagement.Api/Configurations/DocumentationConfig.cs

@@ -36,10 +36,7 @@ public static IHostApplicationBuilder AddDocumentationEndpoints(this IHostApplic
             var xmlFiles = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
             foreach (var xmlFile in xmlFiles) options.IncludeXmlComments(xmlFile);
 
-<<<<<<< chore/update-user-docs
             // This manually removes some types from the auth-gen Swagger definitions that aren't required.
-=======
->>>>>>> main
             options.DocumentFilter<RemoveSwaggerDefinitionsFilter>();
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
             {

user-management/src/Stickerlandia.UserManagement.Api/Configurations/RemoveSwaggerDefinitionsFilter.cs

@@ -2,31 +2,21 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2025 Datadog, Inc.
 
-<<<<<<< chore/update-user-docs
-=======
 // This is a class that is not intended to be instantiated directly, so we suppress the warning.
 #pragma warning disable CA1812
->>>>>>> main
 
 using System.Security.Claims;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Stickerlandia.UserManagement.Api.Configurations;
 
-<<<<<<< chore/update-user-docs
-public class RemoveSwaggerDefinitionsFilter : IDocumentFilter
-=======
 internal sealed class RemoveSwaggerDefinitionsFilter : IDocumentFilter
->>>>>>> main
 {
     public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
     {
         swaggerDoc.Components.Schemas.Remove(nameof(Claim));
         swaggerDoc.Components.Schemas.Remove(nameof(ClaimsIdentity));
-<<<<<<< chore/update-user-docs
         swaggerDoc.Components.Schemas.Remove(nameof(ClaimsPrincipal));
-=======
->>>>>>> main
     }
 }

user-management/src/Stickerlandia.UserManagement.Aspire/AppBuilderExtensions.cs

@@ -252,6 +252,8 @@ public static IDistributedApplicationBuilder WithAwsLambda(
         this IDistributedApplicationBuilder builder,
         InfrastructureResources resources)
     {
+        ArgumentNullException.ThrowIfNull(resources.MessagingResource, nameof(resources.MessagingResource));
+        ArgumentNullException.ThrowIfNull(resources.DatabaseResource, nameof(resources.DatabaseResource));
         var apiLambdaFunction = builder.AddAWSLambdaFunction<Projects.Stickerlandia_UserManagement_Api>("UsersApi",
                 "Stickerlandia.UserManagement.Api")
             .WithEnvironment("ConnectionStrings__messaging", resources.MessagingResource)

user-management/src/Stickerlandia.UserManagement.Core/Observability/LogMessages.cs

@@ -85,6 +85,13 @@ public static partial void UnknownException(
         Message = "{Message}")]
     public static partial void GenericWarning(
         ILogger logger, string  message, Exception? exception);
+    
+    [LoggerMessage(
+        EventId = 5,
+        Level = LogLevel.Trace,
+        Message = "Stopping message processor for transport: {MessageTransport}")]
+    public static partial void StoppingMessageProcessor(
+        ILogger logger, string messageTransport);
 }
 
 public static class LogMessages