From 9549786003d723493d865ba83420ed127bc34d53 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Sat, 27 May 2017 18:33:38 +0200 Subject: [PATCH 01/10] Remove basket.data from docker-compose --- docker-compose.override.yml | 1 - docker-compose.prod.yml | 1 - docker-compose.yml | 6 ------ 3 files changed, 8 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 04d1c4d9c..e7d1072ee 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,7 +12,6 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=basket.data - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c5d8839ea..35fa2473c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -17,7 +17,6 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=basket.data - identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.yml b/docker-compose.yml index 09212da8e..1af3b4787 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: context: ./src/Services/Basket/Basket.API dockerfile: Dockerfile depends_on: - - basket.data - identity.api - rabbitmq @@ -59,11 +58,6 @@ services: sql.data: image: microsoft/mssql-server-linux - basket.data: - image: redis - ports: - - "6379:6379" - rabbitmq: image: rabbitmq ports: From b30d09fbf50e2160710d0107cf203f02333b68e9 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Sat, 27 May 2017 18:34:36 +0200 Subject: [PATCH 02/10] Add Redis connectionString to environment variable --- src/Services/Basket/Basket.API/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index 31f76d0d0..a44967e59 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -8,5 +8,5 @@ } }, "IdentityUrl": "http://localhost:5105", - "ConnectionString": "127.0.0.1" + "ConnectionString": "eshoponazure.redis.cache.windows.net:6379,password=I9t4YmytcxvAjThGz98oUbfcI0Zcu7sIB2nhmmDxjVo=,ssl=false,abortConnect=false" } From c23d2551cde82bb0fdc7e8e74cedcd352c01e1cc Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Sat, 27 May 2017 18:35:28 +0200 Subject: [PATCH 03/10] Add new redis connection getting data from environment variable --- .../Basket.API/Model/RedisBasketRepository.cs | 24 +++++-------------- src/Services/Basket/Basket.API/Startup.cs | 11 ++++----- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs b/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs index 4ca90f383..e896c0773 100644 --- a/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs +++ b/src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs @@ -4,7 +4,6 @@ using Newtonsoft.Json; using StackExchange.Redis; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Threading.Tasks; namespace Microsoft.eShopOnContainers.Services.Basket.API.Model @@ -16,12 +15,10 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model private ConnectionMultiplexer _redis; - public RedisBasketRepository(IOptionsSnapshot options, ILoggerFactory loggerFactory) { _settings = options.Value; _logger = loggerFactory.CreateLogger(); - } public async Task DeleteBasketAsync(string id) @@ -93,21 +90,12 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model } private async Task ConnectToRedisAsync() - { - // TODO: Need to make this more robust. ConnectionMultiplexer.ConnectAsync doesn't like domain names or IPv6 addresses. - if (IPAddress.TryParse(_settings.ConnectionString, out var ip)) - { - _redis = await ConnectionMultiplexer.ConnectAsync(ip.ToString()); - _logger.LogInformation($"Connecting to database at {_settings.ConnectionString}"); - } - else - { - // workaround for https://github.com/StackExchange/StackExchange.Redis/issues/410 - var ips = await Dns.GetHostAddressesAsync(_settings.ConnectionString); - _logger.LogInformation($"Connecting to database {_settings.ConnectionString} at IP {ips.First().ToString()}"); - _redis = await ConnectionMultiplexer.ConnectAsync(ips.First().ToString()); - } + { + var configuration = ConfigurationOptions.Parse(_settings.ConnectionString, true); + configuration.ResolveDns = true; + + _logger.LogInformation($"Connecting to database {configuration.SslHost}."); + _redis = await ConnectionMultiplexer.ConnectAsync(configuration); } - } } diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 855312a65..8f3735310 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -16,11 +16,8 @@ using Microsoft.Extensions.HealthChecks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using RabbitMQ.Client; -using StackExchange.Redis; -using System.Linq; -using System.Net; using System.Threading.Tasks; -using System; +using StackExchange.Redis; namespace Microsoft.eShopOnContainers.Services.Basket.API { @@ -64,12 +61,12 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; - var ips = Dns.GetHostAddressesAsync(settings.ConnectionString).Result; + var configuration = ConfigurationOptions.Parse(settings.ConnectionString, true); + configuration.ResolveDns = true; - return ConnectionMultiplexer.Connect(ips.First().ToString()); + return ConnectionMultiplexer.Connect(configuration); }); - services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; From cd790f276f6a6710c788a42a4ac8f396c836393f Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Sat, 27 May 2017 18:35:44 +0200 Subject: [PATCH 04/10] Update StackExchange.Redis version --- src/Services/Basket/Basket.API/Basket.API.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index b3ba97b10..5f8765f40 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -22,6 +22,7 @@ + @@ -33,7 +34,6 @@ - From db7d2a3ff3d066d02599a1753d8b7af4865142bb Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 29 May 2017 11:01:56 +0200 Subject: [PATCH 05/10] Add "AzureRedisConnectionString" environment variable and add a connectionString condition when "AzureRedisEnabled" environment variable is true --- src/Services/Basket/Basket.API/Startup.cs | 7 ++++++- src/Services/Basket/Basket.API/appsettings.json | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 8f3735310..f2f5afc91 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -61,7 +61,12 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; - var configuration = ConfigurationOptions.Parse(settings.ConnectionString, true); + if (Configuration.GetValue("AzureRedisEnabled")) + { + settings.ConnectionString = Configuration["AzureRedisConnectionString"]; + } + + ConfigurationOptions configuration = ConfigurationOptions.Parse(settings.ConnectionString, true); configuration.ResolveDns = true; return ConnectionMultiplexer.Connect(configuration); diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index a44967e59..43f70e202 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -8,5 +8,7 @@ } }, "IdentityUrl": "http://localhost:5105", - "ConnectionString": "eshoponazure.redis.cache.windows.net:6379,password=I9t4YmytcxvAjThGz98oUbfcI0Zcu7sIB2nhmmDxjVo=,ssl=false,abortConnect=false" + "ConnectionString": "127.0.0.1", + "AzureRedisConnectionString": "eshoponazure.redis.cache.windows.net:6379,password=I9t4YmytcxvAjThGz98oUbfcI0Zcu7sIB2nhmmDxjVo=,ssl=false,abortConnect=false", + "AzureRedisEnabled": "true" } From 60c08ce9c599f57fabbeebf0b581918fd0361329 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 29 May 2017 11:06:22 +0200 Subject: [PATCH 06/10] Revert "Remove basket.data from docker-compose" This reverts commit 9549786003d723493d865ba83420ed127bc34d53. --- docker-compose.override.yml | 1 + docker-compose.prod.yml | 1 + docker-compose.yml | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e7d1072ee..04d1c4d9c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,6 +12,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 + - ConnectionString=basket.data - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 35fa2473c..c5d8839ea 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -17,6 +17,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 + - ConnectionString=basket.data - identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.yml b/docker-compose.yml index 1af3b4787..09212da8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: context: ./src/Services/Basket/Basket.API dockerfile: Dockerfile depends_on: + - basket.data - identity.api - rabbitmq @@ -58,6 +59,11 @@ services: sql.data: image: microsoft/mssql-server-linux + basket.data: + image: redis + ports: + - "6379:6379" + rabbitmq: image: rabbitmq ports: From 0473a972252a4f164d724437c634cd02793b5947 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 29 May 2017 12:42:51 +0200 Subject: [PATCH 07/10] change the "AzureRedisEnabled" condition to configure declaration --- src/Services/Basket/Basket.API/Startup.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index f2f5afc91..79adb1618 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -50,7 +50,14 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API options.Filters.Add(typeof(HttpGlobalExceptionFilter)); }).AddControllersAsServices(); - services.Configure(Configuration); + services.Configure(options => + { + Configuration.Bind(options); + if (Configuration.GetValue("AzureRedisEnabled")) + { + options.ConnectionString = Configuration["AzureRedisConnectionString"]; + } + }); //By connecting here we are making sure that our service //cannot start until redis is ready. This might slow down startup, @@ -61,11 +68,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; - if (Configuration.GetValue("AzureRedisEnabled")) - { - settings.ConnectionString = Configuration["AzureRedisConnectionString"]; - } - ConfigurationOptions configuration = ConfigurationOptions.Parse(settings.ConnectionString, true); configuration.ResolveDns = true; From e309d97d18c53959ce94a636e7ea1905564ed14d Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 29 May 2017 16:03:51 +0200 Subject: [PATCH 08/10] remove AzureRedisConnectionString variable from settings --- src/Services/Basket/Basket.API/appsettings.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index 43f70e202..3a5b1b0b9 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -7,8 +7,5 @@ "Microsoft": "Information" } }, - "IdentityUrl": "http://localhost:5105", - "ConnectionString": "127.0.0.1", - "AzureRedisConnectionString": "eshoponazure.redis.cache.windows.net:6379,password=I9t4YmytcxvAjThGz98oUbfcI0Zcu7sIB2nhmmDxjVo=,ssl=false,abortConnect=false", - "AzureRedisEnabled": "true" + "IdentityUrl": "http://localhost:5105" } From 6b480e3d41f6eaaf8737ff20752dd624c6007185 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 29 May 2017 16:04:35 +0200 Subject: [PATCH 09/10] Apply ConnectionString changes (remove condition) --- src/Services/Basket/Basket.API/Startup.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 79adb1618..dd20b9353 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -50,14 +50,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API options.Filters.Add(typeof(HttpGlobalExceptionFilter)); }).AddControllersAsServices(); - services.Configure(options => - { - Configuration.Bind(options); - if (Configuration.GetValue("AzureRedisEnabled")) - { - options.ConnectionString = Configuration["AzureRedisConnectionString"]; - } - }); + services.Configure(Configuration); //By connecting here we are making sure that our service //cannot start until redis is ready. This might slow down startup, From 2cad62d642905979f3f9be9ded769d966c230548 Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Tue, 30 May 2017 17:30:01 +0200 Subject: [PATCH 10/10] Add ESHOP_AZURE_REDIS variable from .env with default value --- docker-compose.override.yml | 4 ++-- docker-compose.prod.yml | 4 ++-- docker-compose.vs.debug.yml | 2 +- docker-compose.vs.release.yml | 2 +- docker-compose.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 04d1c4d9c..c5666d6fa 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: @@ -12,7 +12,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=basket.data + - ConnectionString=${ESHOP_AZURE_REDIS:-basket.data} - identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c5d8839ea..739d4f218 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' # The Production docker-compose file has to have the external/real IPs or DNS names for the services # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: @@ -17,7 +17,7 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 - - ConnectionString=basket.data + - ConnectionString=${ESHOP_AZURE_REDIS:-basket.data} - identityUrl=http://identity.api #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. - EventBusConnection=rabbitmq ports: diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml index 2e7145637..413940bef 100644 --- a/docker-compose.vs.debug.yml +++ b/docker-compose.vs.debug.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' services: basket.api: diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml index d1ca5b2c6..6637b71b5 100644 --- a/docker-compose.vs.release.yml +++ b/docker-compose.vs.release.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' services: basket.api: diff --git a/docker-compose.yml b/docker-compose.yml index 09212da8e..6a0953706 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2' +version: '2.1' services: basket.api: