Merge pull request #5 from shibayan/feature/refactoring

Refactoring and improve reliability
shibayan · Oct 14, 2018 · ec269db · ec269db
2 parents e631eeb + fd88b2f
commit ec269db
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/AzureKeyVault.LetsEncrypt/AddCertificate.cs b/AzureKeyVault.LetsEncrypt/AddCertificate.cs
@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 using Microsoft.Azure.WebJobs;
@@ -19,7 +20,7 @@ public static async Task<HttpResponseMessage> HttpStart(
 
             if (request.Domains == null || request.Domains.Length == 0)
             {
-                return req.CreateErrorResponse(System.Net.HttpStatusCode.BadRequest, $"{nameof(request.Domains)} is empty.");
+                return req.CreateErrorResponse(HttpStatusCode.BadRequest, $"{nameof(request.Domains)} is empty.");
             }
 
             // Function input comes from the request content.

diff --git a/AzureKeyVault.LetsEncrypt/AccountKey.cs → ...yVault.LetsEncrypt/Internal/AccountKey.cs b/AzureKeyVault.LetsEncrypt/AccountKey.cs → ...yVault.LetsEncrypt/Internal/AccountKey.cs
@@ -2,7 +2,7 @@
 
 using ACMESharp.Crypto.JOSE;
 
-namespace AzureKeyVault.LetsEncrypt
+namespace AzureKeyVault.LetsEncrypt.Internal
 {
     internal class AccountKey
     {

diff --git a/AzureKeyVault.LetsEncrypt/Settings.cs → ...KeyVault.LetsEncrypt/Internal/Settings.cs b/AzureKeyVault.LetsEncrypt/Settings.cs → ...KeyVault.LetsEncrypt/Internal/Settings.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Configuration;
 
-namespace AzureKeyVault.LetsEncrypt
+namespace AzureKeyVault.LetsEncrypt.Internal
 {
     internal class Settings
     {

diff --git a/AzureKeyVault.LetsEncrypt/SharedFunctions.cs b/AzureKeyVault.LetsEncrypt/SharedFunctions.cs
@@ -10,6 +10,8 @@
 using ACMESharp.Protocol;
 using ACMESharp.Protocol.Resources;
 
+using AzureKeyVault.LetsEncrypt.Internal;
+
 using Microsoft.Azure.KeyVault;
 using Microsoft.Azure.KeyVault.Models;
 using Microsoft.Azure.Management.Dns;
@@ -48,8 +50,11 @@ public static async Task IssueCertificate([OrchestrationTrigger] DurableOrchestr
                 challenges.Add(await context.CallActivityAsync<Challenge>(nameof(Dns01Authorization), authorization));
             }
 
-            // Order status が ready になるまで待つ
-            await context.CallActivityAsync(nameof(AnswerChallenges), (orderDetails, challenges));
+            // ACME Answer を実行
+            await context.CallActivityAsync(nameof(AnswerChallenges), challenges);
+
+            // Order のステータスが ready になるまで 60 秒待機
+            await context.CallActivityWithRetryAsync(nameof(CheckIsReady), new RetryOptions(TimeSpan.FromSeconds(5), 12), orderDetails);
 
             await context.CallActivityAsync(nameof(FinalizeOrder), (dnsNames, orderDetails));
         }
@@ -183,7 +188,7 @@ public static async Task<Challenge> Dns01Authorization([ActivityTrigger] Durable
         [FunctionName(nameof(AnswerChallenges))]
         public static async Task AnswerChallenges([ActivityTrigger] DurableActivityContext context, ILogger log)
         {
-            var (orderDetails, challenges) = context.GetInput<(OrderDetails, IList<Challenge>)>();
+            var challenges = context.GetInput<IList<Challenge>>();
 
             var acme = await CreateAcmeClientAsync();
 
@@ -192,28 +197,21 @@ public static async Task AnswerChallenges([ActivityTrigger] DurableActivityConte
             {
                 await acme.AnswerChallengeAsync(challenge.Url);
             }
+        }
 
-            // Order のステータスが ready になるまで 60 秒待機
-            for (int i = 0; i < 12; i++)
-            {
-                orderDetails = await acme.GetOrderDetailsAsync(orderDetails.OrderUrl, orderDetails);
-
-                if (orderDetails.Payload.Status == "ready")
-                {
-                    return;
-                }
+        [FunctionName(nameof(CheckIsReady))]
+        public static async Task CheckIsReady([ActivityTrigger] DurableActivityContext context, ILogger log)
+        {
+            var orderDetails = context.GetInput<OrderDetails>();
 
-                await Task.Delay(TimeSpan.FromSeconds(5));
-            }
+            var acme = await CreateAcmeClientAsync();
 
-            log.LogError($"Timeout ACME challenge status : {orderDetails.Payload.Status}");
+            orderDetails = await acme.GetOrderDetailsAsync(orderDetails.OrderUrl, orderDetails);
 
-            if (orderDetails.Payload.Error != null)
+            if (orderDetails.Payload.Status != "ready")
             {
-                log.LogError($"{orderDetails.Payload.Error.Type},{orderDetails.Payload.Error.Status},{orderDetails.Payload.Error.Detail}");
+                throw new InvalidOperationException($"Invalid order status is {orderDetails.Payload.Status}");
             }
-
-            throw new InvalidOperationException();
         }
 
         [FunctionName(nameof(FinalizeOrder))]