Skip to content

Resolve DistributedApplicationResourceBuilder<ResourceWithConnectionStringSurrogate> correctly in args evaluation #7716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2025
Merged

Resolve DistributedApplicationResourceBuilder<ResourceWithConnectionStringSurrogate> correctly in args evaluation #7716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad92cf8
Resolve DistributedApplicationResourceBuilder<ResourceWithConnectionS…
Feb 20, 2025
7b24b66
Add test for special cases in ProcessArgumentValuesAsync
Feb 20, 2025
c203e2a
fix test
Feb 20, 2025
bb7d292
add AddExecutable case invoked with args
Feb 21, 2025
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
1 change: 1 addition & 0 deletions src/Aspire.Hosting/ApplicationModel/ResourceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ internal static async ValueTask ProcessArgumentValuesAsync(
(_, string s) => new(s, false),
(DistributedApplicationOperation.Run, IValueProvider provider) => await GetValue(key: null, provider, logger, resource.IsContainer(), containerHostName, cancellationToken).ConfigureAwait(false),
(DistributedApplicationOperation.Run, DistributedApplicationResourceBuilder<ParameterResource> parameterResourceBuilder) => await GetValue(key: null, parameterResourceBuilder.Resource, logger, resource.IsContainer(), containerHostName, cancellationToken).ConfigureAwait(false),
(DistributedApplicationOperation.Run, DistributedApplicationResourceBuilder<ResourceWithConnectionStringSurrogate> connectionStringSurrogateBuilder) => await GetValue(key: null, connectionStringSurrogateBuilder.Resource, logger, resource.IsContainer(), containerHostName, cancellationToken).ConfigureAwait(false),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do this in a much better way and consistent, way, but we can do that post 9.1

(DistributedApplicationOperation.Publish, IManifestExpressionProvider provider) => new(provider.ValueExpression, false),
(_, { } o) => new(o.ToString(), false),
(_, null) => new(null, false),
Expand Down
29 changes: 29 additions & 0 deletions tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,35 @@ public async Task GetEnvironmentVariableValuesAsyncReturnCorrectVariablesUsingMa
});
}

[Fact]
public async Task GetArgumentValuesAsync_ReturnsCorrectValuesForSpecialCases()
{
var builder = DistributedApplication.CreateBuilder();
var surrogate = builder.AddResource(new ResourceWithConnectionStringSurrogate("ResourceWithConnectionStringSurrogate", _ => "ConnectionString", null));
var secretParameter = builder.AddResource(new ParameterResource("SecretParameter", _ => "SecretParameter", true));
var nonSecretParameter = builder.AddResource(new ParameterResource("NonSecretParameter", _ => "NonSecretParameter"));

var containerArgs = await builder.AddContainer("elasticsearch", "library/elasticsearch", "8.14.0")
.WithArgs(surrogate)
.WithArgs(secretParameter)
.WithArgs(nonSecretParameter)
.Resource.GetArgumentValuesAsync().DefaultTimeout();

Assert.Equal<IEnumerable<string>>(["ConnectionString", "SecretParameter", "NonSecretParameter"], containerArgs);

// Executables can also have arguments passed in AddExecutable
var executableArgs = await builder.AddExecutable(
"ping",
"ping",
string.Empty,
surrogate,
secretParameter,
nonSecretParameter)
.Resource.GetArgumentValuesAsync().DefaultTimeout();

Assert.Equal<IEnumerable<string>>(["ConnectionString", "SecretParameter", "NonSecretParameter"], executableArgs);
}

private sealed class ParentResource(string name) : Resource(name)
{

Expand Down