From 7aaa70b9135257f82350c41147fb9c1d3724959f Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 13:08:20 +0000 Subject: [PATCH 1/4] refactor:simplify lambda expressions This PR refactors various lambda expressions across the codebase to use expression-bodied syntax when their bodies contain a single statement. The changes remove unnecessary braces and return keywords, leading to more concise and readable code. - Consider simplifying lambda when its body has a single statement The original implementations often wrapped single-line logic in block bodies with explicit return statements (e.g., `t => { return new TestDomainEventHandler(); }`). Each occurrence has been converted to an expression-bodied lambda (e.g., `t => new TestDomainEventHandler()`), eliminating redundant syntax and improving clarity. > This Autofix was generated by AI. Please review the change before merging. --- Shared.EventStore.Tests/AggregateTests.cs | 4 +--- .../ApplicationBuilderExtensionsTests.cs | 10 ++++---- .../DomainEventFactoryTests.cs | 12 +++------- .../DomainEventHandlerResolverTests.cs | 12 +++------- .../TypeMapConvertorTests.cs | 4 +--- .../Aggregate/DomainEventFactory.cs | 19 +++++++-------- Shared.IntegrationTesting/BaseDockerHelper.cs | 16 ++----------- Shared.Tests/ClientProxyBaseTests.cs | 4 ++-- Shared.Tests/ConfigurationReaderTests.cs | 24 +++++-------------- .../ConfigurationRootExtensionsTests.cs | 2 +- Shared.Tests/DbContextFactoryTests.cs | 10 ++------ .../HostEnvironmentExtensionsTests.cs | 2 +- Shared.Tests/PolicyFactoryTests.cs | 2 +- Shared.Tests/PositiveMoneyTests.cs | 5 +--- 14 files changed, 37 insertions(+), 89 deletions(-) diff --git a/Shared.EventStore.Tests/AggregateTests.cs b/Shared.EventStore.Tests/AggregateTests.cs index 55f84ca0..6c96d24f 100644 --- a/Shared.EventStore.Tests/AggregateTests.cs +++ b/Shared.EventStore.Tests/AggregateTests.cs @@ -63,9 +63,7 @@ public void Aggregate_ApplyAndAppend_NullEvent_NoEventIsAppended() public void Aggregate_ApplyAndAppend_ErrorInApplyAndAppend_ExceptionIsThrown() { TestAggregate t = TestAggregate.Create(TestData.AggregateId); - Should.Throw(() => { - t.SetAggregateName("Error",Guid.NewGuid()); - }); + Should.Throw(() => t.SetAggregateName("Error", Guid.NewGuid())); } [Fact] diff --git a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs index 0145c554..adef7434 100644 --- a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs +++ b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs @@ -89,7 +89,7 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_NoneEnabled_Work Dictionary eventHandlerResolvers = new(); eventHandlerResolvers.Add("Ordered", deh.Object); eventHandlerResolvers.Add("Main", deh.Object); - Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; + Action traceHandler = (et, type, msg) => TestOutputHelper.WriteLine(msg); var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(0); @@ -132,7 +132,7 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_OrderedOnlyWorke String eventStoreConnectionString = "esdb://192.168.0.133:2113?tls=true&tlsVerifyCert=false"; Dictionary eventHandlerResolvers = new(); eventHandlerResolvers.Add("Ordered", deh.Object); - Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; + Action traceHandler = (et, type, msg) => TestOutputHelper.WriteLine(msg); var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(1); @@ -157,7 +157,7 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_OrderedOnlyWorke }; String eventStoreConnectionString = "esdb://192.168.0.133:2113?tls=true&tlsVerifyCert=false"; Dictionary eventHandlerResolvers = new(); - Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; + Action traceHandler = (et, type, msg) => TestOutputHelper.WriteLine(msg); var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(0); @@ -212,7 +212,7 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_MainOnlyWorkers_ }; String eventStoreConnectionString = "esdb://192.168.0.133:2113?tls=true&tlsVerifyCert=false"; Dictionary eventHandlerResolvers = new(); - Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; + Action traceHandler = (et, type, msg) => TestOutputHelper.WriteLine(msg); var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(0); @@ -241,7 +241,7 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_MainOnlyWorkers_ Dictionary eventHandlerResolvers = new(); eventHandlerResolvers.Add("Main", deh.Object); Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; - Func subscriptionRepositoryResolver = (s, i) => { return subscriptionRepository.Object; }; + Func subscriptionRepositoryResolver = (s, i) => subscriptionRepository.Object; var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(2); diff --git a/Shared.EventStore.Tests/DomainEventFactoryTests.cs b/Shared.EventStore.Tests/DomainEventFactoryTests.cs index fe9e0780..c2c9738c 100644 --- a/Shared.EventStore.Tests/DomainEventFactoryTests.cs +++ b/Shared.EventStore.Tests/DomainEventFactoryTests.cs @@ -32,9 +32,7 @@ public void DomainEventFactory_CreateDomainEvent_StringAndType_InvalidJson_Excep String eventData = JsonConvert.SerializeObject(aggregateNameSetEvent); eventData = eventData.Replace(":", ""); DomainEventFactory factory = new(); - Should.Throw(() => { - factory.CreateDomainEvent(eventData, typeof(AggregateNameSetEvent)); - }); + Should.Throw(() => factory.CreateDomainEvent(eventData, typeof(AggregateNameSetEvent))); } [Fact] @@ -55,9 +53,7 @@ public void DomainEventFactory_CreateDomainEvent_GuidAndResolvedEvent_UnknownEve ResolvedEvent resolvedEvent = new(TestData.CreateEventRecord(unknownEvent, "TestStream", false), null, null); DomainEventFactory factory = new(); - Should.Throw(() => { - factory.CreateDomainEvent(TestData.AggregateId, resolvedEvent); - }); + Should.Throw(() => factory.CreateDomainEvent(TestData.AggregateId, resolvedEvent)); } [Fact] @@ -88,9 +84,7 @@ public void EventDataFactory_CreateEventData_NullEvent_ErrorThrown() { EventDataFactory factory = new(); - Should.Throw(() => { - factory.CreateEventData(null); - }); + Should.Throw(() => factory.CreateEventData(null)); } [Fact] diff --git a/Shared.EventStore.Tests/DomainEventHandlerResolverTests.cs b/Shared.EventStore.Tests/DomainEventHandlerResolverTests.cs index b89cfd64..a43a4a2c 100644 --- a/Shared.EventStore.Tests/DomainEventHandlerResolverTests.cs +++ b/Shared.EventStore.Tests/DomainEventHandlerResolverTests.cs @@ -36,9 +36,7 @@ IDomainEventHandler CreateEventHandlerFunc(Type t) { public void DomainEventHandlerResolver_EventNotConfigured_NullReturned() { Dictionary eventHandlerConfiguration = new(); - Func createEventHandlerFunc = (t) => { - return new TestDomainEventHandler(); - }; + Func createEventHandlerFunc = t => new TestDomainEventHandler(); DomainEventHandlerResolver r = new(eventHandlerConfiguration, createEventHandlerFunc); List result = r.GetDomainEventHandlers(new EstateCreatedEvent(TestData.AggregateId, TestData.EstateName)); @@ -49,17 +47,13 @@ public void DomainEventHandlerResolver_EventNotConfigured_NullReturned() public void DomainEventHandlerResolver_GetDomainEventHandlers_NoHandlerFound_ErrorThrown() { Dictionary eventHandlerConfiguration = new Dictionary(); - Func createEventHandlerFunc = (t) => { - return new TestDomainEventHandler(); - }; + Func createEventHandlerFunc = t => new TestDomainEventHandler(); List handlers = new List(); handlers.Add("Shared.EventStore.Tests.TestDomainEventHandler1, Shared.EventStore.Tests"); eventHandlerConfiguration.Add("EstateCreatedEvent", handlers.ToArray()); - Should.Throw(() => { - new DomainEventHandlerResolver(eventHandlerConfiguration, createEventHandlerFunc); - }); + Should.Throw(() => new DomainEventHandlerResolver(eventHandlerConfiguration, createEventHandlerFunc)); } } } diff --git a/Shared.EventStore.Tests/TypeMapConvertorTests.cs b/Shared.EventStore.Tests/TypeMapConvertorTests.cs index 48ca628f..5c908ef1 100644 --- a/Shared.EventStore.Tests/TypeMapConvertorTests.cs +++ b/Shared.EventStore.Tests/TypeMapConvertorTests.cs @@ -41,9 +41,7 @@ public void TypeMapConvertor_Convertor_ResolvedEvent_UnknownEvent_EventDataRetur UnknownEvent domainEvent = new UnknownEvent(TestData.AggregateId, TestData.EventId, TestData.EstateName); ResolvedEvent resolvedEvent = new ResolvedEvent(TestData.CreateEventRecord(domainEvent, "TestStream", false), null, null); - Should.Throw(() => { - TypeMapConvertor.Convertor(TestData.AggregateId, resolvedEvent); - }); + Should.Throw(() => TypeMapConvertor.Convertor(TestData.AggregateId, resolvedEvent)); } } diff --git a/Shared.EventStore/Aggregate/DomainEventFactory.cs b/Shared.EventStore/Aggregate/DomainEventFactory.cs index 97253576..405c2918 100644 --- a/Shared.EventStore/Aggregate/DomainEventFactory.cs +++ b/Shared.EventStore/Aggregate/DomainEventFactory.cs @@ -25,17 +25,14 @@ public DomainEventFactory() { JsonIgnoreAttributeIgnorerContractResolver jsonIgnoreAttributeIgnorerContractResolver = new(); - JsonConvert.DefaultSettings = () => - { - return new JsonSerializerSettings - { - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - TypeNameHandling = TypeNameHandling.All, - Formatting = Formatting.Indented, - DateTimeZoneHandling = DateTimeZoneHandling.Utc, - ContractResolver = jsonIgnoreAttributeIgnorerContractResolver - }; - }; + JsonConvert.DefaultSettings = () => new JsonSerializerSettings + { + ReferenceLoopHandling = ReferenceLoopHandling.Ignore, + TypeNameHandling = TypeNameHandling.All, + Formatting = Formatting.Indented, + DateTimeZoneHandling = DateTimeZoneHandling.Utc, + ContractResolver = jsonIgnoreAttributeIgnorerContractResolver + }; } #endregion diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs index 2198e2c7..df65a316 100644 --- a/Shared.IntegrationTesting/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/BaseDockerHelper.cs @@ -739,13 +739,7 @@ await Retry.For(async () => using (HttpClientHandler httpClientHandler = new HttpClientHandler()) { - httpClientHandler.ServerCertificateCustomValidationCallback = (message, - cert, - chain, - errors) => - { - return true; - }; + httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; using (HttpClient client = new HttpClient(httpClientHandler)) { String authenticationString = $"admin:changeit"; @@ -769,13 +763,7 @@ await Retry.For(async () => using (HttpClientHandler httpClientHandler = new HttpClientHandler()) { - httpClientHandler.ServerCertificateCustomValidationCallback = (message, - cert, - chain, - errors) => - { - return true; - }; + httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; using (HttpClient client = new HttpClient(httpClientHandler)) { String authenticationString = $"admin:changeit"; diff --git a/Shared.Tests/ClientProxyBaseTests.cs b/Shared.Tests/ClientProxyBaseTests.cs index cc378f48..90607516 100644 --- a/Shared.Tests/ClientProxyBaseTests.cs +++ b/Shared.Tests/ClientProxyBaseTests.cs @@ -55,7 +55,7 @@ public async Task ClientProxyBase_HandleResponse_SuccessStatus(HttpStatusCode st HttpResponseMessage response = new HttpResponseMessage(statusCode); response.Content = new StringContent(responseContent); TestClient proxybase = new TestClient(new HttpClient()); - Should.NotThrow(async () => { await proxybase.Test_HandleResponse(response, CancellationToken.None); }); + Should.NotThrow(async () => await proxybase.Test_HandleResponse(response, CancellationToken.None)); } [Theory] @@ -228,7 +228,7 @@ private async Task TestMethod_HandleResponseX(HttpStatusCode statusCode, private async Task TestMethod_HandleResponse(HttpStatusCode statusCode, Type expectedException) { var proxybase = new TestClient(new HttpClient()); - var exception = Should.Throw(async () => { await proxybase.Test_HandleResponse(new HttpResponseMessage(statusCode), CancellationToken.None); }); + var exception = Should.Throw(async () => await proxybase.Test_HandleResponse(new HttpResponseMessage(statusCode), CancellationToken.None)); exception.ShouldBeOfType(expectedException); } diff --git a/Shared.Tests/ConfigurationReaderTests.cs b/Shared.Tests/ConfigurationReaderTests.cs index 76c13c29..8089c8ac 100644 --- a/Shared.Tests/ConfigurationReaderTests.cs +++ b/Shared.Tests/ConfigurationReaderTests.cs @@ -54,9 +54,7 @@ public void ConfigurationReader_GetValue_NotInitialised_ErrorThrown() TestOutputHelper.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff")); - Should.Throw(() => { - ConfigurationReader.GetValue("AppSettings", "TestArray"); - }); + Should.Throw(() => ConfigurationReader.GetValue("AppSettings", "TestArray")); } [Fact] @@ -65,9 +63,7 @@ public void ConfigurationReader_GetValue_SectionNotFound_ErrorThrown() IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables(); ConfigurationReader.Initialise(configurationBuilder.Build()); - Should.Throw(() => { - ConfigurationReader.GetValue("AppSettings1", "TestArray"); - }); + Should.Throw(() => ConfigurationReader.GetValue("AppSettings1", "TestArray")); } [Fact] @@ -76,9 +72,7 @@ public void ConfigurationReader_GetValue_KeyNotFound_ErrorThrown() IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables(); ConfigurationReader.Initialise(configurationBuilder.Build()); - Should.Throw(() => { - ConfigurationReader.GetValue("AppSettings", "MissingKey"); - }); + Should.Throw(() => ConfigurationReader.GetValue("AppSettings", "MissingKey")); } [Fact] @@ -118,9 +112,7 @@ public void ConfigurationReader_GetValueFromSection_NotInitialised_ErrorThrown() TestOutputHelper.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff")); IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables(); - Should.Throw(() => { - ConfigurationReader.GetValueFromSection>("AppSettings", "TestArray"); - }); + Should.Throw(() => ConfigurationReader.GetValueFromSection>("AppSettings", "TestArray")); } [Fact] @@ -130,9 +122,7 @@ public void ConfigurationReader_GetValueFromSection_SectionNotFound_ErrorThrown( IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables(); ConfigurationReader.Initialise(configurationBuilder.Build()); - Should.Throw(() => { - ConfigurationReader.GetValueFromSection>("AppSettings1", "TestArray"); - }); + Should.Throw(() => ConfigurationReader.GetValueFromSection>("AppSettings1", "TestArray")); } [Fact] @@ -142,9 +132,7 @@ public void ConfigurationReader_GetValueFromSection_KeyNotFound_ErrorThrown() IConfigurationBuilder configurationBuilder = new ConfigurationBuilder().AddInMemoryCollection(TestHelpers.DefaultAppSettings).AddEnvironmentVariables(); ConfigurationReader.Initialise(configurationBuilder.Build()); - Should.Throw(() => { - ConfigurationReader.GetValueFromSection>("AppSettings", "TestArray1"); - }); + Should.Throw(() => ConfigurationReader.GetValueFromSection>("AppSettings", "TestArray1")); } [Fact] diff --git a/Shared.Tests/ConfigurationRootExtensionsTests.cs b/Shared.Tests/ConfigurationRootExtensionsTests.cs index 3f042616..2dcba733 100644 --- a/Shared.Tests/ConfigurationRootExtensionsTests.cs +++ b/Shared.Tests/ConfigurationRootExtensionsTests.cs @@ -84,7 +84,7 @@ public void ConfigurationRootExtensions_LogConfiguration_NullAction_ErrorIsThrow Action loggerAction = null; - Should.Throw(() => { configuration.LogConfiguration(loggerAction); }); + Should.Throw(() => configuration.LogConfiguration(loggerAction)); } #endregion diff --git a/Shared.Tests/DbContextFactoryTests.cs b/Shared.Tests/DbContextFactoryTests.cs index 1cfe4ae1..00f71963 100644 --- a/Shared.Tests/DbContextFactoryTests.cs +++ b/Shared.Tests/DbContextFactoryTests.cs @@ -42,11 +42,7 @@ public async Task DbContextFactory_GetContext_EmptyIdentifer_ErrorThrown() Guid identifer = Guid.Empty; String connectionStringIdentifier = "TestDatabase"; - Func createContext = (connString) => { - var dbContextOptionsBuilder = new DbContextOptionsBuilder(); - dbContextOptionsBuilder.UseSqlServer(); - return new DbContext(dbContextOptionsBuilder.Options); - }; + Func createContext = connString => new DbContext(new DbContextOptionsBuilder().UseSqlServer().Options); Mock connectionStringConfigurationRepository = new Mock(); DbContextFactory factory = new DbContextFactory(connectionStringConfigurationRepository.Object, createContext); @@ -72,9 +68,7 @@ public async Task DbContextFactory_GetContext_InvalidConnectionStringIdentifier_ DbContextFactory factory = new DbContextFactory(connectionStringConfigurationRepository.Object, createContext); - Should.Throw(async () => { - await factory.GetContext(identifer, connectionStringIdentifier, CancellationToken.None); - }); + Should.Throw(async () => await factory.GetContext(identifer, connectionStringIdentifier, CancellationToken.None)); } } } diff --git a/Shared.Tests/HostEnvironmentExtensionsTests.cs b/Shared.Tests/HostEnvironmentExtensionsTests.cs index 888b122f..8420dc2b 100644 --- a/Shared.Tests/HostEnvironmentExtensionsTests.cs +++ b/Shared.Tests/HostEnvironmentExtensionsTests.cs @@ -32,7 +32,7 @@ public void HostEnvironmentExtensions_IsPreProduction_CorrectValueReturned(Strin public void HostEnvironmentExtensions_IsPreProduction_IHostEnvironment_ArgumentNullExceptionThrown() { IHostEnvironment hostEnvironment = null; - Should.Throw(() => { hostEnvironment.IsPreProduction(); }); + Should.Throw(() => hostEnvironment.IsPreProduction()); } } diff --git a/Shared.Tests/PolicyFactoryTests.cs b/Shared.Tests/PolicyFactoryTests.cs index 56cbbb9d..382efeaa 100644 --- a/Shared.Tests/PolicyFactoryTests.cs +++ b/Shared.Tests/PolicyFactoryTests.cs @@ -222,7 +222,7 @@ Task Action() } // Act - Should.Throw(async () => { await PolicyFactory.ExecuteWithPolicyAsync(Action, policy, "TestPolicy"); }); + Should.Throw(async () => await PolicyFactory.ExecuteWithPolicyAsync(Action, policy, "TestPolicy")); // Assert executionCount.ShouldBe(1); diff --git a/Shared.Tests/PositiveMoneyTests.cs b/Shared.Tests/PositiveMoneyTests.cs index 0a4c6083..ae657881 100644 --- a/Shared.Tests/PositiveMoneyTests.cs +++ b/Shared.Tests/PositiveMoneyTests.cs @@ -24,9 +24,6 @@ public void PositiveMoney_CanBeCreated_IsCreated(Decimal moneyValue) [InlineData(-1)] public void PositiveMoney_NonPositiveAmountRejected_ErrorThrown(Decimal moneyValue) { - Should.Throw(() => - { - PositiveMoney.Create(Money.Create(moneyValue)); - }); + Should.Throw(() => PositiveMoney.Create(Money.Create(moneyValue))); } } \ No newline at end of file From 9ff3351dde4473ff3f5b2e0b9444547d2e770ac0 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 19 Sep 2025 14:34:10 +0100 Subject: [PATCH 2/4] :| --- Shared.Tests/ConfigurationRootExtensionsTests.cs | 2 +- Shared/Extensions/HealthChecksBuilderExtensions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shared.Tests/ConfigurationRootExtensionsTests.cs b/Shared.Tests/ConfigurationRootExtensionsTests.cs index 732c1e7a..b9e3b624 100644 --- a/Shared.Tests/ConfigurationRootExtensionsTests.cs +++ b/Shared.Tests/ConfigurationRootExtensionsTests.cs @@ -59,7 +59,7 @@ private string[] FilterLogEntries(TestLogger testLogger) { [Fact] public void ConfigurationRootExtensions_LogConfiguration_NoConfiguration_NoConfigurationIsLogged() { - IConfigurationBuilder builder = new(); + IConfigurationBuilder builder = new ConfigurationBuilder(); IConfigurationRoot configuration = builder.Build(); diff --git a/Shared/Extensions/HealthChecksBuilderExtensions.cs b/Shared/Extensions/HealthChecksBuilderExtensions.cs index fbf335a1..35deabc1 100644 --- a/Shared/Extensions/HealthChecksBuilderExtensions.cs +++ b/Shared/Extensions/HealthChecksBuilderExtensions.cs @@ -41,7 +41,7 @@ public static IHealthChecksBuilder AddMessagingService(this IHealthChecksBuilder public static IHealthChecksBuilder AddSecurityService(this IHealthChecksBuilder builder, Func customHttpHandler = null) { - Uri uri = new($"{ConfigurationReader.GetValue(\"SecurityConfiguration\", \"Authority\")}/health"); + Uri uri = new($"{ConfigurationReader.GetValue("SecurityConfiguration", "Authority")}/health"); return builder.AddUrlGroup(uri, HttpMethod.Get, "Security Service", From b4c64f9f1e40cc30008c91d556dc267a7243b874 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 19 Sep 2025 16:22:26 +0100 Subject: [PATCH 3/4] update es certs --- .../ApplicationBuilderExtensionsTests.cs | 1 - .../certs/ca/ca.crt | 42 ++++++++-------- .../certs/ca/ca.key | 50 +++++++++---------- .../certs/node1/node.crt | 41 ++++++++------- .../certs/node1/node.key | 50 +++++++++---------- Shared.IntegrationTesting/BaseDockerHelper.cs | 46 +++++++---------- 6 files changed, 110 insertions(+), 120 deletions(-) diff --git a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs index adef7434..46df2160 100644 --- a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs +++ b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs @@ -241,7 +241,6 @@ public void ApplicationBuilderExtensions_ConfigureSubscriptions_MainOnlyWorkers_ Dictionary eventHandlerResolvers = new(); eventHandlerResolvers.Add("Main", deh.Object); Action traceHandler = (et, type, msg) => { TestOutputHelper.WriteLine(msg); }; - Func subscriptionRepositoryResolver = (s, i) => subscriptionRepository.Object; var result = IApplicationBuilderExtenstions.ConfigureSubscriptions(subscriptionRepository.Object, config, eventStoreConnectionString, eventHandlerResolvers, traceHandler); result.Count.ShouldBe(2); diff --git a/Shared.EventStoreContext.Tests/certs/ca/ca.crt b/Shared.EventStoreContext.Tests/certs/ca/ca.crt index 4deec5d6..eb94ce6b 100644 --- a/Shared.EventStoreContext.Tests/certs/ca/ca.crt +++ b/Shared.EventStoreContext.Tests/certs/ca/ca.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDzTCCArWgAwIBAgIRAL7M+jrAdPBwka8WZbzqyUYwDQYJKoZIhvcNAQELBQAw -YjELMAkGA1UEBhMCVUsxGDAWBgNVBAoTD0V2ZW50IFN0b3JlIEx0ZDE5MDcGA1UE -AxMwRXZlbnRTdG9yZURCIENBIGJlY2NmYTNhYzA3NGYwNzA5MWFmMTY2NWJjZWFj -OTQ2MB4XDTI0MDgxNzE5MTQwOFoXDTI5MDgxNzE5MTQwOFowYjELMAkGA1UEBhMC -VUsxGDAWBgNVBAoTD0V2ZW50IFN0b3JlIEx0ZDE5MDcGA1UEAxMwRXZlbnRTdG9y -ZURCIENBIGJlY2NmYTNhYzA3NGYwNzA5MWFmMTY2NWJjZWFjOTQ2MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtCALdAfbnrRo2XEO/nh0qF7Yed6oKANB -v0zuFnESFxZKNrizSgTcJteT0c5HLQ3mK25yHbeW2FargJH6nWa//FkYqG8KuWNi -e8BVQ8pugC8xkVDWT9zMcL/mbN+YqJdFFoarJpAogPcLMZdPwxRaMEEwpWg9CYD8 -+aw+DWhb6APwe+iCrGedA8AMYTo7bJCtHfyitOLMRai2sdzVmZqdQ+8R4wM1k1NK -nuounB0uh5mqz/as7d2S2NvwV3cqckI1O7EtaSLs55vTfBdAMpYvnfXGRUty7OK0 -fvbBmKPdSLX7+12JMqTK3nEgW+gBk8xJM5KeNHqBcT5O4++rDd5iwQIDAQABo34w -fDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjApBgNVHQ4EIgQg -fB4qsK1GHOQNebmVi5o5PcZkJb9LuZzgPbEUapMjuAswKwYDVR0jBCQwIoAgfB4q -sK1GHOQNebmVi5o5PcZkJb9LuZzgPbEUapMjuAswDQYJKoZIhvcNAQELBQADggEB -ACZ43iQ+hCiFBJjkdlGkkihrGDNTPZNe9CGSHfSbhrK7QYpttQmhRJuvFgV0EJVh -RnfsUbhiRPpjcU6ATZS43Yl/5OC/vLz++U3Z25TgkSbp8j4v0gcODPJHhDtDGo3g -OMG6Kh0pVJ8doljbfoJYvDRGx7CmWNF2thbQG3bAAtx6e7Wuod7qzfC9Zfs1XgNn -G7tafKsUEHdFeiaDFuB3secT0clgV2i3BNQvXCJFsqX56bjiwBBeTuQhVvr0Ti+p -VNpwatRVFnEEdz9Pzz+Ui1r6PV7lInaWhZPNwTTT0gkkGL4NLMX8x92YmB9QgM4B -Bs4c/rTt174WZ/TaWaHK29g= +MIIDzDCCArSgAwIBAgIQNBIlGaOMMZdKpHEAY1kQ0zANBgkqhkiG9w0BAQsFADBi +MQswCQYDVQQGEwJVSzEYMBYGA1UEChMPRXZlbnQgU3RvcmUgTHRkMTkwNwYDVQQD +EzBFdmVudFN0b3JlREIgQ0EgMzQxMjI1MTlhMzhjMzE5NzRhYTQ3MTAwNjM1OTEw +ZDMwHhcNMjUwOTE5MTUxNzE5WhcNMzAwOTE5MTUxNzE5WjBiMQswCQYDVQQGEwJV +SzEYMBYGA1UEChMPRXZlbnQgU3RvcmUgTHRkMTkwNwYDVQQDEzBFdmVudFN0b3Jl +REIgQ0EgMzQxMjI1MTlhMzhjMzE5NzRhYTQ3MTAwNjM1OTEwZDMwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz7utkIVaXFkE/tFyIW+Cg1cBOSWROi/+t +CHyVBrmr3LDx7HMEkEniZUDleHXRn+XzsIjuYlqyDkQIL1FdIv6r+gRkV3Ul9xV4 +7h+VzfQtxI6IAil0zIcdOhwxmJCxhc+G9CAqW+v+8y2DXwsCjN8N+4a0vpXN4j0g +W9LUI3h1AdIx8q7T7MZ1ftMg9GTwuJVTqp8dwIRkirUXEn3C+nK1cSp1UW5ZgCry +MTy2nDD9lAz7yl8pYqlx+ON8dEwc2we4FoVlgZQ2UGi0jrNttA5z6VfcyZdkzFsa +on3SZfDhioJ6CVHv7FQrF1TQNCTZKBtRNvbTn2Rw7TXnLh7gYr1/AgMBAAGjfjB8 +MA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMCkGA1UdDgQiBCDw +2q7J8CGkVxuNkZuWNVLbRoWOJWbknP6WHfQev/fbRTArBgNVHSMEJDAigCDw2q7J +8CGkVxuNkZuWNVLbRoWOJWbknP6WHfQev/fbRTANBgkqhkiG9w0BAQsFAAOCAQEA +TIIvAcfPTyOTACi7nmAnQDTsBvjKQgOlqK7FzHGwxTLAi273RyUpGlO+LShvya7L +nx1ZyeIwdkCXv6c/V+/8hlDXyiUHEUJh6X/jy1hZ5XahQqAhPHqLZEnwSXLAv9cl +cQocWby+cHnoAffK56//FWd2Re2MJHDt0x4gVLC27mlP6JiPv8+ywZcIW32fL8va +joGpf3WmmNmdstUbtZ8SQBrcA30x86SywE2RKxT3eL/VqX2FMNrU+c2FethQWgJk +SH94t8c320A38nm6hmdUjXNBnSkXcffMJ8IZYyRg644OZiMddes9zfyETdr4Ac+7 +hlqszE92DbhAT+cHZl6EkA== -----END CERTIFICATE----- diff --git a/Shared.EventStoreContext.Tests/certs/ca/ca.key b/Shared.EventStoreContext.Tests/certs/ca/ca.key index 4f41b6cc..5b908982 100644 --- a/Shared.EventStoreContext.Tests/certs/ca/ca.key +++ b/Shared.EventStoreContext.Tests/certs/ca/ca.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/Shared.EventStoreContext.Tests/certs/node1/node.crt b/Shared.EventStoreContext.Tests/certs/node1/node.crt index 1c7cbb56..4f8fb0e7 100644 --- a/Shared.EventStoreContext.Tests/certs/node1/node.crt +++ b/Shared.EventStoreContext.Tests/certs/node1/node.crt @@ -1,23 +1,22 @@ -----BEGIN CERTIFICATE----- -MIID1TCCAr2gAwIBAgIQJwvipCAKBPimGlFaFWru/jANBgkqhkiG9w0BAQsFADBi -MQswCQYDVQQGEwJVSzEYMBYGA1UEChMPRXZlbnQgU3RvcmUgTHRkMTkwNwYDVQQD -EzBFdmVudFN0b3JlREIgQ0EgYmVjY2ZhM2FjMDc0ZjA3MDkxYWYxNjY1YmNlYWM5 -NDYwHhcNMjQwODE3MTkxNjA2WhcNMjUwODE3MTkxNjA2WjAcMRowGAYDVQQDExFl -dmVudHN0b3JlZGItbm9kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -APCnv6FtdZvVb3gQKANjOCLQJid7hmwKwRgvjJlywyLDm4C41vvl0fHo/KVlAV+f -dl0chMMjwc15WnVVXK02G34nTchmR4djldEOAXuCECL2dc5hO/XPS53Zjt7Z9D86 -Iy3KrtXkIyCVHBy7IO9iDZfWFn5ka+vmiEBkqDnXKZRLpOpUgkrhjUuA7Lf1rkzH -yjKvcXRnOgkF6nojjbl3TgPAZdEC/kjsDSpKnUsbQh24X2+AWfejITQbleXc5Abg -67SdtlPf98miHo9RsTAe57vaJiM3VEtyCc4FURmJM4c1kxhqiQT4YsWK6xXu+UP1 -SVVpktqKGiXSdXkFSr550p8CAwEAAaOBzDCByTAOBgNVHQ8BAf8EBAMCBaAwHQYD -VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKQYDVR0O -BCIEILISZ2MRs1eN27ulxLjnw+K6LpKxnc1rEy4TquylAl9dMCsGA1UdIwQkMCKA -IHweKrCtRhzkDXm5lYuaOT3GZCW/S7mc4D2xFGqTI7gLMDIGA1UdEQQrMCmCCWxv -Y2FsaG9zdIIQbm9kZTEuZXZlbnRzdG9yZYcEfwAAAYcErBTwATANBgkqhkiG9w0B -AQsFAAOCAQEAUZ3scucPfQ/R7ir+Wo4rVKWyH8NlH1dQg2oqbETnhtznn/IV19qD -QFT3NqO6tVWFQDaSJBL39/Aw/x/6abINxIR7lP3OCTv9ClO5mr6QA0zxZZHrzkDU -9XvQoubGmEwjcIr5vAWh+iBJZlyBPfwtvx1UjjJxOTY8z6xGUbQmXHsSdAm+q5iX -NVLoRr/cEH1sAD9lrATd+F8gGNkOKQTTuZzP9i04Rn9VOA9AShIz5d5GpUkLa9Ar -dvUzj2WUJocO61IlEWuqepHWo5ksmHCHCEC+uTFCliH1PcAV1utX/VRrPfkzpDyB -z/DIGOijfYLKWlHAGYbIc45TwIjqK5TJMg== +MIIDszCCApugAwIBAgIRAOrPt1Qkstbxzp6xBxxstdowDQYJKoZIhvcNAQELBQAw +YjELMAkGA1UEBhMCVUsxGDAWBgNVBAoTD0V2ZW50IFN0b3JlIEx0ZDE5MDcGA1UE +AxMwRXZlbnRTdG9yZURCIENBIDM0MTIyNTE5YTM4YzMxOTc0YWE0NzEwMDYzNTkx +MGQzMB4XDTI1MDkxOTE1MTc1MVoXDTI4MDMwNzE2MTc1MVowHDEaMBgGA1UEAxMR +ZXZlbnRzdG9yZWRiLW5vZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDhT760BJZKuz1WMHz9DpBWP6rkvBTnFCwd8af/pBJCjZqVZEi5j8VGzxH6B49W +xrlvZqZhO8zst6dCBcFlG8zsbVJFRp+PMh23/e9pcrmLQJb2u++Oc8L4LN9TpkAp +2VjtO7gddY4awvzLvpEGzsa0Aok7SvZ7RHK716IoyQmu6h2q+FcviwulY6cjhDY6 +GDZCvlyQX8tuTzZ6ck1/YzjhwPQIGL063T9Y8+cEUDBp1KHlGF53b/8AOodfWPMS +SJ35ZD5hA2Q5N29Ggj60FafT1Pgdfqw64JQrpu5MxvF7edKjlFin4Rr57Frsij44 +L+lzszQcs5ToDcJ5GKUuwY9zAgMBAAGjgakwgaYwDgYDVR0PAQH/BAQDAgWgMB0G +A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCkGA1Ud +DgQiBCCJ2HV0ggJ9c+SR/fv2St2j8gab3nvPelM7xifWUwFl5zArBgNVHSMEJDAi +gCDw2q7J8CGkVxuNkZuWNVLbRoWOJWbknP6WHfQev/fbRTAPBgNVHREECDAGhwR/ +AAABMA0GCSqGSIb3DQEBCwUAA4IBAQBhDsQxGcuBdt3xfJdha6flW5IkXG2kkrTs +/Ns2hDs3xtj6/J3FxtpEfRK8NB9hbr9TXnLTWbBmDVWY5cVtp2nLa8nLfJMSNTrA +AvDA2DRuG9F88TnkewfbPe+qpJv6ghOt+ku3aWqDJ10TfbcjWiAZay99LyyzqdPR +O1AdK5ZA8DC7fYpw8nOVBHwAOOP9Az4XC0m+thEVfV/9bPg4ZNH/l9WcKSE01I25 +B7WZmSc04yMZFpwBs7vrB+8T6m33uxVohFkclsRCrAUT052nfo2tz1yMoAyvZ6Ia +K1k4Sw5wJrzNHYPr8N/jHHgcQI8bVoISZrH6i/Jew6W7L+q/zJBV -----END CERTIFICATE----- diff --git a/Shared.EventStoreContext.Tests/certs/node1/node.key b/Shared.EventStoreContext.Tests/certs/node1/node.key index 75ed98c1..8b97bd47 100644 --- a/Shared.EventStoreContext.Tests/certs/node1/node.key +++ b/Shared.EventStoreContext.Tests/certs/node1/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs index e31e4b66..ffd2650d 100644 --- a/Shared.IntegrationTesting/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/BaseDockerHelper.cs @@ -737,19 +737,15 @@ await Retry.For(async () => { String url = $"{scheme}://127.0.0.1:{this.EventStoreHttpPort}/ping"; - using (HttpClientHandler httpClientHandler = new()) - { - httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; - using (HttpClient client = new(httpClientHandler)) - { - String authenticationString = $"admin:changeit"; - String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString); - - HttpResponseMessage pingResponse = await client.GetAsync(url).ConfigureAwait(false); - pingResponse.StatusCode.ShouldBe(HttpStatusCode.OK); - } - } + using HttpClientHandler httpClientHandler = new(); + httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; + using HttpClient client = new(httpClientHandler); + String authenticationString = $"admin:changeit"; + String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString); + + HttpResponseMessage pingResponse = await client.GetAsync(url).ConfigureAwait(false); + pingResponse.StatusCode.ShouldBe(HttpStatusCode.OK); }, TimeSpan.FromSeconds(300), @@ -761,23 +757,19 @@ await Retry.For(async () => { String url = $"{scheme}://127.0.0.1:{this.EventStoreHttpPort}/info"; - using (HttpClientHandler httpClientHandler = new()) - { - httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; - using (HttpClient client = new(httpClientHandler)) - { - String authenticationString = $"admin:changeit"; - String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString); + using HttpClientHandler httpClientHandler = new(); + httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; + using HttpClient client = new(httpClientHandler); + String authenticationString = $"admin:changeit"; + String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString); - HttpResponseMessage infoResponse = await client.GetAsync(url).ConfigureAwait(false); + HttpResponseMessage infoResponse = await client.GetAsync(url).ConfigureAwait(false); - infoResponse.StatusCode.ShouldBe(HttpStatusCode.OK); - String infoData = await infoResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + infoResponse.StatusCode.ShouldBe(HttpStatusCode.OK); + String infoData = await infoResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - this.Trace(infoData); - } - } + this.Trace(infoData); }); } From be0bf612955ca3af10424f71c2a011991ac28874 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 16:29:37 +0000 Subject: [PATCH 4/4] refactor: remove unnecessary string interpolation This PR cleans up the code by replacing unused string interpolations with standard string literals in authentication assignments. - Empty interpolated string: The code previously used `$"admin:changeit"` which applies interpolation to a literal without any placeholders. This change replaces the interpolated string with a normal string literal (`"admin:changeit"`) in two occurrences, improving readability and avoiding unnecessary syntax. > This Autofix was generated by AI. Please review the change before merging. --- Shared.IntegrationTesting/BaseDockerHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs index ffd2650d..d24a1ed9 100644 --- a/Shared.IntegrationTesting/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/BaseDockerHelper.cs @@ -740,7 +740,7 @@ await Retry.For(async () => using HttpClientHandler httpClientHandler = new(); httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; using HttpClient client = new(httpClientHandler); - String authenticationString = $"admin:changeit"; + String authenticationString = "admin:changeit"; String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString); @@ -760,7 +760,7 @@ await Retry.For(async () => using HttpClientHandler httpClientHandler = new(); httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true; using HttpClient client = new(httpClientHandler); - String authenticationString = $"admin:changeit"; + String authenticationString = "admin:changeit"; String base64EncodedAuthenticationString = Convert.ToBase64String(Encoding.UTF8.GetBytes(authenticationString)); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", base64EncodedAuthenticationString);