Merge pull request #1547 from borjasanes/feature/basket-api-migration

basket api net 5 migration

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Infrastructure/GrpcExceptionInterceptor.cs

@@ -0,0 +1,43 @@
+using Grpc.Core;
+using Grpc.Core.Interceptors;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Infrastructure
+{
+    public class GrpcExceptionInterceptor : Interceptor
+    {
+        private readonly ILogger<GrpcExceptionInterceptor> _logger;
+
+        public GrpcExceptionInterceptor(ILogger<GrpcExceptionInterceptor> logger)
+        {
+            _logger = logger;
+        }
+
+        public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(
+            TRequest request,
+            ClientInterceptorContext<TRequest, TResponse> context,
+            AsyncUnaryCallContinuation<TRequest, TResponse> continuation)
+        {
+            var call = continuation(request, context);
+
+            return new AsyncUnaryCall<TResponse>(HandleResponse(call.ResponseAsync), call.ResponseHeadersAsync, call.GetStatus, call.GetTrailers, call.Dispose);
+        }
+
+        private async Task<TResponse> HandleResponse<TResponse>(Task<TResponse> t)
+        {
+            try
+            {
+                var response = await t;
+                _logger.LogDebug($"Response received: {response}");
+                return response;
+            }
+            catch (RpcException e)
+            {
+                _logger.LogError("Error calling via grpc: {Status} - {Message}", e.Status, e.Message);
+                return default;
+            }
+        }
+    }
+}

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="Google.Protobuf" Version="3.11.2" />
     <PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.25.0" />
     <PackageReference Include="Grpc.Core" Version="2.25.0" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.25.0" />
     <PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs

@@ -1,55 +1,29 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
+using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator;
 using Serilog;
-using System.IO;
 
-namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
-{
-    public class Program
-    {
-        private static IConfiguration _configuration;
 
-        public static void Main(string[] args)
+BuildWebHost(args).Run();
+IWebHost BuildWebHost(string[] args) =>
+    WebHost
+        .CreateDefaultBuilder(args)
+        .ConfigureAppConfiguration(cb =>
         {
-            _configuration = GetConfiguration();
-
-            BuildWebHost(args).Run();
-        }
-
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost
-                .CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration(cb =>
-                {
-                    var sources = cb.Sources;
-                    sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
-                    {
-                        Optional = true,
-                        Path = "appsettings.localhost.json",
-                        ReloadOnChange = false
-                    });
-                })
-                .UseStartup<Startup>()
-                .UseSerilog((builderContext, config) =>
-                {
-                    config
-                        .MinimumLevel.Information()
-                        .Enrich.FromLogContext()
-                        .WriteTo.Console();
-                })
-                .Build();
-
-        private static IConfiguration GetConfiguration()
+            var sources = cb.Sources;
+            sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
+            {
+                Optional = true,
+                Path = "appsettings.localhost.json",
+                ReloadOnChange = false
+            });
+        })
+        .UseStartup<Startup>()
+        .UseSerilog((builderContext, config) =>
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables();
-
-            var config = builder.Build();
-
-            return builder.Build();
-        }
-    }
-}
+            config
+                .MinimumLevel.Information()
+                .Enrich.FromLogContext()
+                .WriteTo.Console();
+        })
+        .Build();

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs

