From 8ca2e75bedbf0e60f93613523d938824dff2a1a2 Mon Sep 17 00:00:00 2001 From: Wenjie Yu Date: Wed, 2 Jun 2021 10:52:51 +0800 Subject: [PATCH] replace credential --- src/Services/Basket/Basket.API/Program.cs | 7 ++++++- src/Services/Catalog/Catalog.API/Program.cs | 7 ++++++- src/Services/Identity/Identity.API/Program.cs | 7 ++++++- src/Services/Ordering/Ordering.API/Program.cs | 7 ++++++- src/Services/Payment/Payment.API/Program.cs | 8 ++++++-- src/Web/WebStatus/Program.cs | 7 ++++++- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index 1eb84d3d7..79f796565 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -10,6 +10,7 @@ using Serilog; using System; using System.IO; using System.Net; +using Azure.Core; var configuration = GetConfiguration(); @@ -89,7 +90,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 4a5796ff5..cb6c1e1a6 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -15,6 +15,7 @@ using System; using System.IO; using System.Net; using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -109,7 +110,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 42fccfb45..a6f7ec9ee 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -12,6 +12,7 @@ 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); @@ -94,7 +95,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index 6cfab8272..52eb1a38b 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -14,6 +14,7 @@ using System; using System.IO; using System.Net; using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -101,7 +102,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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/Program.cs b/src/Services/Payment/Payment.API/Program.cs index a7cd02e0c..268099957 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -8,7 +8,7 @@ using Serilog; using System; using System.IO; using Azure.Identity; - +using Azure.Core; var configuration = GetConfiguration(); @@ -70,7 +70,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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 2960a4856..fa298fa7f 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Reflection; using WebStatus; using Azure.Identity; +using Azure.Core; var configuration = GetConfiguration(); @@ -71,7 +72,11 @@ IConfiguration GetConfiguration() if (config.GetValue("UseVault", false)) { - builder.AddAzureKeyVault(new Uri($"https://{config["Vault:Name"]}.vault.azure.net/"), new DefaultAzureCredential()); + 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();