chore(cli): Replace BouncyCastle with built-in libs

dh2i-devs · May 8, 2024 · 3bb58fb · 3bb58fb
1 parent ce7a7b5
commit 3bb58fb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 166 deletions.
diff --git a/src/KubeOps.Cli/Certificates/CertificateGenerator.cs b/src/KubeOps.Cli/Certificates/CertificateGenerator.cs
diff --git a/src/KubeOps.Cli/Certificates/Extensions.cs b/src/KubeOps.Cli/Certificates/Extensions.cs
diff --git a/src/KubeOps.Cli/Generators/CertificateGenerator.cs b/src/KubeOps.Cli/Generators/CertificateGenerator.cs
@@ -1,23 +1,17 @@
-using KubeOps.Cli.Certificates;
 using KubeOps.Cli.Output;
+using KubeOps.Operator.Web.Certificates;
 
 namespace KubeOps.Cli.Generators;
 
 internal class CertificateGenerator(string serverName, string namespaceName) : IConfigGenerator
 {
     public void Generate(ResultOutput output)
     {
-        var (caCert, caKey) = Certificates.CertificateGenerator.CreateCaCertificate();
+        using Operator.Web.CertificateGenerator generator = new(serverName, namespaceName);
 
-        output.Add("ca.pem", caCert.ToPem(), OutputFormat.Plain);
-        output.Add("ca-key.pem", caKey.ToPem(), OutputFormat.Plain);
-
-        var (srvCert, srvKey) = Certificates.CertificateGenerator.CreateServerCertificate(
-            (caCert, caKey),
-            serverName,
-            namespaceName);
-
-        output.Add("svc.pem", srvCert.ToPem(), OutputFormat.Plain);
-        output.Add("svc-key.pem", srvKey.ToPem(), OutputFormat.Plain);
+        output.Add("ca.pem", generator.Root.Certificate.EncodeToPem(), OutputFormat.Plain);
+        output.Add("ca-key.pem", generator.Root.Key.EncodeToPem(), OutputFormat.Plain);
+        output.Add("svc.pem", generator.Server.Certificate.EncodeToPem(), OutputFormat.Plain);
+        output.Add("svc-key.pem", generator.Server.Key.EncodeToPem(), OutputFormat.Plain);
     }
 }
diff --git a/src/KubeOps.Cli/KubeOps.Cli.csproj b/src/KubeOps.Cli/KubeOps.Cli.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -18,7 +18,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
         <PackageReference Include="Microsoft.Build.Locator" Version="1.7.1" />
         <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
         <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
@@ -34,7 +33,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\KubeOps.Abstractions\KubeOps.Abstractions.csproj"/>
+        <ProjectReference Include="..\KubeOps.Abstractions\KubeOps.Abstractions.csproj" />
         <ProjectReference Include="..\KubeOps.Operator.Web\KubeOps.Operator.Web.csproj" />
         <ProjectReference Include="..\KubeOps.Transpiler\KubeOps.Transpiler.csproj" />
     </ItemGroup>