chore: Tidies up program.cs

Author: mike-esyn

src/EPR.Calculator.API/CommonResources.Designer.cs

@@ -153,9 +153,6 @@
   <data name="NotAValidClassificationStatus" xml:space="preserve">
     <value>Classification status is not valid for this '{0}' run id to perform requested operation.</value>
   </data>
-  <data name="PolicyName" xml:space="preserve">
-    <value>AllowAllOrigins</value>
-  </data>
   <data name="ProducerBillingInstructionsDefaultPageNumber" xml:space="preserve">
     <value>1</value>
   </data>

src/EPR.Calculator.API/CommonResources.resx

@@ -0,0 +1,6 @@
+namespace EPR.Calculator.API.Extensions;
+
+public static class EnvironmentExtensions
+{
+    public static bool IsLocal(this IHostEnvironment hostEnvironment) => hostEnvironment.IsEnvironment(CommonResources.Local);
+}

src/EPR.Calculator.API/Extensions/EnvironmentExtensions.cs

@@ -1,10 +1,11 @@
 using System.Configuration;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using Azure.Messaging.ServiceBus;
 using Azure.Storage.Blobs;
 using EPR.Calculator.API;
 using EPR.Calculator.API.Data;
 using EPR.Calculator.API.Exceptions;
+using EPR.Calculator.API.Extensions;
 using EPR.Calculator.API.HealthCheck;
 using EPR.Calculator.API.Services;
 using EPR.Calculator.API.Services.Abstractions;
@@ -19,63 +20,75 @@
 using Microsoft.Extensions.Azure;
 using Microsoft.Identity.Web;
 
+[assembly: SuppressMessage(
+    "SonarAnalyzer.CSharp",
+    "S5122:Make sure this permissive CORS policy is safe here",
+    Justification = "Pre-existing behaviour.")]
+
+const string corsPolicy = "AllowAllOrigins";
+
 var builder = WebApplication.CreateBuilder(args);
-var environmentName = builder.Environment.EnvironmentName?.ToLower() ?? string.Empty;
+builder.Configuration.AddUserSecrets(Assembly.GetExecutingAssembly(), optional: true);
 
-// Add services to the container.
+// Framework services.
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
 builder.Services.AddApplicationInsightsTelemetry();
 builder.Services.AddHealthChecks();
-builder.Services.AddSwaggerGen();
-builder.Services.AddControllers();
+builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
+builder.Services.AddProblemDetails();
+
+// Authentication and authorisation.
+builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+    .AddMicrosoftIdentityWebApi(builder.Configuration.GetSection("AzureAd"));
+
+builder.Services.AddAuthorizationBuilder()
+    .SetFallbackPolicy(new AuthorizationPolicyBuilder()
+        .RequireAuthenticatedUser()
+        .RequireRole(CommonResources.SASuperUserRole)
+        .Build());
+
+builder.Services.AddCors(options => options.AddPolicy(
+    corsPolicy,
+    policy => policy
+        .AllowAnyOrigin()
+        .AllowAnyHeader()
+        .AllowAnyMethod()));
+
+// Validation.
 builder.Services.AddFluentValidationAutoValidation();
 builder.Services.AddFluentValidationClientsideAdapters();
+builder.Services.AddValidatorsFromAssemblyContaining<CreateDefaultParameterSettingValidator>();
 builder.Services.AddScoped<ICreateDefaultParameterDataValidator, CreateDefaultParameterDataValidator>();
 builder.Services.AddScoped<ILapcapDataValidator, LapcapDataValidator>();
 builder.Services.AddScoped<ICalcRelativeYearRequestDtoDataValidator, CalcRelativeYearRequestDtoDataValidator>();
+builder.Services.AddScoped<ICalculatorRunStatusDataValidator, CalculatorRunStatusDataValidator>();
+
+// Application services.
 builder.Services.AddScoped<IInvoiceDetailsService, InvoiceDetailsService>();
 builder.Services.AddScoped<IServiceBusService, ServiceBusService>();
-builder.Services.AddScoped<ICalculatorRunStatusDataValidator, CalculatorRunStatusDataValidator>();
 builder.Services.AddScoped<IBillingFileService, BillingFileService>();
 builder.Services.AddScoped<IAvailableClassificationsService, AvailableClassificationsService>();
 builder.Services.AddScoped<ICalculationRunService, CalculationRunService>();
 builder.Services.AddScoped<IStorageService, BlobStorageService>();
 builder.Services.AddScoped<IBlobStorageService2, BlobStorageService2>();
 
-
-// Add services to the container.
-builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-    .AddMicrosoftIdentityWebApi(builder.Configuration.GetSection("AzureAd"));
-
-// Adding Authorization with Global Policy.
-builder.Services.AddAuthorizationBuilder()
-        .SetFallbackPolicy(new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .RequireRole(CommonResources.SASuperUserRole)
-        .Build());
-
-builder.Services.AddControllers();
-
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-builder.Services.AddValidatorsFromAssemblyContaining<CreateDefaultParameterSettingValidator>();
-
-// Configure the database context.
+// Database context.
 builder.Services.AddDbContext<ApplicationDBContext>(options =>
-{
-    options.UseSqlServer(
-        builder.Configuration.GetConnectionString("DefaultConnection"));
-});
+    options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")));
 