@@ -1,54 +1,40 @@
-using Grpc.Net.Client;
-using GrpcBasket;
+using GrpcBasket;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Config;
 using Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
 {
     public class BasketService : IBasketService
     {
-        private readonly HttpClient _httpClient;
-        private readonly UrlsConfig _urls;
+        private readonly Basket.BasketClient _basketClient;
         private readonly ILogger<BasketService> _logger;
 
-        public BasketService(HttpClient httpClient, IOptions<UrlsConfig> config, ILogger<BasketService> logger)
+        public BasketService(Basket.BasketClient basketClient, ILogger<BasketService> logger)
         {
-            _httpClient = httpClient;
-            _urls = config.Value;
+            _basketClient = basketClient;
             _logger = logger;
         }
 
         public async Task<BasketData> GetById(string id)
         {
-            return await GrpcCallerService.CallService(_urls.GrpcBasket, async channel =>
-            {
-
-                var client = new Basket.BasketClient(channel);
-                _logger.LogDebug("grpc client created, request = {@id}", id);
-                var response = await client.GetBasketByIdAsync(new BasketRequest { Id = id });
-                _logger.LogDebug("grpc response {@response}", response);
+            _logger.LogDebug("grpc client created, request = {@id}", id);
+            var response = await _basketClient.GetBasketByIdAsync(new BasketRequest { Id = id });
+            _logger.LogDebug("grpc response {@response}", response);
 
-                return MapToBasketData(response);
-            });
+            return MapToBasketData(response);
         }
 
         public async Task UpdateAsync(BasketData currentBasket)
         {
-            await GrpcCallerService.CallService(_urls.GrpcBasket, async httpClient =>
-            {
-                var channel = GrpcChannel.ForAddress(_urls.GrpcBasket);
-                var client = new Basket.BasketClient(channel);
-                _logger.LogDebug("Grpc update basket currentBasket {@currentBasket}", currentBasket);
-                var request = MapToCustomerBasketRequest(currentBasket);
-                _logger.LogDebug("Grpc update basket request {@request}", request);
+            _logger.LogDebug("Grpc update basket currentBasket {@currentBasket}", currentBasket);
+            var request = MapToCustomerBasketRequest(currentBasket);
+            _logger.LogDebug("Grpc update basket request {@request}", request);
 
-                return await client.UpdateBasketAsync(request);
-            });
+            await _basketClient.UpdateBasketAsync(request);
         }
 
         private BasketData MapToBasketData(CustomerBasketResponse customerBasketRequest)

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs

@@ -1,4 +1,5 @@
 using Devspaces.Support;
+using GrpcBasket;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
@@ -14,6 +15,7 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using System;
 using System.Collections.Generic;
@@ -46,7 +48,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddCustomMvc(Configuration)
                  .AddCustomAuthentication(Configuration)
                  .AddDevspaces()
-                 .AddHttpServices();
+                 .AddHttpServices()
+                 .AddGrpcServices();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -177,10 +180,6 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             //register http services
-            services
-                .AddHttpClient<IBasketService, BasketService>()
-                .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
-                .AddDevspacesSupport();
 
             services.AddHttpClient<ICatalogService, CatalogService>()
                    .AddDevspacesSupport();
@@ -194,5 +193,20 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
             return services;
         }
 
+        public static IServiceCollection AddGrpcServices(this IServiceCollection services)
+        {
+            services.AddSingleton<GrpcExceptionInterceptor>();
+
+            services.AddScoped<IBasketService, BasketService>();
+
+            services.AddGrpcClient<Basket.BasketClient>((services, options) =>
+            {
+                var basketApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcBasket;
+                options.Address = new Uri(basketApi);
+            }).AddInterceptor<GrpcExceptionInterceptor>();
+
+            return services;
+        }
+
     }
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/GrpcExceptionInterceptor.cs

@@ -0,0 +1,43 @@
+using Grpc.Core;
+using Grpc.Core.Interceptors;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
+{
+    public class GrpcExceptionInterceptor : Interceptor
+    {
+        private readonly ILogger<GrpcExceptionInterceptor> _logger;
+
+        public GrpcExceptionInterceptor(ILogger<GrpcExceptionInterceptor> logger)
+        {
+            _logger = logger;
+        }
+
+        public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(
+            TRequest request,
+            ClientInterceptorContext<TRequest, TResponse> context,
+            AsyncUnaryCallContinuation<TRequest, TResponse> continuation)
+        {
+            var call = continuation(request, context);
+
+            return new AsyncUnaryCall<TResponse>(HandleResponse(call.ResponseAsync), call.ResponseHeadersAsync, call.GetStatus, call.GetTrailers, call.Dispose);
+        }
+
+        private async Task<TResponse> HandleResponse<TResponse>(Task<TResponse> t)
+        {
+            try
+            {
+                var response = await t;
+                _logger.LogDebug($"Response received: {response}");
+                return response;
+            }
+            catch (RpcException e)
+            {
+                _logger.LogError("Error calling via grpc: {Status} - {Message}", e.Status, e.Message);
+                return default;
+            }
+        }
+    }
+}

src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs

@@ -1,38 +1,29 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator;
 using Serilog;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
-        }
-
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost
-                .CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration(cb =>
-                {
-                    var sources = cb.Sources;
-                    sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
-                    {
-                        Optional = true,
-                        Path = "appsettings.localhost.json",
-                        ReloadOnChange = false
-                    });
-                })
-                .UseStartup<Startup>()
-                .UseSerilog((builderContext, config) =>
-                {
-                    config
-                        .MinimumLevel.Information()
-                        .Enrich.FromLogContext()
-                        .WriteTo.Console();
-                })
-                .Build();
+BuildWebHost(args).Run();
 
-    }
-}
+IWebHost BuildWebHost(string[] args) =>
+    WebHost
+        .CreateDefaultBuilder(args)
+        .ConfigureAppConfiguration(cb =>
+        {
+            var sources = cb.Sources;
+            sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
+            {
+                Optional = true,
+                Path = "appsettings.localhost.json",
+                ReloadOnChange = false
+            });
+        })
+        .UseStartup<Startup>()
+        .UseSerilog((builderContext, config) =>
+        {
+            config
+                .MinimumLevel.Information()
+                .Enrich.FromLogContext()
+                .WriteTo.Console();
+        })
+        .Build();