Fixed new certificate issue error (#797)

shibayan · Jan 3, 2025 · eaec7d5 · eaec7d5
1 parent 6e06532
commit eaec7d5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/KeyVault.Acmebot/Functions/SharedActivity.cs b/KeyVault.Acmebot/Functions/SharedActivity.cs
@@ -386,14 +386,9 @@ public async Task<OrderDetails> FinalizeOrder([ActivityTrigger] (CertificatePoli
         try
         {
             var certificatePolicy = certificatePolicyItem.ToCertificatePolicy();
+            var metadata = certificatePolicyItem.ToCertificateMetadata(_options.Endpoint);
 
-            var certificateOperation = await _certificateClient.StartCreateCertificateAsync(certificatePolicyItem.CertificateName, certificatePolicy, tags: new Dictionary<string, string>
-            {
-                { "Issuer", "Acmebot" },
-                { "Endpoint", _options.Endpoint.Host },
-                { "DnsProvider", certificatePolicyItem.DnsProviderName },
-                { "DnsAlias", certificatePolicyItem.DnsAlias }
-            });
+            var certificateOperation = await _certificateClient.StartCreateCertificateAsync(certificatePolicyItem.CertificateName, certificatePolicy, tags: metadata);
 
             csr = certificateOperation.Properties.Csr;
         }

diff --git a/KeyVault.Acmebot/Internal/CertificateExtensions.cs b/KeyVault.Acmebot/Internal/CertificateExtensions.cs
@@ -60,6 +60,23 @@ public static CertificatePolicyItem ToCertificatePolicyItem(this KeyVaultCertifi
         };
     }
 
+    public static IDictionary<string, string> ToCertificateMetadata(this CertificatePolicyItem certificatePolicyItem, Uri endpoint)
+    {
+        var metadata = new Dictionary<string, string>
+        {
+            { IssuerKey, IssuerValue },
+            { EndpointKey, endpoint.Host },
+            { DnsProviderKey, certificatePolicyItem.DnsProviderName }
+        };
+
+        if (!string.IsNullOrEmpty(certificatePolicyItem.DnsAlias))
+        {
+            metadata.Add(DnsAliasKey, certificatePolicyItem.DnsAlias);
+        }
+
+        return metadata;
+    }
+
     private const string IssuerKey = "Issuer";
     private const string EndpointKey = "Endpoint";
     private const string DnsProviderKey = "DnsProvider";
@@ -75,7 +92,6 @@ public static CertificatePolicyItem ToCertificatePolicyItem(this KeyVaultCertifi
 
     private static bool TryGetDnsAlias(this IDictionary<string, string> tags, out string dnsAlias) => tags.TryGetValue(DnsAliasKey, out dnsAlias);
 
-
     private static string ToHexString(byte[] bytes)
     {
         ArgumentNullException.ThrowIfNull(bytes);