+// Blob storage.
 builder.Services.Configure<BlobStorageSettings>(
-    builder.Configuration.GetSection("BlobStorage"));
+    builder.Configuration.GetSection(CommonResources.BlobStorageSection));
 
-builder.Services.AddSingleton<BlobServiceClient>(provider =>
+builder.Services.AddSingleton(provider =>
 {
-    var configuration = provider.GetRequiredService<IConfiguration>();
-    var connectionString = configuration.GetSection("BlobStorage:ConnectionString").Value;
+    var connectionString = provider.GetRequiredService<IConfiguration>()
+        .GetSection(CommonResources.BlobStorageSection)
+        .GetValue<string>("ConnectionString");
+
     if (string.IsNullOrEmpty(connectionString))
     {
         throw new ConfigurationErrorsException("Blob Storage connection string is not configured.");
@@ -84,66 +97,53 @@
     return new BlobServiceClient(connectionString);
 });
 
-var serviceBusConnectionString = builder.Configuration.GetSection("ServiceBus").GetSection("ConnectionString");
-var serviceBusQueueName = builder.Configuration.GetSection("ServiceBus").GetSection("QueueName").Value;
-#pragma warning disable CS8604 // Possible null reference argument.
-var retryPeriod = double.Parse(builder.Configuration.GetSection("ServiceBus").GetSection("PostMessageRetryPeriod").Value);
-var retryCount = int.Parse(builder.Configuration.GetSection("ServiceBus").GetSection("PostMessageRetryCount").Value);
-#pragma warning restore CS8604 // Possible null reference argument.
+// Service Bus.
+var serviceBusSection = builder.Configuration.GetSection("ServiceBus");
+var retryPeriod = serviceBusSection.GetValue<double?>("PostMessageRetryPeriod")
+    ?? throw new ConfigurationErrorsException("Configuration item not found: ServiceBus__PostMessageRetryPeriod");
+var retryCount = serviceBusSection.GetValue<int?>("PostMessageRetryCount")
+    ?? throw new ConfigurationErrorsException("Configuration item not found: ServiceBus__PostMessageRetryCount");
 
-builder.Services.AddAzureClients(builder =>
+builder.Services.AddAzureClients(factoryBuilder =>
 {
-    builder
-        .AddServiceBusClient(serviceBusConnectionString)
-        .WithName("calculator")
+    factoryBuilder
+        .AddServiceBusClient(serviceBusSection.GetSection("ConnectionString"))
+        .WithName(CommonResources.ServiceBusClientName)
         .ConfigureOptions(options =>
         {
             options.RetryOptions.Delay = TimeSpan.FromSeconds(retryPeriod);
             options.RetryOptions.MaxDelay = TimeSpan.FromSeconds(retryPeriod);
             options.RetryOptions.MaxRetries = retryCount;
         });
-
-    // Register a sender for the "calculator" client.
-#pragma warning disable CS8602 // Dereference of a possibly null reference.
-    builder.AddClient<ServiceBusSender, ServiceBusClientOptions>((_, _, provider) =>
-        provider
-            .GetService<IAzureClientFactory<ServiceBusClient>>()
-            .CreateClient("calculator")
-            .CreateSender(serviceBusQueueName))
-    .WithName($"calculator-{serviceBusQueueName}");
-#pragma warning restore CS8602 // Dereference of a possibly null reference.
 });
 
-builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
-builder.Services.AddProblemDetails();
-builder.Configuration.AddUserSecrets(Assembly.GetExecutingAssembly(), true);
-
-// Configure endpoint timeout policies.
-foreach (string policy in CommonResources.TimeoutPolicies.Split(','))
+// Endpoint timeout policies.
+builder.Services.AddRequestTimeouts(options =>
 {
-    var timeout = builder.Configuration.GetSection("Timeouts").GetValue<double>(policy);
-    builder.Services.AddRequestTimeouts(options =>
+    foreach (var policy in CommonResources.TimeoutPolicies.Split(','))
     {
+        var timeout = builder.Configuration.GetSection("Timeouts").GetValue<double>(policy);
         options.AddPolicy(policy, TimeSpan.FromMinutes(timeout));
-    });
-}
+    }
+});
 
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment() || environmentName.Equals(CommonResources.Local, StringComparison.OrdinalIgnoreCase))
+if (app.Environment.IsDevelopment() || app.Environment.IsLocal())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
 }
 
 app.UseExceptionHandler();
 app.UseHttpsRedirection();
-app.MapControllers();
-app.UseCors(CommonResources.PolicyName);
+app.UseCors(corsPolicy);
 app.UseAuthentication();
 app.UseAuthorization();
 app.UseRequestTimeouts();
+
+app.MapControllers();
 app.MapHealthChecks("/admin/health", HealthCheckOptionsBuilder.Build()).AllowAnonymous();
 
-await app.RunAsync();
+await app.RunAsync();