feat: adjust environment variable to skip validation

Refs: #1021
eclipse-tractusx · Sep 24, 2024 · 3dee253 · 3dee253
1 parent 540ed00
commit 3dee253
Show file tree

Hide file tree

Showing 71 changed files with 187 additions and 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
@@ -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
@@ -35,7 +35,7 @@
   <Target Name="openapi" AfterTargets="Build">
     <Message Text="generating openapi v$(Version)" Importance="high" />
     <Exec Command="dotnet tool restore" />
-    <Exec Command="dotnet tool run swagger tofile --yaml --output ../../../docs/api/$(AssemblyName).yaml $(OutputPath)$(AssemblyName).dll v$(Version)" EnvironmentVariables="DOTNET_ROLL_FORWARD=LatestMajor;ASPNETCORE_ENVIRONMENT=Swagger;MVC_ROUTING_BASEPATH=api/administration" />
+    <Exec Command="dotnet tool run swagger tofile --yaml --output ../../../docs/api/$(AssemblyName).yaml $(OutputPath)$(AssemblyName).dll v$(Version)" EnvironmentVariables="DOTNET_ROLL_FORWARD=LatestMajor;SKIP_CONFIGURATION_VALIDATION=true;MVC_ROUTING_BASEPATH=api/administration" />
   </Target>
 
   <ItemGroup>
@@ -59,6 +59,7 @@
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj" />
     <ProjectReference Include="..\..\notifications\Notifications.Library\Notifications.Library.csproj" />
     <ProjectReference Include="..\..\processes\Mailing.Library\Mailing.Library.csproj" />
+    <ProjectReference Include="..\..\processes\Processes.Library\Processes.Library.csproj" />
     <ProjectReference Include="..\..\provisioning\Provisioning.Library\Provisioning.Library.csproj" />
     <ProjectReference Include="..\..\portalbackend\PortalBackend.DBAccess\PortalBackend.DBAccess.csproj" />
     <ProjectReference Include="..\..\processes\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj" />

diff --git 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<CompanyDataSettings>()
             .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
