chore: use arcus testing (#292)

stijnmoreels · web-flow · commit 96babaf06f0f · 2023-01-17T10:39:21.000+01:00
* chore: use arcus testing

* pr-fix: use v0.5 of arcus testing

* pr-fix: update w/ guard v2
diff --git a/src/Arcus.EventGrid.Tests.Core/Arcus.EventGrid.Tests.Core.csproj b/src/Arcus.EventGrid.Tests.Core/Arcus.EventGrid.Tests.Core.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Security.Core" Version="1.9.0" />
+    <PackageReference Include="Guard.Net" Version="2.0.0" />
     <PackageReference Include="xunit.assert" Version="2.4.0" />
     <PackageReference Include="Azure.Messaging.EventGrid" Version="4.11.0" />
   </ItemGroup>
diff --git a/src/Arcus.EventGrid.Tests.Core/Security/StaticInMemorySecretProvider.cs b/src/Arcus.EventGrid.Tests.Core/Security/StaticInMemorySecretProvider.cs
diff --git a/src/Arcus.EventGrid.Tests.Integration/Arcus.EventGrid.Tests.Integration.csproj b/src/Arcus.EventGrid.Tests.Integration/Arcus.EventGrid.Tests.Integration.csproj
@@ -7,8 +7,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Arcus.Testing.Logging" Version="0.3.0" />
-    <PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.3.0" />
+    <PackageReference Include="Arcus.Testing.Logging" Version="0.5.0" />
+    <PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.5.0" />
     <PackageReference Include="Bogus" Version="29.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
diff --git a/src/Arcus.EventGrid.Tests.Integration/Publishing/EventGridPublisherClientWithTrackingResilienceTests.cs b/src/Arcus.EventGrid.Tests.Integration/Publishing/EventGridPublisherClientWithTrackingResilienceTests.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Threading.Tasks;
 using Arcus.EventGrid.Tests.Core.Events.Data;
-using Arcus.EventGrid.Tests.Core.Security;
 using Arcus.EventGrid.Tests.Integration.Publishing.Fixture;
 using Arcus.Observability.Correlation;
 using Azure;
@@ -10,6 +9,7 @@
 using Bogus;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Xunit;
 
 namespace Arcus.EventGrid.Tests.Integration.Publishing
@@ -29,7 +29,7 @@ public async Task SendToTopicEndpoint_WithExponentialRetry_TriesSeveralTimes()
                 var authenticationKeySecretName = "My-Auth-Key";
                 var retryCount = BogusGenerator.Random.Int(min: 1, max: 3);
                 var services = new ServiceCollection();
-                services.AddSecretStore(stores => stores.AddProvider(new StaticInMemorySecretProvider(authenticationKeySecretName, "some super secret auth key")));
+                services.AddSecretStore(stores => stores.AddInMemory(authenticationKeySecretName, "some super secret auth key"));
                 services.AddCorrelation();
                 services.AddAzureClients(clients =>
                 {
@@ -81,7 +81,7 @@ public async Task SendToTopicEndpoint_WithCircuitBreaker_TriesSeveralTimes()
                 var authenticationKeySecretName = "My-Auth-Key";
                 var exceptionsAllowedBeforeBreaking = BogusGenerator.Random.Int(min: 1, max: 3);
                 var services = new ServiceCollection();
-                services.AddSecretStore(stores => stores.AddProvider(new StaticInMemorySecretProvider(authenticationKeySecretName, "some super secret auth key")));
+                services.AddSecretStore(stores => stores.AddInMemory(authenticationKeySecretName, "some super secret auth key"));
                 services.AddCorrelation();
                 services.AddAzureClients(clients =>
                 {
@@ -115,7 +115,7 @@ public async Task SendToTopicEndpoint_WithExponentialRetryWithCircuitBreaker_Tri
                 var retryCount = BogusGenerator.Random.Int(min: 1, max: 3);
                 var exceptionsAllowedBeforeBreaking = BogusGenerator.Random.Int(min: 1, max: 3);
                 var services = new ServiceCollection();
-                services.AddSecretStore(stores => stores.AddProvider(new StaticInMemorySecretProvider(authenticationKeySecretName, "some super secret auth key")));
+                services.AddSecretStore(stores => stores.AddInMemory(authenticationKeySecretName, "some super secret auth key"));
                 services.AddCorrelation();
                 services.AddAzureClients(clients =>
                 {
diff --git a/src/Arcus.EventGrid.Tests.Integration/Publishing/EventGridPublisherClientWithTrackingTests.cs b/src/Arcus.EventGrid.Tests.Integration/Publishing/EventGridPublisherClientWithTrackingTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Arcus.EventGrid.Contracts;
 using Arcus.EventGrid.Core;
-using Arcus.EventGrid.Tests.Core.Security;
 using Arcus.EventGrid.Tests.Integration.Fixture;
 using Arcus.EventGrid.Tests.Integration.Publishing.Fixture;
 using Arcus.Observability.Correlation;
@@ -15,6 +14,7 @@
 using Bogus;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
@@ -238,7 +238,7 @@ protected EventGridPublisherClient CreateRegisteredClient(
             string authenticationKey = Configuration.GetEventGridEndpointKey(_eventSchema);
             string authenticationKeySecretName = "Arcus_EventGrid_AuthenticationKey";
             
-            services.AddSecretStore(stores => stores.AddProvider(new StaticInMemorySecretProvider(authenticationKeySecretName, authenticationKey)));
+            services.AddSecretStore(stores => stores.AddInMemory(authenticationKeySecretName, authenticationKey));
             services.AddAzureClients(clients => registration(clients, topicEndpoint, authenticationKeySecretName));
 
             IServiceProvider provider = services.BuildServiceProvider();
diff --git a/src/Arcus.EventGrid.Tests.Unit/Arcus.EventGrid.Tests.Unit.csproj b/src/Arcus.EventGrid.Tests.Unit/Arcus.EventGrid.Tests.Unit.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.3.0" />
+    <PackageReference Include="Arcus.Testing.Security.Providers.InMemory" Version="0.5.0" />
     <PackageReference Include="Bogus" Version="29.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
diff --git a/src/Arcus.EventGrid.Tests.Unit/Publishing/AzureClientFactoryBuilderExtensionsTests.cs b/src/Arcus.EventGrid.Tests.Unit/Publishing/AzureClientFactoryBuilderExtensionsTests.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Arcus.EventGrid.Tests.Core.Security;
 using Arcus.EventGrid.Tests.Unit.Publishing.Fixtures;
 using Azure.Messaging.EventGrid;
 using Microsoft.Extensions.Azure;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using Arcus.EventGrid.Tests.Core.Security;`
`3`	`2`	`using Arcus.EventGrid.Tests.Unit.Publishing.Fixtures;`
`4`	`3`	`using Azure.Messaging.EventGrid;`
`5`	`4`	`using Microsoft.Extensions.Azure;`