From be9ce6d069f63ccfdd24b3b7cf037b9cfe9ec5b1 Mon Sep 17 00:00:00 2001 From: zedy <81678720+zedy-wj@users.noreply.github.com> Date: Tue, 8 Jun 2021 17:15:15 +0800 Subject: [PATCH] Update keyvault sdk from t1 to t2 (#1685) * Upgrade Microsoft.Extensions.Configuration.AzureKeyVault to * Update keyvault uri * Update Program.cs Modify format * modify format * resolve conflict * replace credential Co-authored-by: Wenjie Yu --- src/Services/Basket/Basket.API/Basket.API.csproj | 5 +++-- src/Services/Basket/Basket.API/Program.cs | 9 ++++++--- src/Services/Catalog/Catalog.API/Catalog.API.csproj | 5 +++-- src/Services/Catalog/Catalog.API/Program.cs | 7 +++++-- src/Services/Identity/Identity.API/Identity.API.csproj | 3 ++- src/Services/Identity/Identity.API/Program.cs | 7 +++++-- src/Services/Ordering/Ordering.API/Ordering.API.csproj | 5 +++-- src/Services/Ordering/Ordering.API/Program.cs | 7 +++++-- src/Services/Payment/Payment.API/Payment.API.csproj | 3 ++- src/Services/Payment/Payment.API/Program.cs | 8 +++++--- src/Web/WebStatus/Program.cs | 7 +++++-- src/Web/WebStatus/WebStatus.csproj | 3 ++- 12 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index d721d00cf..5fdc5259a 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -21,6 +21,8 @@ + + @@ -29,8 +31,7 @@ - - + diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index 058735a07..79f796565 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -5,10 +5,12 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.eShopOnContainers.Services.Basket.API; using Microsoft.Extensions.Configuration; +using Azure.Identity; using Serilog; using System; using System.IO; using System.Net; +using Azure.Core; var configuration = GetConfiguration(); @@ -88,10 +90,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); @@ -109,4 +112,4 @@ public class Program public static string Namespace = typeof(Startup).Namespace; public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1); -} \ No newline at end of file +} diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 71558fc6e..e49538fdb 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -48,14 +48,15 @@ + + - - + diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 1507b1d8e..cb6c1e1a6 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -14,6 +14,8 @@ using Serilog; using System; using System.IO; using System.Net; +using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -108,10 +110,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 7184410d2..55ad09a2d 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -19,6 +19,8 @@ + + @@ -38,7 +40,6 @@ - diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 909680621..a6f7ec9ee 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -11,6 +11,8 @@ using Microsoft.Extensions.Options; using Serilog; using System; using System.IO; +using Azure.Identity; +using Azure.Core; string Namespace = typeof(Startup).Namespace; string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1); @@ -93,10 +95,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index ef71dde81..daa84fe0f 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -42,6 +42,8 @@ + + @@ -54,8 +56,7 @@ - - + diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index 0a42cbba1..52eb1a38b 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -13,6 +13,8 @@ using Serilog; using System; using System.IO; using System.Net; +using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -100,10 +102,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index e438f4e66..dbd64e9bf 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -14,11 +14,12 @@ + + - diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index 1e5dd1922..268099957 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -7,7 +7,8 @@ using Payment.API; using Serilog; using System; using System.IO; - +using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -69,10 +70,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index a06f0b142..fa298fa7f 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -8,6 +8,8 @@ using System.IO; using System.Linq; using System.Reflection; using WebStatus; +using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -70,10 +72,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault( - $"https://{config["Vault:Name"]}.vault.azure.net/", + TokenCredential credential = new ClientSecretCredential( + config["Vault:TenantId"], config["Vault:ClientId"], config["Vault:ClientSecret"]); + builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), credential); } return builder.Build(); diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index c3f22905b..e57e49252 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -12,11 +12,12 @@ + + -