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

environment variable renaming

Browse Source
This commit is contained in:
Christian Arenas 2017-05-24 19:23:14 +02:00
parent 9a100c9a27
commit e454940801
8 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Basket/Basket.API/BasketSettings.cs
View File

@ -6,6 +6,6 @@
public string EventBusConnection { get; set; } public string EventBusConnection { get; set; }
public string ServiceBusConnection { get; set; } public string ServiceBusConnectionString { get; set; }
} }
} }

6
src/Services/Basket/Basket.API/Startup.cs
View File

@ -72,14 +72,14 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
}); });
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IServiceBusPersisterConnection>(sp => services.AddSingleton<IServiceBusPersisterConnection>(sp =>
{ {
var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value; var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;
var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection); var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);
return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);
}); });
@ -131,7 +131,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
private void RegisterServiceBus(IServiceCollection services) private void RegisterServiceBus(IServiceCollection services)
{ {
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IEventBus, EventBusServiceBus>(sp => services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
{ {

4
src/Services/Basket/Basket.API/appsettings.json
View File

@ -9,7 +9,7 @@
}, },
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"ConnectionString": "127.0.0.1", "ConnectionString": "127.0.0.1",
"ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",
"AzureServiceBus": "true", "AzureServiceBusEnabled": "true",
"SubscriptionClientName": "Basket" "SubscriptionClientName": "Basket"
} }

2
src/Services/Catalog/Catalog.API/CatalogSettings.cs
View File

@ -6,6 +6,6 @@
public string EventBusConnection { get; set; } public string EventBusConnection { get; set; }
public string ServiceBusConnection { get; set; } public string ServiceBusConnectionString { get; set; }
} }
} }

6
src/Services/Catalog/Catalog.API/Startup.cs
View File

@ -111,14 +111,14 @@
services.AddTransient<ICatalogIntegrationEventService, CatalogIntegrationEventService>(); services.AddTransient<ICatalogIntegrationEventService, CatalogIntegrationEventService>();
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IServiceBusPersisterConnection>(sp => services.AddSingleton<IServiceBusPersisterConnection>(sp =>
{ {
var settings = sp.GetRequiredService<IOptions<CatalogSettings>>().Value; var settings = sp.GetRequiredService<IOptions<CatalogSettings>>().Value;
var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection); var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);
return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);
}); });
@ -198,7 +198,7 @@
private void RegisterServiceBus(IServiceCollection services) private void RegisterServiceBus(IServiceCollection services)
{ {
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IEventBus, EventBusServiceBus>(sp => services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
{ {

4
src/Services/Catalog/Catalog.API/settings.json
View File

@ -9,7 +9,7 @@
"Microsoft": "Information" "Microsoft": "Information"
} }
}, },
"ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",
"AzureServiceBus": "true", "AzureServiceBusEnabled": "true",
"SubscriptionClientName": "Catalog" "SubscriptionClientName": "Catalog"
} }

7
src/Services/Ordering/Ordering.API/Startup.cs
View File

@ -115,13 +115,14 @@
var serviceProvider = services.BuildServiceProvider(); var serviceProvider = services.BuildServiceProvider();
services.AddTransient<IOrderingIntegrationEventService, OrderingIntegrationEventService>(); services.AddTransient<IOrderingIntegrationEventService, OrderingIntegrationEventService>();
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IServiceBusPersisterConnection>(sp => services.AddSingleton<IServiceBusPersisterConnection>(sp =>
{ {
var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
var serviceBusConnection = new ServiceBusConnectionStringBuilder(Configuration["ServiceBusConnection"]); var serviceBusConnectionString = Configuration["ServiceBusConnectionString"];
var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString);
return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);
}); });
@ -192,7 +193,7 @@
private void RegisterServiceBus(IServiceCollection services) private void RegisterServiceBus(IServiceCollection services)
{ {
if (Configuration.GetValue<bool>("AzureServiceBus")) if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
{ {
services.AddSingleton<IEventBus, EventBusServiceBus>(sp => services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
{ {

4
src/Services/Ordering/Ordering.API/settings.json
View File

@ -9,7 +9,7 @@
"Microsoft": "Information" "Microsoft": "Information"
} }
}, },
"ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus", "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",
"AzureServiceBus": "true", "AzureServiceBusEnabled": "true",
"SubscriptionClientName": "Ordering" "SubscriptionClientName": "Ordering"
} }