refactor(kafka): use GetCertPath from helper

sitkoru · Jun 19, 2024 · 71d73ae · 71d73ae
1 parent 47acf3b
commit 71d73ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/Sitko.Core.Kafka/KafkaConfigurator.cs b/src/Sitko.Core.Kafka/KafkaConfigurator.cs
@@ -2,6 +2,7 @@
 using KafkaFlow;
 using KafkaFlow.Configuration;
 using KafkaFlow.Consumers.DistributionStrategies;
+using Sitko.Core.App.Helpers;
 using SecurityProtocol = KafkaFlow.Configuration.SecurityProtocol;
 
 namespace Sitko.Core.Kafka;
@@ -69,7 +70,7 @@ public void Build(IKafkaConfigurationBuilder builder, KafkaModuleOptions options
                             information.SecurityProtocol = options.SecurityProtocol;
                             if (information.SecurityProtocol == SecurityProtocol.SaslSsl)
                             {
-                                information.SslCaLocation = options.GetSaslCertPath();
+                                information.SslCaLocation = CertHelper.GetCertPath(options.SaslCertBase64);
                             }
                         });
                 }

diff --git a/src/Sitko.Core.Kafka/KafkaConsumerOffsetsEnsurer.cs b/src/Sitko.Core.Kafka/KafkaConsumerOffsetsEnsurer.cs
@@ -1,6 +1,7 @@
 using Confluent.Kafka;
 using Confluent.Kafka.Admin;
 using Microsoft.Extensions.Logging;
+using Sitko.Core.App.Helpers;
 
 namespace Sitko.Core.Kafka;
 
@@ -93,7 +94,7 @@ await adminClient.CreateTopicsAsync(new[]
                 consumerConfig.SecurityProtocol = (SecurityProtocol?)options.SecurityProtocol;
                 if (consumerConfig.SecurityProtocol == SecurityProtocol.SaslSsl)
                 {
-                    consumerConfig.SslCaLocation = options.GetSaslCertPath();
+                    consumerConfig.SslCaLocation = CertHelper.GetCertPath(options.SaslCertBase64);
                 }
             }
             var cts = new CancellationTokenSource();
@@ -160,7 +161,7 @@ private IAdminClient GetAdminClient(KafkaModuleOptions options)
             adminClientConfig.SecurityProtocol = (SecurityProtocol?)options.SecurityProtocol;
             if (adminClientConfig.SecurityProtocol == SecurityProtocol.SaslSsl)
             {
-                adminClientConfig.SslCaLocation = options.GetSaslCertPath();
+                adminClientConfig.SslCaLocation = CertHelper.GetCertPath(options.SaslCertBase64);
             }
         }
 

diff --git a/src/Sitko.Core.Kafka/KafkaModule.cs b/src/Sitko.Core.Kafka/KafkaModule.cs
@@ -70,14 +70,6 @@ public class KafkaModuleOptions : BaseModuleOptions
     public bool EnableIdempotence { get; set; } = true;
     public bool SocketNagleDisable { get; set; } = true;
     public Acks Acks { get; set; } = Acks.All;
-
-    public string GetSaslCertPath()
-    {
-        var cert = Convert.FromBase64String(SaslCertBase64);
-        var path = Path.GetTempFileName();
-        File.WriteAllBytes(path, cert);
-        return path;
-    }
 }
 
 public class KafkaModuleOptionsValidator : AbstractValidator<KafkaModuleOptions>