environment variable renaming

christian147 · christian147 · commit e454940801de · 2017-05-24T19:23:14.000+02:00
diff --git a/src/Services/Basket/Basket.API/BasketSettings.cs b/src/Services/Basket/Basket.API/BasketSettings.cs
@@ -6,6 +6,6 @@ public class BasketSettings
 
         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
@@ -72,14 +72,14 @@ public void ConfigureServices(IServiceCollection services)
             });
 
 
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IServiceBusPersisterConnection>(sp =>
                 {
                     var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;
                     var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
 
-                    var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection);
+                    var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);
 
                     return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);
                 });
@@ -131,7 +131,7 @@ public void ConfigureServices(IServiceCollection services)
 
         private void RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {
diff --git 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"
 }
diff --git a/src/Services/Catalog/Catalog.API/CatalogSettings.cs b/src/Services/Catalog/Catalog.API/CatalogSettings.cs
@@ -6,6 +6,6 @@ public class CatalogSettings
 
         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
@@ -111,14 +111,14 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddTransient<ICatalogIntegrationEventService, CatalogIntegrationEventService>();
 
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IServiceBusPersisterConnection>(sp =>
                 {
                     var settings = sp.GetRequiredService<IOptions<CatalogSettings>>().Value;
                     var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();
 
-                    var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection);
+                    var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);
 
                     return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);
                 });
@@ -198,7 +198,7 @@ private void WaitForSqlAvailability(CatalogContext ctx, ILoggerFactory loggerFac
 
         private void RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {
diff --git 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
@@ -115,13 +115,14 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             var serviceProvider = services.BuildServiceProvider();
             services.AddTransient<IOrderingIntegrationEventService, OrderingIntegrationEventService>();
 
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IServiceBusPersisterConnection>(sp =>
                 {
                     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);
                 });
@@ -192,7 +193,7 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)
 
         private void RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {
diff --git 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"
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ public class BasketSettings`
`6`	`6`
`7`	`7`	`public string EventBusConnection { get; set; }`
`8`	`8`
`9`		`- public string ServiceBusConnection { get; set; }`
	`9`	`+ public string ServiceBusConnectionString { get; set; }`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@ public void ConfigureServices(IServiceCollection services)`
`72`	`72`	`});`
`73`	`73`
`74`	`74`
`75`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`75`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`76`	`76`	`{`
`77`	`77`	`services.AddSingleton<IServiceBusPersisterConnection>(sp =>`
`78`	`78`	`{`
`79`	`79`	`var settings = sp.GetRequiredService<IOptions<BasketSettings>>().Value;`
`80`	`80`	`var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();`
`81`	`81`
`82`		`- var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection);`
	`82`	`+ var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);`
`83`	`83`
`84`	`84`	`return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);`
`85`	`85`	`});`
`@@ -131,7 +131,7 @@ public void ConfigureServices(IServiceCollection services)`
`131`	`131`
`132`	`132`	`private void RegisterServiceBus(IServiceCollection services)`
`133`	`133`	`{`
`134`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`134`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`135`	`135`	`{`
`136`	`136`	`services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>`
`137`	`137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ public class CatalogSettings`
`6`	`6`
`7`	`7`	`public string EventBusConnection { get; set; }`
`8`	`8`
`9`		`- public string ServiceBusConnection { get; set; }`
	`9`	`+ public string ServiceBusConnectionString { get; set; }`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,14 @@ public void ConfigureServices(IServiceCollection services)`
`111`	`111`
`112`	`112`	`services.AddTransient<ICatalogIntegrationEventService, CatalogIntegrationEventService>();`
`113`	`113`
`114`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`114`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`115`	`115`	`{`
`116`	`116`	`services.AddSingleton<IServiceBusPersisterConnection>(sp =>`
`117`	`117`	`{`
`118`	`118`	`var settings = sp.GetRequiredService<IOptions<CatalogSettings>>().Value;`
`119`	`119`	`var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();`
`120`	`120`
`121`		`- var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnection);`
	`121`	`+ var serviceBusConnection = new ServiceBusConnectionStringBuilder(settings.ServiceBusConnectionString);`
`122`	`122`
`123`	`123`	`return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);`
`124`	`124`	`});`
`@@ -198,7 +198,7 @@ private void WaitForSqlAvailability(CatalogContext ctx, ILoggerFactory loggerFac`
`198`	`198`
`199`	`199`	`private void RegisterServiceBus(IServiceCollection services)`
`200`	`200`	`{`
`201`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`201`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`202`	`202`	`{`
`203`	`203`	`services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>`
`204`	`204`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"Microsoft": "Information"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`		`- "ServiceBusConnection": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",`
`13`		`- "AzureServiceBus": "true",`
	`12`	`+ "ServiceBusConnectionString": "Endpoint=sb://eshoponazuretest.servicebus.windows.net/;SharedAccessKeyName=Root;SharedAccessKey=Xo9wlr4bRv5iqTTditgFhTeZqxIpczaAUqfspo+QE/s=;EntityPath=eshop_event_bus",`
	`13`	`+ "AzureServiceBusEnabled": "true",`
`14`	`14`	`"SubscriptionClientName": "Catalog"`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,14 @@ public IServiceProvider ConfigureServices(IServiceCollection services)`
`115`	`115`	`var serviceProvider = services.BuildServiceProvider();`
`116`	`116`	`services.AddTransient<IOrderingIntegrationEventService, OrderingIntegrationEventService>();`
`117`	`117`
`118`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`118`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`119`	`119`	`{`
`120`	`120`	`services.AddSingleton<IServiceBusPersisterConnection>(sp =>`
`121`	`121`	`{`
`122`	`122`	`var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>();`
`123`	`123`
`124`		`- var serviceBusConnection = new ServiceBusConnectionStringBuilder(Configuration["ServiceBusConnection"]);`
	`124`	`+ var serviceBusConnectionString = Configuration["ServiceBusConnectionString"];`
	`125`	`+ var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString);`
`125`	`126`
`126`	`127`	`return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger);`
`127`	`128`	`});`
`@@ -192,7 +193,7 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)`
`192`	`193`
`193`	`194`	`private void RegisterServiceBus(IServiceCollection services)`
`194`	`195`	`{`
`195`		`- if (Configuration.GetValue<bool>("AzureServiceBus"))`
	`196`	`+ if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))`
`196`	`197`	`{`
`197`	`198`	`services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>`
`198`	`199`	`{`