ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1553 from borjasanes/feature/payment-api-migration

Browse Source 
Feature/payment api migration
This commit is contained in:
Miguel Veloso 2020-12-21 12:06:44 +00:00 committed by GitHub
commit 6ee0837d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 86 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Services/Payment/Payment.API/Dockerfile
View File

@ -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 WORKDIR /app
EXPOSE 80 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 WORKDIR /src
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

24
src/Services/Payment/Payment.API/Payment.API.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks> <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
@ -10,21 +10,21 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="3.0.0" /> <PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="3.2.2" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="3.0.3" /> <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="3.1.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.0.0" /> <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.1" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.12.0" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.16.0" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.12.0" /> <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.16.0" />
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.1.1" /> <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.10"/>
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" /> <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" /> <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00216" /> <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00216" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00834" /> <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00834" />
<PackageReference Include="Serilog.Sinks.Http" Version="5.2.0" /> <PackageReference Include="Serilog.Sinks.Http" Version="7.2.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="4.1.0-dev-00166" /> <PackageReference Include="Serilog.Sinks.Seq" Version="4.1.0-dev-00166" />
</ItemGroup> </ItemGroup>

147
src/Services/Payment/Payment.API/Program.cs
View File

@ -3,86 +3,83 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Payment.API;
using Serilog; using Serilog;
using System; using System;
using System.IO; using System.IO;
namespace Payment.API
var configuration = GetConfiguration();
Log.Logger = CreateSerilogLogger(configuration);
try
{ {
public class Program Log.Information("Configuring web host ({ApplicationContext})...", Program.AppName);
{ var host = BuildWebHost(configuration, args);
public static readonly string Namespace = typeof(Program).Namespace;
public static readonly string AppName = Namespace;
public static int Main(string[] args) Log.Information("Starting web host ({ApplicationContext})...", Program.AppName);
{ host.Run();
var configuration = GetConfiguration();
Log.Logger = CreateSerilogLogger(configuration); return 0;
}
try catch (Exception ex)
{ {
Log.Information("Configuring web host ({ApplicationContext})...", AppName); Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", Program.AppName);
var host = BuildWebHost(configuration, args); return 1;
}
Log.Information("Starting web host ({ApplicationContext})...", AppName); finally
host.Run(); {
Log.CloseAndFlush();
return 0; }
}
catch (Exception ex)
{ IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName); WebHost.CreateDefaultBuilder(args)
return 1; .CaptureStartupErrors(false)
} .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
finally .UseStartup<Startup>()
{ .UseContentRoot(Directory.GetCurrentDirectory())
Log.CloseAndFlush(); .UseSerilog()
} .Build();
}
Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => {
WebHost.CreateDefaultBuilder(args) var seqServerUrl = configuration["Serilog:SeqServerUrl"];
.CaptureStartupErrors(false) var logstashUrl = configuration["Serilog:LogstashgUrl"];
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) return new LoggerConfiguration()
.UseStartup<Startup>() .MinimumLevel.Verbose()
.UseContentRoot(Directory.GetCurrentDirectory()) .Enrich.WithProperty("ApplicationContext", Program.AppName)
.UseSerilog() .Enrich.FromLogContext()
.Build(); .WriteTo.Console()
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
{ .ReadFrom.Configuration(configuration)
var seqServerUrl = configuration["Serilog:SeqServerUrl"]; .CreateLogger();
var logstashUrl = configuration["Serilog:LogstashgUrl"]; }
return new LoggerConfiguration()
.MinimumLevel.Verbose() IConfiguration GetConfiguration()
.Enrich.WithProperty("ApplicationContext", AppName) {
.Enrich.FromLogContext() var builder = new ConfigurationBuilder()
.WriteTo.Console() .SetBasePath(Directory.GetCurrentDirectory())
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl) .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl) .AddEnvironmentVariables();
.ReadFrom.Configuration(configuration)
.CreateLogger(); var config = builder.Build();
}
if (config.GetValue<bool>("UseVault", false))
private static IConfiguration GetConfiguration() {
{ builder.AddAzureKeyVault(
var builder = new ConfigurationBuilder() $"https://{config["Vault:Name"]}.vault.azure.net/",
.SetBasePath(Directory.GetCurrentDirectory()) config["Vault:ClientId"],
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) config["Vault:ClientSecret"]);
.AddEnvironmentVariables(); }
var config = builder.Build(); return builder.Build();
}
if (config.GetValue<bool>("UseVault", false))
{ public class Program
builder.AddAzureKeyVault( {
$"https://{config["Vault:Name"]}.vault.azure.net/", public static string Namespace = typeof(Startup).Namespace;
config["Vault:ClientId"], public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
config["Vault:ClientSecret"]);
}
return builder.Build();
}
}
} }