Adding Acmebot options validation (#194)

shibayan · Jun 18, 2020 · e485131 · e485131
1 parent c79ece1
commit e485131
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/AppService.Acmebot/AcmebotOptions.cs b/AppService.Acmebot/AcmebotOptions.cs
@@ -1,13 +1,19 @@
-namespace AppService.Acmebot
+using System.ComponentModel.DataAnnotations;
+
+namespace AppService.Acmebot
 {
     public class AcmebotOptions
     {
+        [Required]
         public string Endpoint { get; set; } = "https://acme-v02.api.letsencrypt.org/";
 
+        [Required]
         public string Contacts { get; set; }
 
+        [Required]
         public string SubscriptionId { get; set; }
 
+        [Url]
         public string Webhook { get; set; }
     }
 }
diff --git a/AppService.Acmebot/Startup.cs b/AppService.Acmebot/Startup.cs
@@ -11,6 +11,7 @@
 using Microsoft.Azure.WebJobs.Extensions.DurableTask;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using Microsoft.Rest;
 
@@ -32,6 +33,8 @@ public Startup()
 
         public override void Configure(IFunctionsHostBuilder builder)
         {
+            builder.Services.Replace(ServiceDescriptor.Transient(typeof(IOptionsFactory<>), typeof(OptionsFactory<>)));
+
             builder.Services.AddHttpClient();
             builder.Services.AddHttpClient("InSecure")
                    .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
@@ -69,7 +72,9 @@ public override void Configure(IFunctionsHostBuilder builder)
 
             var section = Configuration.GetSection("Acmebot");
 
-            builder.Services.Configure<AcmebotOptions>(section.Exists() ? section : Configuration.GetSection("LetsEncrypt"));
+            builder.Services.AddOptions<AcmebotOptions>()
+                   .Bind(section.Exists() ? section : Configuration.GetSection("LetsEncrypt"))
+                   .ValidateDataAnnotations();
         }
     }
 }