@@ -57,12 +57,11 @@ public static class ConnectorsSettingsExtensions
 {
     public static IServiceCollection ConfigureConnectorsSettings(
         this IServiceCollection services,
-        IConfigurationSection section,
-        IHostEnvironment environment)
+        IConfigurationSection section)
     {
         services.AddOptions<ConnectorsSettings>()
             .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
@@ -42,12 +42,11 @@ public static class DocumentSettingsExtension
 {
     public static IServiceCollection ConfigureDocumentSettings(
         this IServiceCollection services,
-        IConfigurationSection section,
-        IHostEnvironment environment)
+        IConfigurationSection section)
     {
         services.AddOptions<DocumentSettings>()
             .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
@@ -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<IdentityProviderSettings>()
             .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
@@ -46,12 +46,11 @@ public static class RegistrationSettingsExtension
 {
     public static IServiceCollection ConfigureRegistrationSettings(
         this IServiceCollection services,
-        IConfigurationSection section,
-        IHostEnvironment environment)
+        IConfigurationSection section)
     {
         services.AddOptions<RegistrationSettings>()
             .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
@@ -49,12 +49,11 @@ public static class ServiceAccountSettingsExtensions
 {
     public static IServiceCollection ConfigureServiceAccountSettings(
         this IServiceCollection services,
-        IConfigurationSection section,
-        IHostEnvironment environment)
+        IConfigurationSection section)
     {
         services.AddOptions<ServiceAccountSettings>()
             .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
@@ -74,12 +74,11 @@ public static class UserSettingsExtension
 {
     public static IServiceCollection ConfigureUserSettings(
         this IServiceCollection services,
-        IConfigurationSection section,
-        IHostEnvironment environment)
+        IConfigurationSection section)
     {
         services.AddOptions<UserSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         return services;
     }
 }
diff --git a/...tion/Administration.Service/DependencyInjection/CompanyDataServiceCollectionExtensions.cs b/...tion/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<ICompanyDataBusinessLogic, CompanyDataBusinessLogic>();
 }
diff --git a/...inistration.Service/DependencyInjection/PartnerRegistrationServiceCollectionExtensions.cs b/...inistration.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<IRegistrationStatusBusinessLogic, RegistrationStatusBusinessLogic>()
-            .AddOnboardingServiceProviderService(configuration, environment)
+            .AddOnboardingServiceProviderService(configuration)
             .AddTransient<INetworkBusinessLogic, NetworkBusinessLogic>();
 }
diff --git 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<PartnerRegistrationSettings>()
             .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
@@ -48,7 +48,7 @@ await WebAppHelper
 
         builder.Services
             .AddPortalRepositories(builder.Configuration)
-            .AddProvisioningManager(builder.Configuration, builder.Environment);
+            .AddProvisioningManager(builder.Configuration);
 
         builder.Services.AddTransient<IUserProvisioningService, UserProvisioningService>();
 
@@ -57,40 +57,40 @@ await WebAppHelper
         builder.Services.AddTransient<IUserBusinessLogic, UserBusinessLogic>()
             .AddTransient<IUserUploadBusinessLogic, UserUploadBusinessLogic>()
             .AddTransient<IUserRolesBusinessLogic, UserRolesBusinessLogic>()
-            .ConfigureUserSettings(builder.Configuration.GetSection("UserManagement"), builder.Environment);
+            .ConfigureUserSettings(builder.Configuration.GetSection("UserManagement"));
 
         builder.Services.AddTransient<IRegistrationBusinessLogic, RegistrationBusinessLogic>()
-            .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration"), builder.Environment);
+            .ConfigureRegistrationSettings(builder.Configuration.GetSection("Registration"));
 
         builder.Services.AddTransient<IServiceAccountBusinessLogic, ServiceAccountBusinessLogic>()
-            .ConfigureServiceAccountSettings(builder.Configuration.GetSection("ServiceAccount"), builder.Environment);
+            .ConfigureServiceAccountSettings(builder.Configuration.GetSection("ServiceAccount"));
 
         builder.Services.AddTransient<IDocumentsBusinessLogic, DocumentsBusinessLogic>()
-            .ConfigureDocumentSettings(builder.Configuration.GetSection("Document"), builder.Environment);
+            .ConfigureDocumentSettings(builder.Configuration.GetSection("Document"));
         builder.Services
             .AddTransient<IStaticDataBusinessLogic, StaticDataBusinessLogic>()
             .AddTransient<IPartnerNetworkBusinessLogic, PartnerNetworkBusinessLogic>()
             .AddTransient<INotificationService, NotificationService>()
             .AddTransient<IMailBusinessLogic, MailBusinessLogic>()
-            .AddCompanyDataService(builder.Configuration.GetSection("CompanyData"), builder.Environment);
+            .AddCompanyDataService(builder.Configuration.GetSection("CompanyData"));
 
         builder.Services.AddTransient<IIdentityProviderBusinessLogic, IdentityProviderBusinessLogic>()
-            .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<IConnectorsBusinessLogic, ConnectorsBusinessLogic>()
-            .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<ISubscriptionConfigurationBusinessLogic, SubscriptionConfigurationBusinessLogic>()
             .AddTransient<IServiceAccountManagement, ServiceAccountManagement>()
-            .AddPartnerRegistration(builder.Configuration, builder.Environment)
+            .AddPartnerRegistration(builder.Configuration)
             .AddNetworkRegistrationProcessHelper()
-            .AddIssuerComponentService(builder.Configuration.GetSection("Issuer"), builder.Environment);
+            .AddIssuerComponentService(builder.Configuration.GetSection("Issuer"));
 
         builder.Services
             .AddSingleton<IErrorMessageService, ErrorMessageService>()
@@ -102,5 +102,5 @@ await WebAppHelper
             .AddSingleton<IErrorMessageContainer, ValidationExpressionErrorMessageContainer>();
 
         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
@@ -418,6 +418,6 @@
     ]
   },
   "BpnAccess": {
-    "BaseAddress": ""
+    "BaseUrl": ""
   }
 }
diff --git 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<BpdmServiceSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         services.AddTransient<LoggingHandler<BpdmService>>();
 
         var sp = services.BuildServiceProvider();

diff --git 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<BpdmAccessSettings>()
             .Bind(configSection)
-            .EnvironmentalValidation(configSection, environment);
+            .EnvironmentalValidation(configSection);
 
         var sp = services.BuildServiceProvider();
         var settings = sp.GetRequiredService<IOptions<BpdmAccessSettings>>();

diff --git a/...ms/BpnDidResolver.Library/DependencyInjection/BpnDidResolverServiceCollectionExtension.cs b/...ms/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<BpnDidResolverSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         services.AddTransient<LoggingHandler<BpnDidResolverService>>();
 
         var sp = services.BuildServiceProvider();

diff --git 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<ClearinghouseSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         services.AddTransient<LoggingHandler<ClearinghouseService>>();
 
         var sp = services.BuildServiceProvider();

diff --git 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<CustodianSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         services.AddTransient<LoggingHandler<CustodianService>>();
 
         var sp = services.BuildServiceProvider();

diff --git 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<DimSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
 
         services.AddTransient<LoggingHandler<DimService>>();
 

diff --git a/...IssuerComponent.Library/DependencyInjection/IssuerComponentServiceCollectionExtensions.cs b/...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<IssuerComponentSettings>()
             .Bind(section)
-            .EnvironmentalValidation(section, environment);
+            .EnvironmentalValidation(section);
         services.AddTransient<LoggingHandler<IssuerComponentService>>();
 
         var sp = services.BuildServiceProvider();

diff --git a/...tems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs b/...tems/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<OfferProviderSettings>()
             .Bind(configSection)
-            .EnvironmentalValidation(configSection, environment);
+            .EnvironmentalValidation(configSection);
         services.AddTransient<LoggingHandler<OfferProviderService>>();
 
         return services