fix: update startup mode for az functions

jeastham1993 · jeastham1993 · commit 019143f0055d · 2025-05-28T13:01:06.000+01:00
diff --git a/user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs b/user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs
@@ -19,20 +19,20 @@ namespace Stickerlandia.UserManagement.Agnostic;
 
 public static class ServiceExtensions
 {
-    public static IHostApplicationBuilder AddAgnosticAdapters(this IHostApplicationBuilder builder)
+    public static IServiceCollection AddAgnosticAdapters(this IServiceCollection services, IConfiguration configuration)
     {
-        builder.AddKafkaMessaging();
-        builder.Services.AddPostgresAuthServices(builder.Configuration);
+        services.AddKafkaMessaging(configuration);
+        services.AddPostgresAuthServices(configuration);
 
-        return builder;
+        return services;
     }
 
-    public static IHostApplicationBuilder AddKafkaMessaging(this IHostApplicationBuilder builder)
+    public static IServiceCollection AddKafkaMessaging(this IServiceCollection services, IConfiguration configuration)
     {
         var producerConfig = new ProducerConfig
         {
             // User-specific properties that you must set
-            BootstrapServers = builder.Configuration.GetConnectionString("messaging"),
+            BootstrapServers = configuration.GetConnectionString("messaging"),
             // Fixed properties
             SecurityProtocol = SecurityProtocol.Plaintext,
             Acks             = Acks.All
@@ -41,22 +41,22 @@ public static IHostApplicationBuilder AddKafkaMessaging(this IHostApplicationBui
         var consumerConfig = new ConsumerConfig
         {
             // User-specific properties that you must set
-            BootstrapServers = builder.Configuration.GetConnectionString("messaging"),
+            BootstrapServers = configuration.GetConnectionString("messaging"),
             // Fixed properties
             SecurityProtocol = SecurityProtocol.Plaintext,
             GroupId          = "stickerlandia-users",
             AutoOffsetReset  = AutoOffsetReset.Earliest,
             EnableAutoCommit = false,
         };
         
-        builder.Services.AddSingleton(producerConfig);
-        builder.Services.AddSingleton(consumerConfig);
+        services.AddSingleton(producerConfig);
+        services.AddSingleton(consumerConfig);
         
         // Register event publisher as singleton
-        builder.Services.AddSingleton<IUserEventPublisher, KafkaEventPublisher>();
-        builder.Services.AddSingleton<IMessagingWorker, KafakStickerClaimedWorker>();
+        services.AddSingleton<IUserEventPublisher, KafkaEventPublisher>();
+        services.AddSingleton<IMessagingWorker, KafakStickerClaimedWorker>();
 
-        return builder;
+        return services;
     }
 
     public static IServiceCollection AddPostgresAuthServices(this IServiceCollection services,
diff --git a/user-management/src/Stickerlandia.UserManagement.Azure/ServiceExtensions.cs b/user-management/src/Stickerlandia.UserManagement.Azure/ServiceExtensions.cs
@@ -22,15 +22,15 @@ namespace Stickerlandia.UserManagement.Azure;
 
 public static class ServiceExtensions
 {
-    public static IHostApplicationBuilder AddAzureAdapters(this IHostApplicationBuilder builder)
+    public static IServiceCollection AddAzureAdapters(this IServiceCollection services, IConfiguration configuration)
     {
-        builder.Services.AddPostgresAuthServices(builder.Configuration);
+        services.AddPostgresAuthServices(configuration);
 
-        builder.Services.AddSingleton<IMessagingWorker, ServiceBusStickerClaimedWorker>();
-        builder.Services.AddSingleton(new ServiceBusClient(builder.Configuration["ConnectionStrings:messaging"]));
+        services.AddSingleton<IMessagingWorker, ServiceBusStickerClaimedWorker>();
+        services.AddSingleton(new ServiceBusClient(configuration["ConnectionStrings:messaging"]));
 
-        builder.Services.AddSingleton<IUserEventPublisher, ServiceBusEventPublisher>();
+        services.AddSingleton<IUserEventPublisher, ServiceBusEventPublisher>();
 
-        return builder;
+        return services;
     }
 }
diff --git a/user-management/src/Stickerlandia.UserManagement.FunctionApp/Program.cs b/user-management/src/Stickerlandia.UserManagement.FunctionApp/Program.cs
@@ -1,24 +1,33 @@
 using Microsoft.Azure.Functions.Worker;
-using Microsoft.Azure.Functions.Worker.Builder;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Events;
 using Serilog.Extensions.Logging;
 using Serilog.Formatting.Json;
-using Stickerlandia.UserManagement.Agnostic;
-using Stickerlandia.UserManagement.Azure;
-using Stickerlandia.UserManagement.Core;
-using Stickerlandia.UserManagement.FunctionApp.Middlewares;
 using Stickerlandia.UserManagement.ServiceDefaults;
 
-var builder = FunctionsApplication.CreateBuilder(args);
-builder.ConfigureFunctionsWebApplication();
-builder.UseDefaultWorkerMiddleware();
-builder.AddServiceDefaults();
-
-builder.UseMiddleware<ExceptionHandlingMiddleware>();
+var hostBuilder = new HostBuilder()
+    .ConfigureFunctionsWebApplication()
+    .ConfigureAppConfiguration(c => { c.AddEnvironmentVariables(); })
+    .ConfigureServices((hostContext, services) =>
+        services.AddApplicationInsightsTelemetryWorkerService()
+            .ConfigureFunctionsApplicationInsights()
+            .ConfigureDefaultUserManagementServices(hostContext.Configuration)
+            .Configure<LoggerFilterOptions>(options =>
+            {
+                // The Application Insights SDK adds a default logging filter that instructs ILogger to capture only Warning and more severe logs. Application Insights requires an explicit override.
+                // Log levels can also be configured using appsettings.json. For more information, see https://learn.microsoft.com/en-us/azure/azure-monitor/app/worker-service#ilogger-logs
+                var toRemove = options.Rules.FirstOrDefault(rule =>
+                    rule.ProviderName
+                    == "Microsoft.Extensions.Logging.ApplicationInsights.ApplicationInsightsLoggerProvider"
+                );
+
+                if (toRemove is not null) options.Rules.Remove(toRemove);
+            })
+    );
 
 var logger = Log.Logger = new LoggerConfiguration()
     .MinimumLevel.Information()
@@ -30,27 +39,10 @@
 var appLogger = new SerilogLoggerFactory(logger)
     .CreateLogger<Program>();
 
-// Application Insights isn't enabled by default. See https://aka.ms/AAt8mw4.
-builder.Services
-    .AddApplicationInsightsTelemetryWorkerService()
-    .ConfigureFunctionsApplicationInsights()
-    .Configure<LoggerFilterOptions>(options =>
-    {
-        // The Application Insights SDK adds a default logging filter that instructs ILogger to capture only Warning and more severe logs. Application Insights requires an explicit override.
-        // Log levels can also be configured using appsettings.json. For more information, see https://learn.microsoft.com/en-us/azure/azure-monitor/app/worker-service#ilogger-logs
-        LoggerFilterRule? toRemove = options.Rules.FirstOrDefault(rule =>
-            rule.ProviderName
-            == "Microsoft.Extensions.Logging.ApplicationInsights.ApplicationInsightsLoggerProvider"
-        );
-
-        if (toRemove is not null)
-        {
-            options.Rules.Remove(toRemove);
-        }
-    });
-
-appLogger.LogInformation("Application started"); ;
-
-var app = builder.Build();
+
+appLogger.LogInformation("Application started");
+;
+
+var app = hostBuilder.Build();
 
 await app.RunAsync();
diff --git a/user-management/src/Stickerlandia.UserManagement.FunctionApp/Stickerlandia.UserManagement.FunctionApp.csproj b/user-management/src/Stickerlandia.UserManagement.FunctionApp/Stickerlandia.UserManagement.FunctionApp.csproj
@@ -11,15 +11,14 @@
         <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.19.0" />
         <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
+        <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
+        <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
         <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
         <PackageReference Include="serilog.aspnetcore" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
-        <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-        <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.2" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Kafka" Version="4.1.1" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.4" />
diff --git a/user-management/src/Stickerlandia.UserManagement.ServiceDefaults/ServiceDefaults.cs b/user-management/src/Stickerlandia.UserManagement.ServiceDefaults/ServiceDefaults.cs
@@ -17,37 +17,42 @@ public static IHostApplicationBuilder AddServiceDefaults(this IHostApplicationBu
     {
         builder.Configuration.AddEnvironmentVariables();
         builder.Services.AddLogging();
-        
+        builder.Services.ConfigureDefaultUserManagementServices(builder.Configuration);
+
+        if (builder is WebApplicationBuilder hostBuilder)
+            hostBuilder.Host.UseSerilog((_, config) =>
+            {
+                config.MinimumLevel.Information()
+                    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+                    .Enrich.FromLogContext()
+                    .WriteTo.Console(new JsonFormatter());
+            });
+
+        return builder;
+    }
+
+    public static IServiceCollection ConfigureDefaultUserManagementServices(this IServiceCollection services,
+        IConfiguration configuration)
+    {
         var drivenAdapters = Environment.GetEnvironmentVariable("DRIVEN") ?? "";
 
         switch (drivenAdapters.ToUpper())
         {
             case "AZURE":
-                builder.AddAzureAdapters();
+                services.AddAzureAdapters(configuration);
                 break;
             case "AGNOSTIC":
-                builder.AddAgnosticAdapters();
+                services.AddAgnosticAdapters(configuration);
                 break;
             case "AWS":
                 break;
             default:
                 throw new ArgumentException($"Unknown driven adapters {drivenAdapters}");
         }
 
-        builder.Services
+        services
             .AddStickerlandiaUserManagement();
-        
-        if (builder is WebApplicationBuilder hostBuilder)
-        {
-            hostBuilder.Host.UseSerilog((_, config) =>
-            {
-                config.MinimumLevel.Information()
-                    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-                    .Enrich.FromLogContext()
-                    .WriteTo.Console(new JsonFormatter());
-            });
-        }
-        
-        return builder;
+
+        return services;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ namespace Stickerlandia.UserManagement.Azure;`
`22`	`22`
`23`	`23`	`public static class ServiceExtensions`
`24`	`24`	`{`
`25`		`- public static IHostApplicationBuilder AddAzureAdapters(this IHostApplicationBuilder builder)`
	`25`	`+ public static IServiceCollection AddAzureAdapters(this IServiceCollection services, IConfiguration configuration)`
`26`	`26`	`{`
`27`		`- builder.Services.AddPostgresAuthServices(builder.Configuration);`
	`27`	`+ services.AddPostgresAuthServices(configuration);`
`28`	`28`
`29`		`- builder.Services.AddSingleton<IMessagingWorker, ServiceBusStickerClaimedWorker>();`
`30`		`- builder.Services.AddSingleton(new ServiceBusClient(builder.Configuration["ConnectionStrings:messaging"]));`
	`29`	`+ services.AddSingleton<IMessagingWorker, ServiceBusStickerClaimedWorker>();`
	`30`	`+ services.AddSingleton(new ServiceBusClient(configuration["ConnectionStrings:messaging"]));`
`31`	`31`
`32`		`- builder.Services.AddSingleton<IUserEventPublisher, ServiceBusEventPublisher>();`
	`32`	`+ services.AddSingleton<IUserEventPublisher, ServiceBusEventPublisher>();`
`33`	`33`
`34`		`- return builder;`
	`34`	`+ return services;`
`35`	`35`	`}`
`36`	`36`	`}`