v1.0.1: synchronous certificate pickup (Sectigo parity)

CERTInext.IntegrationTests/CloudflareDomainValidator.cs

@@ -23,7 +23,7 @@ namespace Keyfactor.Extensions.CAPlugin.CERTInext.IntegrationTests
     /// Credentials are read from the <see cref="IntegrationTestFixture"/>:
     /// <c>CERTINEXT_CF_API_TOKEN</c> and <c>CERTINEXT_CF_ZONE_ID</c>.
     /// </summary>
-    internal sealed class CloudflareDomainValidator : IDomainValidator
+    internal sealed class CloudflareDomainValidator : IDomainValidator, IDisposable
     {
         private const string CfApiBase = "https://api.cloudflare.com/client/v4";
 
@@ -113,17 +113,21 @@ public async Task<DomainValidationResult> CleanupValidation(string key, Cancella
         public Task ValidateConfiguration(Dictionary<string, object> configuration) => Task.CompletedTask;
         public Dictionary<string, Keyfactor.AnyGateway.Extensions.PropertyConfigInfo> GetDomainValidatorAnnotations() => new();
         public string GetValidationType() => "dns-01";
+
+        public void Dispose() => _http.Dispose();
     }
 
-    internal sealed class CloudflareDomainValidatorFactory : IDomainValidatorFactory
+    internal sealed class CloudflareDomainValidatorFactory : IDomainValidatorFactory, IDisposable
     {
-        private readonly IDomainValidator _validator;
+        private readonly CloudflareDomainValidator _validator;
 
         public CloudflareDomainValidatorFactory(string apiToken, string zoneId)
         {
             _validator = new CloudflareDomainValidator(apiToken, zoneId);
         }
 
         public IDomainValidator ResolveDomainValidator(string domain, string validationType) => _validator;
+
+        public void Dispose() => _validator.Dispose();
     }
 }

CERTInext.IntegrationTests/DcvLifecycleTests.cs

@@ -40,17 +40,25 @@ namespace Keyfactor.Extensions.CAPlugin.CERTInext.IntegrationTests
     /// CERTINEXT_DCV_DOMAIN=<subdomain to use, e.g. dcv-test.example.com>
     /// </code>
     /// </summary>
-    public class DcvLifecycleTests : IClassFixture<IntegrationTestFixture>
+    public class DcvLifecycleTests : IClassFixture<IntegrationTestFixture>, IDisposable
     {
         private readonly IntegrationTestFixture _fixture;
         private readonly ITestOutputHelper _output;
+        private readonly List<IDisposable> _toDispose = new List<IDisposable>();
 
         public DcvLifecycleTests(IntegrationTestFixture fixture, ITestOutputHelper output)
         {
             _fixture = fixture;
             _output = output;
         }
 
+        public void Dispose()
+        {
+            foreach (var d in _toDispose)
+                d.Dispose();
+            _toDispose.Clear();
+        }
+
         // ---------------------------------------------------------------------------
         // Helpers
         // ---------------------------------------------------------------------------
@@ -69,11 +77,17 @@ private static string GenerateCsrPem(string commonName)
                 + "\n-----END CERTIFICATE REQUEST-----";
         }
 
-        private IDomainValidatorFactory BuildDnsFactory() =>
-            _fixture.IsCloudflareConfigured
-                ? (IDomainValidatorFactory)new CloudflareDomainValidatorFactory(
-                    _fixture.CloudflareApiToken, _fixture.CloudflareZoneId)
-                : new StubDomainValidatorFactory();
+        private IDomainValidatorFactory BuildDnsFactory()
+        {
+            if (_fixture.IsCloudflareConfigured)
+            {
+                var factory = new CloudflareDomainValidatorFactory(
+                    _fixture.CloudflareApiToken, _fixture.CloudflareZoneId);
+                _toDispose.Add(factory);
+                return factory;
+            }
+            return new StubDomainValidatorFactory();
+        }
 
         /// <summary>
         /// Runs <c>plugin.Synchronize</c> and returns every record that came out of the