environment variable renaming

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; }
     }
 }

src/Services/Basket/Basket.API/Startup.cs

@@ -72,14 +72,14 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             });
 
 
-            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 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 
         private void RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {

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"
 }

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; }
     }
 }

src/Services/Catalog/Catalog.API/Startup.cs

@@ -111,14 +111,14 @@
 
             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 RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {

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"
 }

src/Services/Ordering/Ordering.API/Startup.cs

@@ -115,13 +115,14 @@
             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 @@
 
         private void RegisterServiceBus(IServiceCollection services)
         {
-            if (Configuration.GetValue<bool>("AzureServiceBus"))
+            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
                 services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
                 {

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"
 }