From e454940801de8ec1d921883d29bccf014ed3c24a Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Wed, 24 May 2017 19:23:14 +0200 Subject: [PATCH] environment variable renaming --- src/Services/Basket/Basket.API/BasketSettings.cs | 2 +- src/Services/Basket/Basket.API/Startup.cs | 6 +++--- src/Services/Basket/Basket.API/appsettings.json | 4 ++-- src/Services/Catalog/Catalog.API/CatalogSettings.cs | 2 +- src/Services/Catalog/Catalog.API/Startup.cs | 6 +++--- src/Services/Catalog/Catalog.API/settings.json | 4 ++-- src/Services/Ordering/Ordering.API/Startup.cs | 7 ++++--- src/Services/Ordering/Ordering.API/settings.json | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Services/Basket/Basket.API/BasketSettings.cs b/src/Services/Basket/Basket.API/BasketSettings.cs index f42af2234..721461a1c 100644 --- a/src/Services/Basket/Basket.API/BasketSettings.cs +++ b/src/Services/Basket/Basket.API/BasketSettings.cs @@ -6,6 +6,6 @@ public string EventBusConnection { get; set; } - public string ServiceBusConnection { get; set; } + public string ServiceBusConnectionString { get; set; } } } diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 20c44b5be..7a12607c8 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -72,14 +72,14 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API }); - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; var logger = sp.GetRequiredService>(); - var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection); + var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); }); @@ -131,7 +131,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API private void RegisterServiceBus(IServiceCollection services) { - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index 6bd839e35..fcbff20e5 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -9,7 +9,7 @@ }, "IdentityUrl": "http://localhost:5105", "ConnectionString": "127.0.0.1", - "ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", - "AzureServiceBus": "true", + "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", + "AzureServiceBusEnabled": "true", "SubscriptionClientName": "Basket" } \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/CatalogSettings.cs b/src/Services/Catalog/Catalog.API/CatalogSettings.cs index 5ef5b973c..62e92c6ce 100644 --- a/src/Services/Catalog/Catalog.API/CatalogSettings.cs +++ b/src/Services/Catalog/Catalog.API/CatalogSettings.cs @@ -6,6 +6,6 @@ public string EventBusConnection { get; set; } - public string ServiceBusConnection { get; set; } + public string ServiceBusConnectionString { get; set; } } } diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index fe38eeb87..1b90bd270 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -111,14 +111,14 @@ services.AddTransient(); - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; var logger = sp.GetRequiredService>(); - var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection); + var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); }); @@ -198,7 +198,7 @@ private void RegisterServiceBus(IServiceCollection services) { - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { diff --git a/src/Services/Catalog/Catalog.API/settings.json b/src/Services/Catalog/Catalog.API/settings.json index 458755222..111d04da6 100644 --- a/src/Services/Catalog/Catalog.API/settings.json +++ b/src/Services/Catalog/Catalog.API/settings.json @@ -9,7 +9,7 @@ "Microsoft": "Information" } }, - "ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", - "AzureServiceBus": "true", + "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", + "AzureServiceBusEnabled": "true", "SubscriptionClientName": "Catalog" } diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 594717976..a3cceb9a5 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -115,13 +115,14 @@ var serviceProvider = services.BuildServiceProvider(); services.AddTransient(); - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { var logger = sp.GetRequiredService>(); - var serviceBusConnection = new ServiceBusConnectionStringBuilder(Configuration["ServiceBusConnection"]); + var serviceBusConnectionString = Configuration["ServiceBusConnectionString"]; + var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); }); @@ -192,7 +193,7 @@ private void RegisterServiceBus(IServiceCollection services) { - if (Configuration.GetValue("AzureServiceBus")) + if (Configuration.GetValue("AzureServiceBusEnabled")) { services.AddSingleton(sp => { diff --git a/src/Services/Ordering/Ordering.API/settings.json b/src/Services/Ordering/Ordering.API/settings.json index 478542d2d..13ee06c52 100644 --- a/src/Services/Ordering/Ordering.API/settings.json +++ b/src/Services/Ordering/Ordering.API/settings.json @@ -9,7 +9,7 @@ "Microsoft": "Information" } }, - "ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", - "AzureServiceBus": "true", + "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", + "AzureServiceBusEnabled": "true", "SubscriptionClientName": "Ordering" }