Browse Source
Review HTTP Aggregators. Remove IHTTPClient Resiliency building block. Fix TestController code ( ask about on this controller ). Tested with VS and docker-compose up directly
pull/632/head
Unai Zorrilla Castro
6 years ago
11 changed files with 27 additions and 490 deletions
Split View
Diff Options
-
+1 -55eShopOnContainers-ServicesAndWebApps.sln
-
+0 -54eShopOnContainers.sln
-
+0 -4src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
-
+10 -14src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
-
+0 -4src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
-
+0 -16src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs
-
+0 -15src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj
-
+0 -191src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs
-
+0 -125src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs
-
+16 -11src/Web/WebMVC/Controllers/TestController.cs
-
+0 -1src/Web/WebMVC/WebMVC.csproj
+ 1
- 55
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 0
- 54
eShopOnContainers.sln
View File
+ 0
- 4
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
View File
+ 10
- 14
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
View File
+ 0
- 4
src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
View File
+ 0
- 16
src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs
View File
| @ -1,16 +0,0 @@ | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| public interface IHttpClient | |||
| { | |||
| Task<string> GetStringAsync(string uri, string authorizationToken = null, string authorizationMethod = "Bearer"); | |||
| Task<HttpResponseMessage> PostAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer"); | |||
| Task<HttpResponseMessage> DeleteAsync(string uri, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer"); | |||
| Task<HttpResponseMessage> PutAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer"); | |||
| } | |||
| } | |||
+ 0
- 15
src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj
View File
| @ -1,15 +0,0 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard2.0</TargetFramework> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http</RootNamespace> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0-rc1-final" /> | |||
| <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" /> | |||
| <PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> | |||
| <PackageReference Include="Polly" Version="6.0.1" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 0
- 191
src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs
View File
| @ -1,191 +0,0 @@ | |||
| using Microsoft.Extensions.Logging; | |||
| using Newtonsoft.Json; | |||
| using Polly; | |||
| using Polly.Wrap; | |||
| using System; | |||
| using System.Collections.Concurrent; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Net; | |||
| using System.Net.Http; | |||
| using System.Net.Http.Headers; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore.Http; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| /// <summary> | |||
| /// HttpClient wrapper that integrates Retry and Circuit | |||
| /// breaker policies when invoking HTTP services. | |||
| /// Based on Polly library: https://github.com/App-vNext/Polly | |||
| /// </summary> | |||
| public class ResilientHttpClient : IHttpClient | |||
| { | |||
| private readonly HttpClient _client; | |||
| private readonly ILogger<ResilientHttpClient> _logger; | |||
| private readonly Func<string, IEnumerable<Policy>> _policyCreator; | |||
| private ConcurrentDictionary<string, PolicyWrap> _policyWrappers; | |||
| private readonly IHttpContextAccessor _httpContextAccessor; | |||
| public ResilientHttpClient(Func<string, IEnumerable<Policy>> policyCreator, ILogger<ResilientHttpClient> logger, IHttpContextAccessor httpContextAccessor) | |||
| { | |||
| _client = new HttpClient(); | |||
| _logger = logger; | |||
| _policyCreator = policyCreator; | |||
| _policyWrappers = new ConcurrentDictionary<string, PolicyWrap>(); | |||
| _httpContextAccessor = httpContextAccessor; | |||
| } | |||
| public Task<HttpResponseMessage> PostAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| return DoPostPutAsync(HttpMethod.Post, uri, item, authorizationToken, requestId, authorizationMethod); | |||
| } | |||
| public Task<HttpResponseMessage> PutAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| return DoPostPutAsync(HttpMethod.Put, uri, item, authorizationToken, requestId, authorizationMethod); | |||
| } | |||
| public Task<HttpResponseMessage> DeleteAsync(string uri, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| var origin = GetOriginFromUri(uri); | |||
| return HttpInvoker(origin, async (_) => | |||
| { | |||
| var requestMessage = new HttpRequestMessage(HttpMethod.Delete, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| if (requestId != null) | |||
| { | |||
| requestMessage.Headers.Add("x-requestid", requestId); | |||
| } | |||
| return await _client.SendAsync(requestMessage); | |||
| }); | |||
| } | |||
| public Task<string> GetStringAsync(string uri, string authorizationToken = null, string authorizationMethod = "Bearer") | |||
| { | |||
| var origin = GetOriginFromUri(uri); | |||
| return HttpInvoker(origin, async (_) => | |||
| { | |||
| var requestMessage = new HttpRequestMessage(HttpMethod.Get, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| var response = await _client.SendAsync(requestMessage); | |||
| // raise exception if HttpResponseCode 500 | |||
| // needed for circuit breaker to track fails | |||
| if (response.StatusCode == HttpStatusCode.InternalServerError) | |||
| { | |||
| throw new HttpRequestException(); | |||
| } | |||
| if (!response.IsSuccessStatusCode) | |||
| { | |||
| return null; | |||
| } | |||
| return await response.Content.ReadAsStringAsync(); | |||
| }); | |||
| } | |||
| private Task<HttpResponseMessage> DoPostPutAsync<T>(HttpMethod method, string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| if (method != HttpMethod.Post && method != HttpMethod.Put) | |||
| { | |||
| throw new ArgumentException("Value must be either post or put.", nameof(method)); | |||
| } | |||
| // a new StringContent must be created for each retry | |||
| // as it is disposed after each call | |||
| var origin = GetOriginFromUri(uri); | |||
| return HttpInvoker(origin, async (_) => | |||
| { | |||
| var requestMessage = new HttpRequestMessage(method, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| requestMessage.Content = new StringContent(JsonConvert.SerializeObject(item), System.Text.Encoding.UTF8, "application/json"); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| if (requestId != null) | |||
| { | |||
| requestMessage.Headers.Add("x-requestid", requestId); | |||
| } | |||
| var response = await _client.SendAsync(requestMessage); | |||
| // raise exception if HttpResponseCode 500 | |||
| // needed for circuit breaker to track fails | |||
| if (response.StatusCode == HttpStatusCode.InternalServerError) | |||
| { | |||
| throw new HttpRequestException(); | |||
| } | |||
| return response; | |||
| }); | |||
| } | |||
| private async Task<T> HttpInvoker<T>(string origin, Func<Context,Task<T>> action) | |||
| { | |||
| var normalizedOrigin = NormalizeOrigin(origin); | |||
| if (!_policyWrappers.TryGetValue(normalizedOrigin, out PolicyWrap policyWrap)) | |||
| { | |||
| policyWrap = Policy.WrapAsync(_policyCreator(normalizedOrigin).ToArray()); | |||
| _policyWrappers.TryAdd(normalizedOrigin, policyWrap); | |||
| } | |||
| // Executes the action applying all | |||
| // the policies defined in the wrapper | |||
| return await policyWrap.ExecuteAsync<T>(action, new Context(normalizedOrigin)); | |||
| } | |||
| private static string NormalizeOrigin(string origin) | |||
| { | |||
| return origin?.Trim()?.ToLower(); | |||
| } | |||
| private static string GetOriginFromUri(string uri) | |||
| { | |||
| var url = new Uri(uri); | |||
| var origin = $"{url.Scheme}://{url.DnsSafeHost}:{url.Port}"; | |||
| return origin; | |||
| } | |||
| private void SetAuthorizationHeader(HttpRequestMessage requestMessage) | |||
| { | |||
| var authorizationHeader = _httpContextAccessor.HttpContext.Request.Headers["Authorization"]; | |||
| if (!string.IsNullOrEmpty(authorizationHeader)) | |||
| { | |||
| requestMessage.Headers.Add("Authorization", new List<string>() { authorizationHeader }); | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 0
- 125
src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs
View File
| @ -1,125 +0,0 @@ | |||
| using Microsoft.AspNetCore.Http; | |||
| using Microsoft.Extensions.Logging; | |||
| using Newtonsoft.Json; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Net; | |||
| using System.Net.Http; | |||
| using System.Net.Http.Headers; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| public class StandardHttpClient : IHttpClient | |||
| { | |||
| private HttpClient _client; | |||
| private ILogger<StandardHttpClient> _logger; | |||
| private readonly IHttpContextAccessor _httpContextAccessor; | |||
| public StandardHttpClient(ILogger<StandardHttpClient> logger, IHttpContextAccessor httpContextAccessor) | |||
| { | |||
| _client = new HttpClient(); | |||
| _logger = logger; | |||
| _httpContextAccessor = httpContextAccessor; | |||
| } | |||
| public async Task<string> GetStringAsync(string uri, string authorizationToken = null, string authorizationMethod = "Bearer") | |||
| { | |||
| var requestMessage = new HttpRequestMessage(HttpMethod.Get, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| var response = await _client.SendAsync(requestMessage); | |||
| if (!response.IsSuccessStatusCode) | |||
| { | |||
| return null; | |||
| } | |||
| return await response.Content.ReadAsStringAsync(); | |||
| } | |||
| private async Task<HttpResponseMessage> DoPostPutAsync<T>(HttpMethod method, string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| if (method != HttpMethod.Post && method != HttpMethod.Put) | |||
| { | |||
| throw new ArgumentException("Value must be either post or put.", nameof(method)); | |||
| } | |||
| // a new StringContent must be created for each retry | |||
| // as it is disposed after each call | |||
| var requestMessage = new HttpRequestMessage(method, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| requestMessage.Content = new StringContent(JsonConvert.SerializeObject(item), System.Text.Encoding.UTF8, "application/json"); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| if (requestId != null) | |||
| { | |||
| requestMessage.Headers.Add("x-requestid", requestId); | |||
| } | |||
| var response = await _client.SendAsync(requestMessage); | |||
| // raise exception if HttpResponseCode 500 | |||
| // needed for circuit breaker to track fails | |||
| if (response.StatusCode == HttpStatusCode.InternalServerError) | |||
| { | |||
| throw new HttpRequestException(); | |||
| } | |||
| return response; | |||
| } | |||
| public async Task<HttpResponseMessage> PostAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| return await DoPostPutAsync(HttpMethod.Post, uri, item, authorizationToken, requestId, authorizationMethod); | |||
| } | |||
| public async Task<HttpResponseMessage> PutAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| return await DoPostPutAsync(HttpMethod.Put, uri, item, authorizationToken, requestId, authorizationMethod); | |||
| } | |||
| public async Task<HttpResponseMessage> DeleteAsync(string uri, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer") | |||
| { | |||
| var requestMessage = new HttpRequestMessage(HttpMethod.Delete, uri); | |||
| SetAuthorizationHeader(requestMessage); | |||
| if (authorizationToken != null) | |||
| { | |||
| requestMessage.Headers.Authorization = new AuthenticationHeaderValue(authorizationMethod, authorizationToken); | |||
| } | |||
| if (requestId != null) | |||
| { | |||
| requestMessage.Headers.Add("x-requestid", requestId); | |||
| } | |||
| return await _client.SendAsync(requestMessage); | |||
| } | |||
| private void SetAuthorizationHeader(HttpRequestMessage requestMessage) | |||
| { | |||
| var authorizationHeader = _httpContextAccessor.HttpContext.Request.Headers["Authorization"]; | |||
| if (!string.IsNullOrEmpty(authorizationHeader)) | |||
| { | |||
| requestMessage.Headers.Add("Authorization", new List<string>() { authorizationHeader }); | |||
| } | |||
| } | |||
| } | |||
| } | |||