Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,

// DbGate assumes Redis is being accessed over a default Aspire container network and hardcodes the resource address
var redisUrl = redisResource.PasswordParameter is not null ?
ReferenceExpression.Create($"redis://:{redisResource.PasswordParameter}@{name}:{redisResource.PrimaryEndpoint.TargetPort?.ToString()}") :
ReferenceExpression.Create($"redis://{name}:{redisResource.PrimaryEndpoint.TargetPort?.ToString()}");
ReferenceExpression.Create($"rediss://:{redisResource.PasswordParameter}@{name}:{redisResource.PrimaryEndpoint.TargetPort?.ToString()}") :
ReferenceExpression.Create($"rediss://{name}:{redisResource.PrimaryEndpoint.TargetPort?.ToString()}");
Comment on lines 123 to +126

context.EnvironmentVariables.Add(label, name);
context.EnvironmentVariables.Add($"URL_{connectionId}", redisUrl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
{
var expectedRedisUrl = redisResource1.PasswordParameter switch
{
IValueProvider parameter => $"redis://:{await parameter.GetValueAsync(default)}@{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}",
_ => $"redis://{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}"
IValueProvider parameter => $"rediss://:{await parameter.GetValueAsync(default)}@{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}",
_ => $"rediss://{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}"
};
Assert.Equal("URL_redis1", item.Key);
Assert.Equal(expectedRedisUrl, item.Value);
Expand All @@ -382,8 +382,8 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
{
var expectedRedisUrl = redisResource2.PasswordParameter switch
{
IValueProvider parameter => $"redis://:{await parameter.GetValueAsync(default)}@{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}",
_ => $"redis://{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}"
IValueProvider parameter => $"rediss://:{await parameter.GetValueAsync(default)}@{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}",
_ => $"rediss://{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}"
};
Assert.Equal("URL_redis2", item.Key);
Assert.Equal(expectedRedisUrl, item.Value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task WithDbGateAddsAnnotations()
async item =>
{
var redisUrl = redisResource.PasswordParameter is not null ?
$"redis://:{await redisResource.PasswordParameter.GetValueAsync(default)}@{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}" : $"redis://{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}";
$"rediss://:{await redisResource.PasswordParameter.GetValueAsync(default)}@{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}" : $"rediss://{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}";
Assert.Equal("URL_redis", item.Key);
Assert.Equal(redisUrl, item.Value);
},
Expand Down Expand Up @@ -152,7 +152,7 @@ public async Task WithDbGateAddsAnnotationsForMultipleRedisResource()
async item =>
{
var redisUrl = redisResource1.PasswordParameter is not null ?
$"redis://:{await redisResource1.PasswordParameter.GetValueAsync(default)}@{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}" : $"redis://{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}";
$"rediss://:{await redisResource1.PasswordParameter.GetValueAsync(default)}@{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}" : $"rediss://{redisResource1.Name}:{redisResource1.PrimaryEndpoint.TargetPort}";

Assert.Equal("URL_redis1", item.Key);
Assert.Equal(redisUrl, item.Value);
Expand All @@ -170,7 +170,7 @@ public async Task WithDbGateAddsAnnotationsForMultipleRedisResource()
async item =>
{
var redisUrl = redisResource2.PasswordParameter is not null ?
$"redis://:{await redisResource2.PasswordParameter.GetValueAsync(default)}@{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}" : $"redis://{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}";
$"rediss://:{await redisResource2.PasswordParameter.GetValueAsync(default)}@{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}" : $"rediss://{redisResource2.Name}:{redisResource2.PrimaryEndpoint.TargetPort}";

Assert.Equal("URL_redis2", item.Key);
Assert.Equal(redisUrl, item.Value);
Expand Down
Loading