Cleanup

Author: Aymen TROUDI

App/App - Backup.csproj

@@ -7,8 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.33" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="4.1.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.33" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />

App/App.csproj

@@ -13,7 +13,7 @@ public class Functions
     {
         private const string FunctionName = "WebJobDemo";
         private const string TimeoutExpression = "00:00:30";
-        private const string ScheduleExpression = "*/5 * * * * *";
+        private const string ScheduleExpression = "*/5 * * * *";
 
         private readonly IApiProxy _apiProxy;
 

App/Functions.cs

@@ -38,12 +38,12 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                 })
                 .ConfigureServices((hostingContext, services) =>
                 {
-                    services.Configure<Settings>(hostingContext.Configuration.GetSection("Settings"));
+                    services.Configure<ExternalApi>(hostingContext.Configuration.GetSection("ExternalApi"));
                     services.AddHttpClient<IApiProxy, ApiProxy>()
                         .ConfigureHttpClient((provider, client) =>
                         {
-                            var options = provider.GetRequiredService<IOptions<Settings>>();
-                            var baseAddress = options.Value.ExternalApi.BaseAddress;
+                            var options = provider.GetRequiredService<IOptions<ExternalApi>>();
+                            var baseAddress = options.Value.BaseAddress;
                             client.BaseAddress = new Uri(baseAddress);
                             client.DefaultRequestHeaders.Add("Accept", "application/json");
                         });

App/Program.cs

@@ -15,14 +15,12 @@
       "Default": "Information"
     }
   },
-  "Settings": {
-    "ExternalApi": {
-      "BaseAddress": "https://api.publicapis.org/",
-      "QueryString": "/random"
-    },
-    "AzureWebJobsStorage": "!PUT YOUR CONNECTION STRING HERE!",
-    "ApplicationInsights": {
-      "InstrumentationKey": "!PUT YOUR INSTRUMENTATION KEY HERE!"
-    }
+  "ExternalApi": {
+    "BaseAddress": "https://api.publicapis.org/",
+    "QueryString": "/random"
+  },
+  "AzureWebJobsStorage": "!PUT YOUR CONNECTION STRING HERE!",
+  "ApplicationInsights": {
+    "InstrumentationKey": "!PUT YOUR INSTRUMENTATION KEY HERE!"
   }
 }

App/appsettings.json

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

Lib/Configuration/Settings.cs

@@ -14,11 +14,11 @@ public class ApiProxy : IApiProxy
         private readonly HttpClient _client;
         private readonly ILogger _logger;
 
-        public ApiProxy(HttpClient client, IOptions<Settings> options, ILogger logger)
+        public ApiProxy(HttpClient client, IOptions<ExternalApi> options, ILogger logger)
         {
             _client = client ?? throw new ArgumentNullException(nameof(client));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _queryString = options.Value.ExternalApi.QueryString;
+            _queryString = options.Value.QueryString;
             _logger.LogInformation("Call to ApiProxy ctor at {now}", DateTime.Now);
         }