From 48a827f006b5cf982f06c45811b66135ca83c447 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Tue, 24 Sep 2024 14:35:46 +0200 Subject: [PATCH] feat: adjust environment variable to skip validation Refs: #1021 --- ...Portal.Backend.Administration.Service.yaml | 2 +- .../Administration.Service.csproj | 3 ++- .../BusinessLogic/CompanyDataSettings.cs | 6 ++--- .../BusinessLogic/ConnectorsSettings.cs | 5 ++-- .../BusinessLogic/DocumentSettings.cs | 5 ++-- .../BusinessLogic/IdentityProviderSettings.cs | 7 +++-- .../BusinessLogic/RegistrationSettings.cs | 5 ++-- .../BusinessLogic/ServiceAccountSettings.cs | 5 ++-- .../BusinessLogic/UserSettings.cs | 5 ++-- .../CompanyDataServiceCollectionExtensions.cs | 4 +-- ...RegistrationServiceCollectionExtensions.cs | 6 ++--- .../PartnerRegistrationSettings.cs | 5 ++-- .../Administration.Service/Program.cs | 26 +++++++++---------- .../Administration.Service/appsettings.json | 2 +- .../BpdmServiceCollectionExtension.cs | 4 +-- .../BpnAccessCollectionExtension.cs | 4 +-- ...pnDidResolverServiceCollectionExtension.cs | 4 +-- ...ClearinghouseServiceCollectionExtension.cs | 5 ++-- .../CustodianServiceCollectionExtension.cs | 5 ++-- .../DimServiceCollectionExtension.cs | 5 ++-- ...uerComponentServiceCollectionExtensions.cs | 4 +-- ...OfferProviderServiceCollectionExtension.cs | 4 +-- ...rviceProviderServiceCollectionExtension.cs | 4 +-- .../ProvisioningLibraryExtensions.cs | 4 +-- .../SdServiceCollectionExtension.cs | 4 +-- src/framework/Framework.Models/Constants.cs | 2 +- .../Validation/EnvironmentExtensions.cs | 9 ++++--- .../Validation/SettingValidation.cs | 10 +++---- .../DatabaseInitializerExtensions.cs | 4 +-- .../Framework.Seeding/SeederSettings.cs | 5 ++-- .../Framework.Web/StartupServiceExtensions.cs | 4 +-- .../WebApplicationBuildRunner.cs | 2 +- .../Keycloak.Factory/KeycloakSettingData.cs | 7 +++-- .../BusinessLogic/KeycloakSeederSettings.cs | 5 ++-- src/keycloak/Keycloak.Seeding/Program.cs | 4 +-- src/mailing/Mailing.SendMail/MailSettings.cs | 7 +++-- .../MailingStartupServiceExtensions.cs | 6 ++--- .../Mailing.Template/TemplateSettings.cs | 7 +++-- src/maintenance/Maintenance.App/Program.cs | 4 +-- .../Apps.Service/Apps.Service.csproj | 2 +- .../BusinessLogic/AppsSettings.cs | 5 ++-- src/marketplace/Apps.Service/Program.cs | 8 +++--- .../ServiceLogicExtensions.cs | 4 +-- src/marketplace/Services.Service/Program.cs | 8 +++--- .../Services.Service/ServiceSettings.cs | 5 ++-- .../Services.Service/Services.Service.csproj | 2 +- .../BusinessLogic/NotificationSettings.cs | 5 ++-- .../Notifications.Service.csproj | 2 +- .../Notifications.Service/Program.cs | 2 +- .../PortalBackend.Migrations/Program.cs | 4 +-- .../ApplicationChecklistExtensions.cs | 18 ++++++------- .../ApplicationChecklistSettings.cs | 5 ++-- .../DimUserProcessCollectionExtensions.cs | 7 +++-- .../InvitationProcessCollectionExtensions.cs | 6 ++--- .../DependencyInjection/InvitationSettings.cs | 5 ++-- ...ilingProcessCreationDependencyInjection.cs | 4 +-- .../MailingProcessCreationSettings.cs | 5 ++-- ...RegistrationProcessCollectionExtensions.cs | 6 ++--- .../NetworkRegistrationHandlerExtensions.cs | 4 +-- ...SubscriptionProcessCollectionExtensions.cs | 6 ++--- ...cessIdentityServiceCollectionExtensions.cs | 8 +++--- src/processes/Processes.Worker/Program.cs | 24 ++++++++--------- .../SdCreationProcessExtensions.cs | 4 +-- .../ServiceAccountCreationExtensions.cs | 4 +-- ...isioningManagerStartupServiceExtensions.cs | 6 ++--- .../Provisioning.Migrations/Program.cs | 2 +- .../ApplicationActivationExtensions.cs | 8 +++--- .../BusinessLogic/RegistrationSettings.cs | 5 ++-- .../Registration.Service/Program.cs | 10 +++---- .../Registration.Service.csproj | 2 +- .../IntegrationTestFactory.cs | 1 + 71 files changed, 187 insertions(+), 209 deletions(-) diff --git a/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml b/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml index 3e8b8213e4..82da27e1c3 100644 --- a/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml +++ b/docs/api/Org.Eclipse.TractusX.Portal.Backend.Administration.Service.yaml @@ -5025,7 +5025,7 @@ paths: post: tags: - User - summary: 'Create new users for the companies shared identityprovider by upload of csv-file (Authorization required - Roles: add_user_account)' + summary: Create new users for the companies shared identityprovider by upload of csv-file (Authorization required) description: 'Example: POST: api/administration/user/owncompany/usersfile' requestBody: content: diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj index 17ce6f497d..e3df405ea2 100644 --- a/src/administration/Administration.Service/Administration.Service.csproj +++ b/src/administration/Administration.Service/Administration.Service.csproj @@ -35,7 +35,7 @@ - + @@ -59,6 +59,7 @@ + diff --git a/src/administration/Administration.Service/BusinessLogic/CompanyDataSettings.cs b/src/administration/Administration.Service/BusinessLogic/CompanyDataSettings.cs index d4ad171685..c017c026a5 100644 --- a/src/administration/Administration.Service/BusinessLogic/CompanyDataSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/CompanyDataSettings.cs @@ -61,13 +61,11 @@ public static class CompanyDataSettingsExtensions { public static IServiceCollection ConfigureCompanyDataSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment - ) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/BusinessLogic/ConnectorsSettings.cs b/src/administration/Administration.Service/BusinessLogic/ConnectorsSettings.cs index d83625a2d3..1265f1b38a 100644 --- a/src/administration/Administration.Service/BusinessLogic/ConnectorsSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/ConnectorsSettings.cs @@ -57,12 +57,11 @@ public static class ConnectorsSettingsExtensions { public static IServiceCollection ConfigureConnectorsSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/BusinessLogic/DocumentSettings.cs b/src/administration/Administration.Service/BusinessLogic/DocumentSettings.cs index 513747a898..e429b5496b 100644 --- a/src/administration/Administration.Service/BusinessLogic/DocumentSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/DocumentSettings.cs @@ -42,12 +42,11 @@ public static class DocumentSettingsExtension { public static IServiceCollection ConfigureDocumentSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs index 2782ae83c4..6efccb0538 100644 --- a/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/IdentityProviderSettings.cs @@ -87,13 +87,12 @@ public static class IdentityProviderSettingsExtension { public static IServiceCollection ConfigureIdentityProviderSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { var options = services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); - if (!environment.SkipValidation()) + .EnvironmentalValidation(section); + if (!EnvironmentExtensions.SkipValidation()) { options .Validate(x => x.Validate()); diff --git a/src/administration/Administration.Service/BusinessLogic/RegistrationSettings.cs b/src/administration/Administration.Service/BusinessLogic/RegistrationSettings.cs index 49476ea785..936b7cbc05 100644 --- a/src/administration/Administration.Service/BusinessLogic/RegistrationSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/RegistrationSettings.cs @@ -46,12 +46,11 @@ public static class RegistrationSettingsExtension { public static IServiceCollection ConfigureRegistrationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/BusinessLogic/ServiceAccountSettings.cs b/src/administration/Administration.Service/BusinessLogic/ServiceAccountSettings.cs index d56553ce39..3c01f11e90 100644 --- a/src/administration/Administration.Service/BusinessLogic/ServiceAccountSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/ServiceAccountSettings.cs @@ -53,12 +53,11 @@ public static class ServiceAccountSettingsExtensions { public static IServiceCollection ConfigureServiceAccountSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/BusinessLogic/UserSettings.cs b/src/administration/Administration.Service/BusinessLogic/UserSettings.cs index 0bc1235b26..b03d1c3cef 100644 --- a/src/administration/Administration.Service/BusinessLogic/UserSettings.cs +++ b/src/administration/Administration.Service/BusinessLogic/UserSettings.cs @@ -74,12 +74,11 @@ public static class UserSettingsExtension { public static IServiceCollection ConfigureUserSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/DependencyInjection/CompanyDataServiceCollectionExtensions.cs b/src/administration/Administration.Service/DependencyInjection/CompanyDataServiceCollectionExtensions.cs index 8ee63cf7e5..1cd5dbeeb2 100644 --- a/src/administration/Administration.Service/DependencyInjection/CompanyDataServiceCollectionExtensions.cs +++ b/src/administration/Administration.Service/DependencyInjection/CompanyDataServiceCollectionExtensions.cs @@ -24,8 +24,8 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.DependencyI public static class CompanyDataServiceCollectionExtensions { - public static IServiceCollection AddCompanyDataService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) => + public static IServiceCollection AddCompanyDataService(this IServiceCollection services, IConfigurationSection section) => services - .ConfigureCompanyDataSettings(section, environment) + .ConfigureCompanyDataSettings(section) .AddTransient(); } diff --git a/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationServiceCollectionExtensions.cs b/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationServiceCollectionExtensions.cs index d1e294cbf1..e757296c9c 100644 --- a/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationServiceCollectionExtensions.cs +++ b/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationServiceCollectionExtensions.cs @@ -24,10 +24,10 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.DependencyI public static class PartnerRegistrationServiceCollectionExtensions { - public static IServiceCollection AddPartnerRegistration(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) => + public static IServiceCollection AddPartnerRegistration(this IServiceCollection services, IConfiguration configuration) => services - .ConfigurePartnerRegistrationSettings(configuration.GetSection("Network2Network"), environment) + .ConfigurePartnerRegistrationSettings(configuration.GetSection("Network2Network")) .AddTransient() - .AddOnboardingServiceProviderService(configuration, environment) + .AddOnboardingServiceProviderService(configuration) .AddTransient(); } diff --git a/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationSettings.cs b/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationSettings.cs index ed18e23bec..28fc83cca4 100644 --- a/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationSettings.cs +++ b/src/administration/Administration.Service/DependencyInjection/PartnerRegistrationSettings.cs @@ -34,12 +34,11 @@ public static class PartnerRegistrationSettingsExtensions { public static IServiceCollection ConfigurePartnerRegistrationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/administration/Administration.Service/Program.cs b/src/administration/Administration.Service/Program.cs index e73de7bc7d..33b94cc7d4 100644 --- a/src/administration/Administration.Service/Program.cs +++ b/src/administration/Administration.Service/Program.cs @@ -48,7 +48,7 @@ await WebAppHelper builder.Services .AddPortalRepositories(builder.Configuration) - .AddProvisioningManager(builder.Configuration, builder.Environment); + .AddProvisioningManager(builder.Configuration); builder.Services.AddTransient(); @@ -57,40 +57,40 @@ await WebAppHelper builder.Services.AddTransient() .AddTransient() .AddTransient() - .ConfigureUserSettings(builder.Configuration.GetSection("UserManagement"), builder.Environment); + .ConfigureUserSettings(builder.Configuration.GetSection("UserManagement")); builder.Services.AddTransient() - .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration"), builder.Environment); + .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration")); builder.Services.AddTransient() - .ConfigureServiceAccountSettings(builder.Configuration.GetSection("ServiceAccount"), builder.Environment); + .ConfigureServiceAccountSettings(builder.Configuration.GetSection("ServiceAccount")); builder.Services.AddTransient() - .ConfigureDocumentSettings(builder.Configuration.GetSection("Document"), builder.Environment); + .ConfigureDocumentSettings(builder.Configuration.GetSection("Document")); builder.Services .AddTransient() .AddTransient() .AddTransient() .AddTransient() - .AddCompanyDataService(builder.Configuration.GetSection("CompanyData"), builder.Environment); + .AddCompanyDataService(builder.Configuration.GetSection("CompanyData")); builder.Services.AddTransient() - .ConfigureIdentityProviderSettings(builder.Configuration.GetSection("IdentityProviderAdmin"), builder.Environment); + .ConfigureIdentityProviderSettings(builder.Configuration.GetSection("IdentityProviderAdmin")); - builder.Services.AddApplicationChecklist(builder.Configuration.GetSection("ApplicationChecklist"), builder.Environment) + builder.Services.AddApplicationChecklist(builder.Configuration.GetSection("ApplicationChecklist")) .AddOfferSubscriptionProcess(); builder.Services.AddTransient() - .ConfigureConnectorsSettings(builder.Configuration.GetSection("Connectors"), builder.Environment); + .ConfigureConnectorsSettings(builder.Configuration.GetSection("Connectors")); - builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation"), builder.Environment); + builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation")); builder.Services .AddTransient() .AddTransient() - .AddPartnerRegistration(builder.Configuration, builder.Environment) + .AddPartnerRegistration(builder.Configuration) .AddNetworkRegistrationProcessHelper() - .AddIssuerComponentService(builder.Configuration.GetSection("Issuer"), builder.Environment); + .AddIssuerComponentService(builder.Configuration.GetSection("Issuer")); builder.Services .AddSingleton() @@ -102,5 +102,5 @@ await WebAppHelper .AddSingleton(); builder.Services.AddProvisioningDBAccess(builder.Configuration); - builder.Services.AddBpnAccess(builder.Configuration.GetSection("BpnAccess"), builder.Environment); + builder.Services.AddBpnAccess(builder.Configuration.GetSection("BpnAccess")); }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/administration/Administration.Service/appsettings.json b/src/administration/Administration.Service/appsettings.json index e20478b650..b8e9af6ed0 100644 --- a/src/administration/Administration.Service/appsettings.json +++ b/src/administration/Administration.Service/appsettings.json @@ -419,6 +419,6 @@ ] }, "BpnAccess": { - "BaseAddress": "" + "BaseUrl": "" } } diff --git a/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs b/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs index 51ca804792..b602355775 100644 --- a/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs +++ b/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs @@ -29,11 +29,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.DependencyInjection; public static class BpdmServiceCollectionExtension { - public static IServiceCollection AddBpdmService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddBpdmService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs index a2744c3659..0dbc6fb7a9 100644 --- a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs +++ b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs @@ -29,11 +29,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.DependencyInjection; public static class BpnAccessCollectionExtension { - public static IServiceCollection AddBpnAccess(this IServiceCollection services, IConfigurationSection configSection, IHostEnvironment environment) + public static IServiceCollection AddBpnAccess(this IServiceCollection services, IConfigurationSection configSection) { services.AddOptions() .Bind(configSection) - .EnvironmentalValidation(configSection, environment); + .EnvironmentalValidation(configSection); var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); diff --git a/src/externalsystems/BpnDidResolver.Library/DependencyInjection/BpnDidResolverServiceCollectionExtension.cs b/src/externalsystems/BpnDidResolver.Library/DependencyInjection/BpnDidResolverServiceCollectionExtension.cs index 868cac6cf1..5ad8324389 100644 --- a/src/externalsystems/BpnDidResolver.Library/DependencyInjection/BpnDidResolverServiceCollectionExtension.cs +++ b/src/externalsystems/BpnDidResolver.Library/DependencyInjection/BpnDidResolverServiceCollectionExtension.cs @@ -29,11 +29,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.BpnDidResolver.Library.DependencyI public static class BpnDidResolverServiceCollectionExtension { - public static IServiceCollection AddBpnDidResolver(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddBpnDidResolver(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs b/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs index e298a402df..2a3aec6487 100644 --- a/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs +++ b/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs @@ -19,7 +19,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; @@ -29,11 +28,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library; public static class ClearinghouseServiceCollectionExtension { - public static IServiceCollection AddClearinghouseService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddClearinghouseService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs b/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs index 4b553f539e..5b6c67e559 100644 --- a/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs +++ b/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs @@ -19,7 +19,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Custodian.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; @@ -29,11 +28,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Custodian.Library; public static class CustodianServiceCollectionExtension { - public static IServiceCollection AddCustodianService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddCustodianService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/externalsystems/Dim.Library/DependencyInjection/DimServiceCollectionExtension.cs b/src/externalsystems/Dim.Library/DependencyInjection/DimServiceCollectionExtension.cs index 3e58d3fb75..3340e4b9f3 100644 --- a/src/externalsystems/Dim.Library/DependencyInjection/DimServiceCollectionExtension.cs +++ b/src/externalsystems/Dim.Library/DependencyInjection/DimServiceCollectionExtension.cs @@ -19,7 +19,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Dim.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; @@ -29,11 +28,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Dim.Library.DependencyInjection; public static class DimServiceCollectionExtension { - public static IServiceCollection AddDimService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddDimService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); diff --git a/src/externalsystems/IssuerComponent.Library/DependencyInjection/IssuerComponentServiceCollectionExtensions.cs b/src/externalsystems/IssuerComponent.Library/DependencyInjection/IssuerComponentServiceCollectionExtensions.cs index a0d3b2ee84..21e226cb68 100644 --- a/src/externalsystems/IssuerComponent.Library/DependencyInjection/IssuerComponentServiceCollectionExtensions.cs +++ b/src/externalsystems/IssuerComponent.Library/DependencyInjection/IssuerComponentServiceCollectionExtensions.cs @@ -30,11 +30,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.IssuerComponent.Library.Dependency public static class IssuerComponentServiceCollectionExtensions { - public static IServiceCollection AddIssuerComponentService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddIssuerComponentService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs index fe3f0c457d..5385ebb467 100644 --- a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs +++ b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs @@ -28,12 +28,12 @@ namespace Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.DependencyIn public static class OfferProviderServiceCollectionExtension { - public static IServiceCollection AddOfferProviderService(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) + public static IServiceCollection AddOfferProviderService(this IServiceCollection services, IConfiguration configuration) { var configSection = configuration.GetSection("OfferProvider"); services.AddOptions() .Bind(configSection) - .EnvironmentalValidation(configSection, environment); + .EnvironmentalValidation(configSection); services.AddTransient>(); return services diff --git a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs index a14f03d632..cdde19f15c 100644 --- a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs +++ b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs @@ -27,12 +27,12 @@ namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library. public static class OnboardingServiceProviderServiceCollectionExtension { - public static IServiceCollection AddOnboardingServiceProviderService(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) + public static IServiceCollection AddOnboardingServiceProviderService(this IServiceCollection services, IConfiguration configuration) { var configSection = configuration.GetSection("OnboardingServiceProvider"); services.AddOptions() .Bind(configSection) - .EnvironmentalValidation(configSection, environment); + .EnvironmentalValidation(configSection); services.AddTransient>(); _ = services.BuildServiceProvider(); return services diff --git a/src/externalsystems/Provisioning.Library/DependencyInjection/ProvisioningLibraryExtensions.cs b/src/externalsystems/Provisioning.Library/DependencyInjection/ProvisioningLibraryExtensions.cs index 7c3a5ea079..27b6a11f58 100644 --- a/src/externalsystems/Provisioning.Library/DependencyInjection/ProvisioningLibraryExtensions.cs +++ b/src/externalsystems/Provisioning.Library/DependencyInjection/ProvisioningLibraryExtensions.cs @@ -32,11 +32,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.ExternalSystems.Provisioning.Libra [ExcludeFromCodeCoverage] public static class ProvisioningLibraryExtensions { - public static IServiceCollection AddIdpManagement(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) => + public static IServiceCollection AddIdpManagement(this IServiceCollection services, IConfiguration configuration) => services .ConfigureIdpCreationSettings(configuration.GetSection("Provisioning")) .AddTransient() - .ConfigureKeycloakSettingsMap(configuration.GetSection("Keycloak"), environment) + .ConfigureKeycloakSettingsMap(configuration.GetSection("Keycloak")) .AddScoped(); } diff --git a/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs b/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs index 9314605fa6..df9d8784ca 100644 --- a/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs +++ b/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs @@ -30,11 +30,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library; public static class SdServiceCollectionExtension { - public static IServiceCollection AddSdFactoryService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddSdFactoryService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddTransient>(); var sp = services.BuildServiceProvider(); diff --git a/src/framework/Framework.Models/Constants.cs b/src/framework/Framework.Models/Constants.cs index 816c82a5df..3dbf64927c 100644 --- a/src/framework/Framework.Models/Constants.cs +++ b/src/framework/Framework.Models/Constants.cs @@ -42,5 +42,5 @@ public static class Constants /// public const string InvalidLanguageError = "InvalidLanguage"; - public static readonly IImmutableList SkipValidationEnvironments = ImmutableArray.Create("SWAGGER", "TEST"); + public static readonly string SkipValidation = "SKIP_CONFIGURATION_VALIDATION"; } diff --git a/src/framework/Framework.Models/Validation/EnvironmentExtensions.cs b/src/framework/Framework.Models/Validation/EnvironmentExtensions.cs index 9e89ff6949..661913c634 100644 --- a/src/framework/Framework.Models/Validation/EnvironmentExtensions.cs +++ b/src/framework/Framework.Models/Validation/EnvironmentExtensions.cs @@ -17,12 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Microsoft.Extensions.Hosting; - namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; public static class EnvironmentExtensions { - public static bool SkipValidation(this IHostEnvironment environment) => - Constants.SkipValidationEnvironments.Any(environment.IsEnvironment); + public static bool SkipValidation() + { + var skipValidationEnv = Environment.GetEnvironmentVariable(Constants.SkipValidation); + return skipValidationEnv != null && skipValidationEnv.Equals("true", StringComparison.OrdinalIgnoreCase); + } } diff --git a/src/framework/Framework.Models/Validation/SettingValidation.cs b/src/framework/Framework.Models/Validation/SettingValidation.cs index ef0323da45..871fc94090 100644 --- a/src/framework/Framework.Models/Validation/SettingValidation.cs +++ b/src/framework/Framework.Models/Validation/SettingValidation.cs @@ -20,6 +20,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; @@ -39,7 +40,7 @@ public static class SettingValidation /// The so that additional calls can be chained. public static OptionsBuilder ValidateEnumEnumeration(this OptionsBuilder optionsBuilder, IConfigurationSection section) where TOptions : class { - optionsBuilder.Services.AddTransient>(_ => new EnumEnumerableValidation(optionsBuilder.Name, section)); + optionsBuilder.Services.TryAddTransient>(_ => new EnumEnumerableValidation(optionsBuilder.Name, section)); return optionsBuilder; } @@ -52,7 +53,7 @@ public static OptionsBuilder ValidateEnumEnumeration(this Op /// The so that additional calls can be chained. public static OptionsBuilder ValidateDistinctValues(this OptionsBuilder optionsBuilder, IConfigurationSection section) where TOptions : class { - optionsBuilder.Services.AddTransient>(_ => new DistinctValuesValidation(optionsBuilder.Name, section)); + optionsBuilder.Services.TryAddTransient>(_ => new DistinctValuesValidation(optionsBuilder.Name, section)); return optionsBuilder; } @@ -63,12 +64,11 @@ public static OptionsBuilder ValidateDistinctValues(this Opt /// The options type to be configured. /// The options builder to add the services to. /// The current configuration section - /// The current environment /// The so that additional calls can be chained. - public static OptionsBuilder EnvironmentalValidation(this OptionsBuilder optionsBuilder, IConfigurationSection section, IHostEnvironment environment) + public static OptionsBuilder EnvironmentalValidation(this OptionsBuilder optionsBuilder, IConfigurationSection section) where TOptions : class { - if (environment.SkipValidation()) + if (EnvironmentExtensions.SkipValidation()) { return optionsBuilder; } diff --git a/src/framework/Framework.Seeding/DependencyInjection/DatabaseInitializerExtensions.cs b/src/framework/Framework.Seeding/DependencyInjection/DatabaseInitializerExtensions.cs index bf04f762b2..135109c3c9 100644 --- a/src/framework/Framework.Seeding/DependencyInjection/DatabaseInitializerExtensions.cs +++ b/src/framework/Framework.Seeding/DependencyInjection/DatabaseInitializerExtensions.cs @@ -36,9 +36,9 @@ await scope.ServiceProvider.GetRequiredService() .InitializeDatabasesAsync(cancellationToken); } - public static IServiceCollection AddDatabaseInitializer(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) where TDbContext : DbContext => + public static IServiceCollection AddDatabaseInitializer(this IServiceCollection services, IConfigurationSection section) where TDbContext : DbContext => services - .ConfigureSeederSettings(section, environment) + .ConfigureSeederSettings(section) .AddTransient>() .AddTransient>() .AddTransient() diff --git a/src/framework/Framework.Seeding/SeederSettings.cs b/src/framework/Framework.Seeding/SeederSettings.cs index dfa13b8d23..4d93a57b55 100644 --- a/src/framework/Framework.Seeding/SeederSettings.cs +++ b/src/framework/Framework.Seeding/SeederSettings.cs @@ -44,12 +44,11 @@ public static class SeederSettingsExtensions { public static IServiceCollection ConfigureSeederSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/framework/Framework.Web/StartupServiceExtensions.cs b/src/framework/Framework.Web/StartupServiceExtensions.cs index ecaf3f80d6..59e399e159 100644 --- a/src/framework/Framework.Web/StartupServiceExtensions.cs +++ b/src/framework/Framework.Web/StartupServiceExtensions.cs @@ -33,7 +33,7 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public static class StartupServiceExtensions { - public static IServiceCollection AddDefaultServices(this IServiceCollection services, IConfigurationRoot configuration, string version, string cookieName, IHostEnvironment environment) + public static IServiceCollection AddDefaultServices(this IServiceCollection services, IConfigurationRoot configuration, string version, string cookieName) { services.AddCors(options => options.SetupCors(configuration)); @@ -73,7 +73,7 @@ public static IServiceCollection AddDefaultServices(this IServiceColle services .AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services.AddHealthChecks() .AddCheck("JwtBearerConfiguration", tags: ["keycloak"]); diff --git a/src/framework/Framework.Web/WebApplicationBuildRunner.cs b/src/framework/Framework.Web/WebApplicationBuildRunner.cs index 7a5dd2d2c6..d14cc3b3c7 100644 --- a/src/framework/Framework.Web/WebApplicationBuildRunner.cs +++ b/src/framework/Framework.Web/WebApplicationBuildRunner.cs @@ -72,7 +72,7 @@ public static async Task BuildAndRunWebApplicationAsync( } }); builder.Services - .AddDefaultServices(builder.Configuration, version, cookieName, builder.Environment); + .AddDefaultServices(builder.Configuration, version, cookieName); configureBuilder?.Invoke(builder); diff --git a/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs b/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs index 16bd399848..c5f42e5a29 100644 --- a/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs +++ b/src/keycloak/Keycloak.Factory/KeycloakSettingData.cs @@ -84,16 +84,15 @@ public static class KeycloakSettingsExtention { public static IServiceCollection ConfigureKeycloakSettingsMap( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { var options = services.AddOptions() .Bind(section); options - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); - if (!environment.SkipValidation()) + if (!EnvironmentExtensions.SkipValidation()) { options.Validate(x => x.Validate()); } diff --git a/src/keycloak/Keycloak.Seeding/BusinessLogic/KeycloakSeederSettings.cs b/src/keycloak/Keycloak.Seeding/BusinessLogic/KeycloakSeederSettings.cs index 7621ce1508..ae59f24e24 100644 --- a/src/keycloak/Keycloak.Seeding/BusinessLogic/KeycloakSeederSettings.cs +++ b/src/keycloak/Keycloak.Seeding/BusinessLogic/KeycloakSeederSettings.cs @@ -41,12 +41,11 @@ public static class KeycloakSeederSettingsExtensions { public static IServiceCollection ConfigureKeycloakSeederSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/keycloak/Keycloak.Seeding/Program.cs b/src/keycloak/Keycloak.Seeding/Program.cs index 2ce5a3d717..fa9c82757a 100644 --- a/src/keycloak/Keycloak.Seeding/Program.cs +++ b/src/keycloak/Keycloak.Seeding/Program.cs @@ -48,9 +48,9 @@ .AddTransient() .AddTransient() .AddTransient() - .ConfigureKeycloakSettingsMap(hostContext.Configuration.GetSection("Keycloak"), hostContext.HostingEnvironment) + .ConfigureKeycloakSettingsMap(hostContext.Configuration.GetSection("Keycloak")) .AddTransient() - .ConfigureKeycloakSeederSettings(hostContext.Configuration.GetSection("KeycloakSeeding"), hostContext.HostingEnvironment); + .ConfigureKeycloakSeederSettings(hostContext.Configuration.GetSection("KeycloakSeeding")); if (hostContext.HostingEnvironment.IsDevelopment()) { diff --git a/src/mailing/Mailing.SendMail/MailSettings.cs b/src/mailing/Mailing.SendMail/MailSettings.cs index f05bd96621..7b8707df8e 100644 --- a/src/mailing/Mailing.SendMail/MailSettings.cs +++ b/src/mailing/Mailing.SendMail/MailSettings.cs @@ -57,14 +57,13 @@ public static class MailSettingsExtension { public static IServiceCollection ConfigureMailSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { var options = services.AddOptions() .Bind(section); options - .EnvironmentalValidation(section, environment); - if (!environment.SkipValidation()) + .EnvironmentalValidation(section); + if (!EnvironmentExtensions.SkipValidation()) { options.Validate(x => x.Validate()); } diff --git a/src/mailing/Mailing.SendMail/MailingStartupServiceExtensions.cs b/src/mailing/Mailing.SendMail/MailingStartupServiceExtensions.cs index 2a4d1951c6..aed847ce1c 100644 --- a/src/mailing/Mailing.SendMail/MailingStartupServiceExtensions.cs +++ b/src/mailing/Mailing.SendMail/MailingStartupServiceExtensions.cs @@ -27,10 +27,10 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; public static class MailingStartupServiceExtensions { - public static IServiceCollection AddMailingAndTemplateManager(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) => + public static IServiceCollection AddMailingAndTemplateManager(this IServiceCollection services, IConfiguration configuration) => services.AddTransient() .AddTransient() .AddTransient() - .ConfigureTemplateSettings(configuration.GetSection(TemplateSettings.Position), environment) - .ConfigureMailSettings(configuration.GetSection(MailSettings.Position), environment); + .ConfigureTemplateSettings(configuration.GetSection(TemplateSettings.Position)) + .ConfigureMailSettings(configuration.GetSection(MailSettings.Position)); } diff --git a/src/mailing/Mailing.Template/TemplateSettings.cs b/src/mailing/Mailing.Template/TemplateSettings.cs index 99e5c63dc5..71471ad11e 100644 --- a/src/mailing/Mailing.Template/TemplateSettings.cs +++ b/src/mailing/Mailing.Template/TemplateSettings.cs @@ -93,14 +93,13 @@ public static class TemplateSettingsExtention { public static IServiceCollection ConfigureTemplateSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { var options = services.AddOptions() .Bind(section); options - .EnvironmentalValidation(section, environment); - if (!environment.SkipValidation()) + .EnvironmentalValidation(section); + if (!EnvironmentExtensions.SkipValidation()) { options.Validate(x => x.Validate()); } diff --git a/src/maintenance/Maintenance.App/Program.cs b/src/maintenance/Maintenance.App/Program.cs index 7cf2bfa38a..91d7cacdc7 100644 --- a/src/maintenance/Maintenance.App/Program.cs +++ b/src/maintenance/Maintenance.App/Program.cs @@ -39,9 +39,9 @@ { services .AddMaintenanceService() - .AddConfigurationProcessIdentityIdDetermination(hostContext.Configuration.GetSection("ProcessIdentity"), hostContext.HostingEnvironment) + .AddConfigurationProcessIdentityIdDetermination(hostContext.Configuration.GetSection("ProcessIdentity")) .AddBatchDelete(hostContext.Configuration.GetSection("BatchDelete")) - .AddClearinghouseService(hostContext.Configuration.GetSection("Clearinghouse"), hostContext.HostingEnvironment) + .AddClearinghouseService(hostContext.Configuration.GetSection("Clearinghouse")) .AddDbAuditing() .AddDbContext(o => o.UseNpgsql(hostContext.Configuration.GetConnectionString("PortalDb")) diff --git a/src/marketplace/Apps.Service/Apps.Service.csproj b/src/marketplace/Apps.Service/Apps.Service.csproj index ecdf56e4f3..3fbd6a15e6 100644 --- a/src/marketplace/Apps.Service/Apps.Service.csproj +++ b/src/marketplace/Apps.Service/Apps.Service.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs b/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs index b068916d81..f6772706d4 100644 --- a/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs +++ b/src/marketplace/Apps.Service/BusinessLogic/AppsSettings.cs @@ -245,12 +245,11 @@ public static class AppsSettingsExtension /// public static IServiceCollection ConfigureAppsSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/marketplace/Apps.Service/Program.cs b/src/marketplace/Apps.Service/Program.cs index 97352ec2ab..1ef82cc86c 100644 --- a/src/marketplace/Apps.Service/Program.cs +++ b/src/marketplace/Apps.Service/Program.cs @@ -43,7 +43,7 @@ await WebAppHelper builder.Services .AddPortalRepositories(builder.Configuration) - .AddProvisioningManager(builder.Configuration, builder.Environment); + .AddProvisioningManager(builder.Configuration); builder.Services.AddTransient(); builder.Services.AddTransient() @@ -54,13 +54,13 @@ await WebAppHelper .AddSingleton() .AddSingleton() .AddTechnicalUserProfile() - .ConfigureAppsSettings(builder.Configuration.GetSection("AppMarketPlace"), builder.Environment) + .ConfigureAppsSettings(builder.Configuration.GetSection("AppMarketPlace")) .AddOfferDocumentServices(); builder.Services - .AddDimService(builder.Configuration.GetSection("Dim"), builder.Environment) + .AddDimService(builder.Configuration.GetSection("Dim")) .AddOfferServices() .AddProvisioningDBAccess(builder.Configuration); - builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation"), builder.Environment); + builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation")); }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/marketplace/Services.Service/DependencyInjection/ServiceLogicExtensions.cs b/src/marketplace/Services.Service/DependencyInjection/ServiceLogicExtensions.cs index f665833feb..e384035c4c 100644 --- a/src/marketplace/Services.Service/DependencyInjection/ServiceLogicExtensions.cs +++ b/src/marketplace/Services.Service/DependencyInjection/ServiceLogicExtensions.cs @@ -24,12 +24,12 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.DependencyInjecti public static class ServiceLogicExtensions { - public static IServiceCollection AddServiceBusinessLogic(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) + public static IServiceCollection AddServiceBusinessLogic(this IServiceCollection services, IConfiguration config) { var section = config.GetSection("Services"); services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services .AddTransient() .AddTransient() diff --git a/src/marketplace/Services.Service/Program.cs b/src/marketplace/Services.Service/Program.cs index a23b545670..e59c20dd9f 100644 --- a/src/marketplace/Services.Service/Program.cs +++ b/src/marketplace/Services.Service/Program.cs @@ -43,12 +43,12 @@ await WebAppHelper builder.Services .AddPortalRepositories(builder.Configuration) - .AddProvisioningManager(builder.Configuration, builder.Environment); + .AddProvisioningManager(builder.Configuration); builder.Services.AddTransient(); builder.Services - .AddDimService(builder.Configuration.GetSection("Dim"), builder.Environment) - .AddServiceBusinessLogic(builder.Configuration, builder.Environment) + .AddDimService(builder.Configuration.GetSection("Dim")) + .AddServiceBusinessLogic(builder.Configuration) .AddTransient() .AddTransient() .AddSingleton() @@ -60,5 +60,5 @@ await WebAppHelper .AddOfferServices() .AddProvisioningDBAccess(builder.Configuration); - builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation"), builder.Environment); + builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation")); }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/marketplace/Services.Service/ServiceSettings.cs b/src/marketplace/Services.Service/ServiceSettings.cs index 2932929415..15b5bbc269 100644 --- a/src/marketplace/Services.Service/ServiceSettings.cs +++ b/src/marketplace/Services.Service/ServiceSettings.cs @@ -170,12 +170,11 @@ public static class ServiceSettingsExtension { public static IServiceCollection ConfigureServiceSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/marketplace/Services.Service/Services.Service.csproj b/src/marketplace/Services.Service/Services.Service.csproj index 3b81bc267e..6ceadb1934 100644 --- a/src/marketplace/Services.Service/Services.Service.csproj +++ b/src/marketplace/Services.Service/Services.Service.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/notifications/Notifications.Service/BusinessLogic/NotificationSettings.cs b/src/notifications/Notifications.Service/BusinessLogic/NotificationSettings.cs index 58c6399156..bec089b261 100644 --- a/src/notifications/Notifications.Service/BusinessLogic/NotificationSettings.cs +++ b/src/notifications/Notifications.Service/BusinessLogic/NotificationSettings.cs @@ -42,12 +42,11 @@ public static class NotificationSettingsExtension /// public static IServiceCollection ConfigureNotificationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/notifications/Notifications.Service/Notifications.Service.csproj b/src/notifications/Notifications.Service/Notifications.Service.csproj index 7ff7db8593..2b89e8a295 100644 --- a/src/notifications/Notifications.Service/Notifications.Service.csproj +++ b/src/notifications/Notifications.Service/Notifications.Service.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/notifications/Notifications.Service/Program.cs b/src/notifications/Notifications.Service/Program.cs index 3db0332178..701d5d7261 100644 --- a/src/notifications/Notifications.Service/Program.cs +++ b/src/notifications/Notifications.Service/Program.cs @@ -37,5 +37,5 @@ await WebAppHelper builder.Services .AddTransient() - .ConfigureNotificationSettings(builder.Configuration.GetSection("Notifications"), builder.Environment); + .ConfigureNotificationSettings(builder.Configuration.GetSection("Notifications")); }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/portalbackend/PortalBackend.Migrations/Program.cs b/src/portalbackend/PortalBackend.Migrations/Program.cs index cf98ab8a7a..093d525866 100644 --- a/src/portalbackend/PortalBackend.Migrations/Program.cs +++ b/src/portalbackend/PortalBackend.Migrations/Program.cs @@ -39,14 +39,14 @@ .ConfigureServices((hostContext, services) => { services - .AddConfigurationProcessIdentityIdDetermination(hostContext.Configuration.GetSection("ProcessIdentity"), hostContext.HostingEnvironment) + .AddConfigurationProcessIdentityIdDetermination(hostContext.Configuration.GetSection("ProcessIdentity")) .AddDbAuditing() .AddDbContext(o => o.UseNpgsql(hostContext.Configuration.GetConnectionString("PortalDb"), x => x.MigrationsAssembly(Assembly.GetExecutingAssembly().GetName().Name) .MigrationsHistoryTable("__efmigrations_history_portal")) .UsePostgreSqlTriggers()) - .AddDatabaseInitializer(hostContext.Configuration.GetSection("Seeding"), hostContext.HostingEnvironment); + .AddDatabaseInitializer(hostContext.Configuration.GetSection("Seeding")); }) .AddLogging() .Build(); diff --git a/src/processes/ApplicationChecklist.Config/ApplicationChecklistExtensions.cs b/src/processes/ApplicationChecklist.Config/ApplicationChecklistExtensions.cs index aa6f85a96a..5ae47bec14 100644 --- a/src/processes/ApplicationChecklist.Config/ApplicationChecklistExtensions.cs +++ b/src/processes/ApplicationChecklist.Config/ApplicationChecklistExtensions.cs @@ -33,19 +33,19 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Con public static class ApplicationChecklistExtensions { - public static IServiceCollection AddApplicationChecklist(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) => + public static IServiceCollection AddApplicationChecklist(this IServiceCollection services, IConfigurationSection section) => services .AddTransient() .AddTransient() - .AddBpdmService(section.GetSection("Bpdm"), environment) - .AddCustodianService(section.GetSection("Custodian"), environment) - .AddClearinghouseService(section.GetSection("Clearinghouse"), environment) - .AddSdFactoryService(section.GetSection("SdFactory"), environment) - .AddDimService(section.GetSection("Dim"), environment) - .AddIssuerComponentService(section.GetSection("IssuerComponent"), environment); + .AddBpdmService(section.GetSection("Bpdm")) + .AddCustodianService(section.GetSection("Custodian")) + .AddClearinghouseService(section.GetSection("Clearinghouse")) + .AddSdFactoryService(section.GetSection("SdFactory")) + .AddDimService(section.GetSection("Dim")) + .AddIssuerComponentService(section.GetSection("IssuerComponent")); - public static IServiceCollection AddApplicationChecklistCreation(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) => + public static IServiceCollection AddApplicationChecklistCreation(this IServiceCollection services, IConfigurationSection section) => services - .ConfigureApplicationChecklistSettings(section, environment) + .ConfigureApplicationChecklistSettings(section) .AddTransient(); } diff --git a/src/processes/ApplicationChecklist.Library/ApplicationChecklistSettings.cs b/src/processes/ApplicationChecklist.Library/ApplicationChecklistSettings.cs index e0e95a815b..0cbe645e31 100644 --- a/src/processes/ApplicationChecklist.Library/ApplicationChecklistSettings.cs +++ b/src/processes/ApplicationChecklist.Library/ApplicationChecklistSettings.cs @@ -33,12 +33,11 @@ public static class ApplicationChecklistSettingsExtension { public static IServiceCollection ConfigureApplicationChecklistSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/processes/DimUserProcess.Executor/DependencyInjection/DimUserProcessCollectionExtensions.cs b/src/processes/DimUserProcess.Executor/DependencyInjection/DimUserProcessCollectionExtensions.cs index 56f51bf728..f38beb1c16 100644 --- a/src/processes/DimUserProcess.Executor/DependencyInjection/DimUserProcessCollectionExtensions.cs +++ b/src/processes/DimUserProcess.Executor/DependencyInjection/DimUserProcessCollectionExtensions.cs @@ -29,11 +29,10 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.DimUserCreationProcess.E public static class DimUserProcessCollectionExtensions { public static IServiceCollection AddDimUserProcessExecutor(this IServiceCollection services, - IConfiguration config, - IHostEnvironment environment) => + IConfiguration config) => services - .AddIdpManagement(config, environment) + .AddIdpManagement(config) .AddTransient() .AddTransient() - .AddDimService(config.GetSection("Dim"), environment); + .AddDimService(config.GetSection("Dim")); } diff --git a/src/processes/Invitation.Executor/DependencyInjection/InvitationProcessCollectionExtensions.cs b/src/processes/Invitation.Executor/DependencyInjection/InvitationProcessCollectionExtensions.cs index a63ecc42d7..fc5bd02f71 100644 --- a/src/processes/Invitation.Executor/DependencyInjection/InvitationProcessCollectionExtensions.cs +++ b/src/processes/Invitation.Executor/DependencyInjection/InvitationProcessCollectionExtensions.cs @@ -27,10 +27,10 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Invitation.Executor.Depe public static class InvitationProcessCollectionExtensions { - public static IServiceCollection AddInvitationProcessExecutor(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) => + public static IServiceCollection AddInvitationProcessExecutor(this IServiceCollection services, IConfiguration config) => services - .AddIdpManagement(config, environment) + .AddIdpManagement(config) .AddTransient() .AddTransient() - .ConfigureInvitationSettings(config.GetSection("Invitation"), environment); + .ConfigureInvitationSettings(config.GetSection("Invitation")); } diff --git a/src/processes/Invitation.Executor/DependencyInjection/InvitationSettings.cs b/src/processes/Invitation.Executor/DependencyInjection/InvitationSettings.cs index 293ba7ae78..4360cb1f7d 100644 --- a/src/processes/Invitation.Executor/DependencyInjection/InvitationSettings.cs +++ b/src/processes/Invitation.Executor/DependencyInjection/InvitationSettings.cs @@ -56,12 +56,11 @@ public static class InvitationSettingsExtension { public static IServiceCollection ConfigureInvitationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/processes/Mailing.Library/DependencyInjection/MailingProcessCreationDependencyInjection.cs b/src/processes/Mailing.Library/DependencyInjection/MailingProcessCreationDependencyInjection.cs index 2cf828aa26..6545412c70 100644 --- a/src/processes/Mailing.Library/DependencyInjection/MailingProcessCreationDependencyInjection.cs +++ b/src/processes/Mailing.Library/DependencyInjection/MailingProcessCreationDependencyInjection.cs @@ -25,8 +25,8 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Mailing.Library.Dependen public static class MailingProcessCreationDependencyInjection { - public static IServiceCollection AddMailingProcessCreation(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) => + public static IServiceCollection AddMailingProcessCreation(this IServiceCollection services, IConfigurationSection section) => services .AddTransient() - .ConfigureMailingProcessCreationSettings(section, environment); + .ConfigureMailingProcessCreationSettings(section); } diff --git a/src/processes/Mailing.Library/MailingProcessCreationSettings.cs b/src/processes/Mailing.Library/MailingProcessCreationSettings.cs index f5ed70a92f..06af5e0f9f 100644 --- a/src/processes/Mailing.Library/MailingProcessCreationSettings.cs +++ b/src/processes/Mailing.Library/MailingProcessCreationSettings.cs @@ -40,12 +40,11 @@ public static class MailingProcessCreationSettingsExtension { public static IServiceCollection ConfigureMailingProcessCreationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/processes/NetworkRegistration.Executor/DependencyInjection/NetworkRegistrationProcessCollectionExtensions.cs b/src/processes/NetworkRegistration.Executor/DependencyInjection/NetworkRegistrationProcessCollectionExtensions.cs index 91e2d9dfc9..c72c3e4712 100644 --- a/src/processes/NetworkRegistration.Executor/DependencyInjection/NetworkRegistrationProcessCollectionExtensions.cs +++ b/src/processes/NetworkRegistration.Executor/DependencyInjection/NetworkRegistrationProcessCollectionExtensions.cs @@ -29,8 +29,8 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.NetworkRegistration.Exec public static class NetworkRegistrationProcessCollectionExtensions { - public static IServiceCollection AddNetworkRegistrationProcessExecutor(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) => - services.AddNetworkRegistrationHandler(config, environment) - .AddOnboardingServiceProviderService(config, environment) + public static IServiceCollection AddNetworkRegistrationProcessExecutor(this IServiceCollection services, IConfiguration config) => + services.AddNetworkRegistrationHandler(config) + .AddOnboardingServiceProviderService(config) .AddTransient(); } diff --git a/src/processes/NetworkRegistration.Library/DependencyInjection/NetworkRegistrationHandlerExtensions.cs b/src/processes/NetworkRegistration.Library/DependencyInjection/NetworkRegistrationHandlerExtensions.cs index 0fb56ef67f..621ec1eb59 100644 --- a/src/processes/NetworkRegistration.Library/DependencyInjection/NetworkRegistrationHandlerExtensions.cs +++ b/src/processes/NetworkRegistration.Library/DependencyInjection/NetworkRegistrationHandlerExtensions.cs @@ -48,12 +48,12 @@ public class NetworkRegistrationProcessSettings public static class NetworkRegistrationHandlerExtensions { - public static IServiceCollection AddNetworkRegistrationHandler(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) + public static IServiceCollection AddNetworkRegistrationHandler(this IServiceCollection services, IConfiguration config) { var section = config.GetSection("NetworkRegistration"); services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services .AddTransient() diff --git a/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionProcessCollectionExtensions.cs b/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionProcessCollectionExtensions.cs index 4f05954db3..eeb089192f 100644 --- a/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionProcessCollectionExtensions.cs +++ b/src/processes/OfferSubscription.Executor/DependencyInjection/OfferSubscriptionProcessCollectionExtensions.cs @@ -29,15 +29,15 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.OfferSubscription.Execut public static class OfferSubscriptionProcessCollectionExtensions { - public static IServiceCollection AddOfferSubscriptionProcessExecutor(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) + public static IServiceCollection AddOfferSubscriptionProcessExecutor(this IServiceCollection services, IConfiguration config) { var section = config.GetSection("OfferSubscriptionProcess"); services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services - .AddOfferProviderService(config, environment) + .AddOfferProviderService(config) .AddOfferServices() .AddTransient(); } diff --git a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs b/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs index 0aa634eb27..1982199516 100644 --- a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs +++ b/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs @@ -27,22 +27,22 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.Dependen public static class ProcessIdentityServiceCollectionExtensions { - public static IServiceCollection AddConfigurationProcessIdentityIdDetermination(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddConfigurationProcessIdentityIdDetermination(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services .AddTransient() .AddTransient(); } - public static IServiceCollection AddConfigurationProcessIdentityService(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddConfigurationProcessIdentityService(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services .AddScoped() diff --git a/src/processes/Processes.Worker/Program.cs b/src/processes/Processes.Worker/Program.cs index 2bb7e22d15..d42c44b028 100644 --- a/src/processes/Processes.Worker/Program.cs +++ b/src/processes/Processes.Worker/Program.cs @@ -53,26 +53,26 @@ .ConfigureServices((hostContext, services) => { services - .AddMailingAndTemplateManager(hostContext.Configuration, hostContext.HostingEnvironment) + .AddMailingAndTemplateManager(hostContext.Configuration) .AddProcessExecutionService(hostContext.Configuration.GetSection("Processes")) .AddTransient() - .AddOfferSubscriptionProcessExecutor(hostContext.Configuration, hostContext.HostingEnvironment) + .AddOfferSubscriptionProcessExecutor(hostContext.Configuration) .AddTechnicalUserProfile() .AddTransient() .AddPortalRepositories(hostContext.Configuration) - .AddApplicationChecklist(hostContext.Configuration.GetSection("ApplicationChecklist"), hostContext.HostingEnvironment) - .AddBpnDidResolver(hostContext.Configuration.GetSection("BpnDidResolver"), hostContext.HostingEnvironment) - .AddApplicationChecklistCreation(hostContext.Configuration.GetSection("ApplicationCreation"), hostContext.HostingEnvironment) - .AddApplicationActivation(hostContext.Configuration, hostContext.HostingEnvironment) - .AddConfigurationProcessIdentityService(hostContext.Configuration.GetSection("ProcessIdentity"), hostContext.HostingEnvironment) - .AddNetworkRegistrationProcessExecutor(hostContext.Configuration, hostContext.HostingEnvironment) + .AddApplicationChecklist(hostContext.Configuration.GetSection("ApplicationChecklist")) + .AddBpnDidResolver(hostContext.Configuration.GetSection("BpnDidResolver")) + .AddApplicationChecklistCreation(hostContext.Configuration.GetSection("ApplicationCreation")) + .AddApplicationActivation(hostContext.Configuration) + .AddConfigurationProcessIdentityService(hostContext.Configuration.GetSection("ProcessIdentity")) + .AddNetworkRegistrationProcessExecutor(hostContext.Configuration) .AddMailingProcessExecutor() - .AddInvitationProcessExecutor(hostContext.Configuration, hostContext.HostingEnvironment) - .AddMailingProcessCreation(hostContext.Configuration.GetSection("MailingProcessCreation"), hostContext.HostingEnvironment) - .AddDimUserProcessExecutor(hostContext.Configuration.GetSection("ApplicationChecklist"), hostContext.HostingEnvironment) + .AddInvitationProcessExecutor(hostContext.Configuration) + .AddMailingProcessCreation(hostContext.Configuration.GetSection("MailingProcessCreation")) + .AddDimUserProcessExecutor(hostContext.Configuration.GetSection("ApplicationChecklist")) .AddTransient() .AddTransient() - .AddSelfDescriptionCreationProcessExecutor(hostContext.Configuration, hostContext.HostingEnvironment); + .AddSelfDescriptionCreationProcessExecutor(hostContext.Configuration); if (hostContext.HostingEnvironment.IsDevelopment()) { diff --git a/src/processes/SelfDescriptionCreation.Executor/DependencyInjection/SdCreationProcessExtensions.cs b/src/processes/SelfDescriptionCreation.Executor/DependencyInjection/SdCreationProcessExtensions.cs index 25b39e7eb6..c675135189 100644 --- a/src/processes/SelfDescriptionCreation.Executor/DependencyInjection/SdCreationProcessExtensions.cs +++ b/src/processes/SelfDescriptionCreation.Executor/DependencyInjection/SdCreationProcessExtensions.cs @@ -27,12 +27,12 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Processes.SelfDescriptionCreation. public static class SdCreationProcessExtensions { - public static IServiceCollection AddSelfDescriptionCreationProcessExecutor(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) + public static IServiceCollection AddSelfDescriptionCreationProcessExecutor(this IServiceCollection services, IConfiguration config) { var section = config.GetSection("SelfDescriptionCreationProcess"); services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services .AddTransient(); diff --git a/src/provisioning/Provisioning.Library/Extensions/ServiceAccountCreationExtensions.cs b/src/provisioning/Provisioning.Library/Extensions/ServiceAccountCreationExtensions.cs index 676dfdd7af..81062e4ebb 100644 --- a/src/provisioning/Provisioning.Library/Extensions/ServiceAccountCreationExtensions.cs +++ b/src/provisioning/Provisioning.Library/Extensions/ServiceAccountCreationExtensions.cs @@ -29,11 +29,11 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; public static class ServiceAccountCreationExtensions { - public static IServiceCollection AddServiceAccountCreation(this IServiceCollection services, IConfigurationSection section, IHostEnvironment environment) + public static IServiceCollection AddServiceAccountCreation(this IServiceCollection services, IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); services .AddTransient(); diff --git a/src/provisioning/Provisioning.Library/ProvisioningManagerStartupServiceExtensions.cs b/src/provisioning/Provisioning.Library/ProvisioningManagerStartupServiceExtensions.cs index 18ab08e109..9e8c07a0cc 100644 --- a/src/provisioning/Provisioning.Library/ProvisioningManagerStartupServiceExtensions.cs +++ b/src/provisioning/Provisioning.Library/ProvisioningManagerStartupServiceExtensions.cs @@ -30,10 +30,10 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; public static class ProvisioningManagerStartupServiceExtensions { - public static IServiceCollection AddProvisioningManager(this IServiceCollection services, IConfiguration configuration, IHostEnvironment environment) + public static IServiceCollection AddProvisioningManager(this IServiceCollection services, IConfiguration configuration) { services.AddTransient() - .ConfigureKeycloakSettingsMap(configuration.GetSection("Keycloak"), environment) + .ConfigureKeycloakSettingsMap(configuration.GetSection("Keycloak")) .AddTransient() .ConfigureProvisioningSettings(configuration.GetSection("Provisioning")); @@ -46,6 +46,6 @@ public static IServiceCollection AddProvisioningManager(this IServiceCollection } return services - .AddServiceAccountCreation(configuration.GetSection("Provisioning"), environment); + .AddServiceAccountCreation(configuration.GetSection("Provisioning")); } } diff --git a/src/provisioning/Provisioning.Migrations/Program.cs b/src/provisioning/Provisioning.Migrations/Program.cs index ff27cd0e5d..ffef01bb91 100644 --- a/src/provisioning/Provisioning.Migrations/Program.cs +++ b/src/provisioning/Provisioning.Migrations/Program.cs @@ -40,7 +40,7 @@ o.UseNpgsql(hostContext.Configuration.GetConnectionString("ProvisioningDb"), x => x.MigrationsAssembly(Assembly.GetExecutingAssembly().GetName().Name) .MigrationsHistoryTable("__efmigrations_history_provisioning", "public"))) - .AddDatabaseInitializer(hostContext.Configuration.GetSection("Seeding"), hostContext.HostingEnvironment); + .AddDatabaseInitializer(hostContext.Configuration.GetSection("Seeding")); }) .AddLogging() .Build(); diff --git a/src/registration/ApplicationActivation.Library/DependencyInjection/ApplicationActivationExtensions.cs b/src/registration/ApplicationActivation.Library/DependencyInjection/ApplicationActivationExtensions.cs index 8885bb4db0..ba34c50bc2 100644 --- a/src/registration/ApplicationActivation.Library/DependencyInjection/ApplicationActivationExtensions.cs +++ b/src/registration/ApplicationActivation.Library/DependencyInjection/ApplicationActivationExtensions.cs @@ -30,14 +30,14 @@ namespace Org.Eclipse.TractusX.Portal.Backend.ApplicationActivation.Library.Depe public static class ApplicationActivationExtensions { - public static IServiceCollection AddApplicationActivation(this IServiceCollection services, IConfiguration config, IHostEnvironment environment) + public static IServiceCollection AddApplicationActivation(this IServiceCollection services, IConfiguration config) { var section = config.GetSection("ApplicationActivation"); var options = services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); - if (!environment.SkipValidation()) + if (!EnvironmentExtensions.SkipValidation()) { options.Validate(ApplicationActivationSettings.Validate); } @@ -45,7 +45,7 @@ public static IServiceCollection AddApplicationActivation(this IServiceCollectio return services .AddDateTimeProvider() .AddTransient() - .AddProvisioningManager(config, environment) + .AddProvisioningManager(config) .AddScoped(); } } diff --git a/src/registration/Registration.Service/BusinessLogic/RegistrationSettings.cs b/src/registration/Registration.Service/BusinessLogic/RegistrationSettings.cs index 8e010ee50a..903121fe91 100644 --- a/src/registration/Registration.Service/BusinessLogic/RegistrationSettings.cs +++ b/src/registration/Registration.Service/BusinessLogic/RegistrationSettings.cs @@ -87,12 +87,11 @@ public static class RegistrationSettingsExtension { public static IServiceCollection ConfigureRegistrationSettings( this IServiceCollection services, - IConfigurationSection section, - IHostEnvironment environment) + IConfigurationSection section) { services.AddOptions() .Bind(section) - .EnvironmentalValidation(section, environment); + .EnvironmentalValidation(section); return services; } } diff --git a/src/registration/Registration.Service/Program.cs b/src/registration/Registration.Service/Program.cs index 8fd05cab41..703f18fb59 100644 --- a/src/registration/Registration.Service/Program.cs +++ b/src/registration/Registration.Service/Program.cs @@ -39,15 +39,15 @@ await WebAppHelper builder.Services .AddPortalRepositories(builder.Configuration) - .AddProvisioningManager(builder.Configuration, builder.Environment); + .AddProvisioningManager(builder.Configuration); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient() - .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration"), builder.Environment) + .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration")) .AddTransient(); - builder.Services.AddApplicationChecklistCreation(builder.Configuration.GetSection("ApplicationCreation"), builder.Environment); - builder.Services.AddBpnAccess(builder.Configuration.GetSection("BpnAccess"), builder.Environment); - builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation"), builder.Environment); + builder.Services.AddApplicationChecklistCreation(builder.Configuration.GetSection("ApplicationCreation")); + builder.Services.AddBpnAccess(builder.Configuration.GetSection("BpnAccess")); + builder.Services.AddMailingProcessCreation(builder.Configuration.GetSection("MailingProcessCreation")); }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/src/registration/Registration.Service/Registration.Service.csproj b/src/registration/Registration.Service/Registration.Service.csproj index 1f5fc58018..ab40288fd9 100644 --- a/src/registration/Registration.Service/Registration.Service.csproj +++ b/src/registration/Registration.Service/Registration.Service.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/shared/Tests.Shared/IntegrationTests/IntegrationTestFactory.cs b/tests/shared/Tests.Shared/IntegrationTests/IntegrationTestFactory.cs index 668716daa1..53d508e183 100644 --- a/tests/shared/Tests.Shared/IntegrationTests/IntegrationTestFactory.cs +++ b/tests/shared/Tests.Shared/IntegrationTests/IntegrationTestFactory.cs @@ -52,6 +52,7 @@ public class IntegrationTestFactory : WebApplicationFa protected override void ConfigureWebHost(IWebHostBuilder builder) { Environment.SetEnvironmentVariable("MVC_ROUTING_BASEPATH", "/api/test"); + Environment.SetEnvironmentVariable("SKIP_CONFIGURATION_VALIDATION", "true"); builder.UseEnvironment("Test"); builder.ConfigureTestServices(services => {