From 5ea034106cf143a8842c1edb7590ac658b48446d Mon Sep 17 00:00:00 2001 From: David Fowler Date: Fri, 5 May 2023 20:25:36 -0700 Subject: [PATCH] Move extensions to Extensions folder --- .../Basket.API/{ => Extensions}/CustomExtensionMethods.cs | 3 +-- .../Catalog.API/{ => Extensions}/CustomExtensionMethods.cs | 4 ++-- .../Ordering.API/{ => Extensions}/CustomExtensionsMethods.cs | 2 +- .../{ => Extensions}/CustomExtensionMethods.cs | 0 .../Webhooks.API/{ => Extensions}/CustomExtensionMethods.cs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) rename src/Services/Basket/Basket.API/{ => Extensions}/CustomExtensionMethods.cs (92%) rename src/Services/Catalog/Catalog.API/{ => Extensions}/CustomExtensionMethods.cs (96%) rename src/Services/Ordering/Ordering.API/{ => Extensions}/CustomExtensionsMethods.cs (98%) rename src/Services/Ordering/Ordering.SignalrHub/{ => Extensions}/CustomExtensionMethods.cs (100%) rename src/Services/Webhooks/Webhooks.API/{ => Extensions}/CustomExtensionMethods.cs (97%) diff --git a/src/Services/Basket/Basket.API/CustomExtensionMethods.cs b/src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs similarity index 92% rename from src/Services/Basket/Basket.API/CustomExtensionMethods.cs rename to src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs index b98ab6b3f..00cea7367 100644 --- a/src/Services/Basket/Basket.API/CustomExtensionMethods.cs +++ b/src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs @@ -1,5 +1,4 @@ -namespace Microsoft.eShopOnContainers.Services.Basket.API; - + public static class CustomExtensionMethods { public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration) diff --git a/src/Services/Catalog/Catalog.API/CustomExtensionMethods.cs b/src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs similarity index 96% rename from src/Services/Catalog/Catalog.API/CustomExtensionMethods.cs rename to src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs index ed74e4619..f1320f00f 100644 --- a/src/Services/Catalog/Catalog.API/CustomExtensionMethods.cs +++ b/src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs @@ -9,7 +9,7 @@ public static class CustomExtensionMethods hcBuilder .AddSqlServer(_ => configuration.GetRequiredConnectionString("CatalogDB"), name: "CatalogDB-check", - tags: new string[] { "live", "ready" }); + tags: new string[] { "ready" }); var accountName = configuration["AzureStorageAccountName"]; var accountKey = configuration["AzureStorageAccountKey"]; @@ -20,7 +20,7 @@ public static class CustomExtensionMethods .AddAzureBlobStorage( $"DefaultEndpointsProtocol=https;AccountName={accountName};AccountKey={accountKey};EndpointSuffix=core.windows.net", name: "catalog-storage-check", - tags: new string[] { "live", "ready" }); + tags: new string[] { "ready" }); } return services; diff --git a/src/Services/Ordering/Ordering.API/CustomExtensionsMethods.cs b/src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs similarity index 98% rename from src/Services/Ordering/Ordering.API/CustomExtensionsMethods.cs rename to src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs index a7d7cd523..9ad366a1a 100644 --- a/src/Services/Ordering/Ordering.API/CustomExtensionsMethods.cs +++ b/src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs @@ -10,7 +10,7 @@ static class CustomExtensionsMethods .AddSqlServer(_ => configuration.GetRequiredConnectionString("OrderingDB"), name: "OrderingDB-check", - tags: new string[] { "live", "ready" }); + tags: new string[] { "ready" }); return services; } diff --git a/src/Services/Ordering/Ordering.SignalrHub/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.SignalrHub/Extensions/CustomExtensionMethods.cs similarity index 100% rename from src/Services/Ordering/Ordering.SignalrHub/CustomExtensionMethods.cs rename to src/Services/Ordering/Ordering.SignalrHub/Extensions/CustomExtensionMethods.cs diff --git a/src/Services/Webhooks/Webhooks.API/CustomExtensionMethods.cs b/src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs similarity index 97% rename from src/Services/Webhooks/Webhooks.API/CustomExtensionMethods.cs rename to src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs index 2a2f5df06..8a962781e 100644 --- a/src/Services/Webhooks/Webhooks.API/CustomExtensionMethods.cs +++ b/src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs @@ -25,7 +25,7 @@ .AddSqlServer(_ => configuration.GetRequiredConnectionString("WebHooksDb"), name: "WebhooksApiDb-check", - tags: new string[] { "ready", "live" }); + tags: new string[] { "ready" }); return services; }