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
32 changes: 32 additions & 0 deletions src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,36 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
builder.Resource.Parameters[name] = value;
return builder;
}

/// <summary>
/// Adds a parameter to the bicep template.
/// </summary>
/// <typeparam name="T">The <see cref="AzureBicepResource"/></typeparam>
/// <param name="builder">The resource builder.</param>
/// <param name="name">The name of the input.</param>
/// <param name="value">The value of the parameter.</param>
/// <returns>An <see cref="IResourceBuilder{T}"/>.</returns>
public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> builder, string name, ReferenceExpression value)
where T : AzureBicepResource
{
BicepParameterNameValidator.ThrowIfInvalid(name);
builder.Resource.Parameters[name] = value;
return builder;
}

/// <summary>
/// Adds a parameter to the bicep template.
/// </summary>
/// <typeparam name="T">The <see cref="AzureBicepResource"/></typeparam>
/// <param name="builder">The resource builder.</param>
/// <param name="name">The name of the input.</param>
/// <param name="value">The value of the parameter.</param>
/// <returns>An <see cref="IResourceBuilder{T}"/>.</returns>
public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> builder, string name, EndpointReference value)
where T : AzureBicepResource
{
BicepParameterNameValidator.ThrowIfInvalid(name);
builder.Resource.Parameters[name] = value;
return builder;
}
}
2 changes: 2 additions & 0 deletions src/Aspire.Hosting.Azure/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#nullable enable
static Aspire.Hosting.AzureBicepResourceExtensions.WithParameter<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! name, Aspire.Hosting.ApplicationModel.EndpointReference! value) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
static Aspire.Hosting.AzureBicepResourceExtensions.WithParameter<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! name, Aspire.Hosting.ApplicationModel.ReferenceExpression! value) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
static Aspire.Hosting.AzureConstructResourceExtensions.ConfigureConstruct<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, System.Action<Aspire.Hosting.ResourceModuleConstruct!>! configure) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
15 changes: 13 additions & 2 deletions tests/Aspire.Hosting.Azure.Tests/AzureBicepProvisionerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ public async Task SetParametersTranslatesCompatibleParameterTypes()
{
using var builder = TestDistributedApplicationBuilder.Create();

var container = builder.AddContainer("foo", "image")
.WithHttpEndpoint()
.WithEndpoint("http", e =>
{
e.AllocatedEndpoint = new(e, "localhost", 1023);
});

builder.Configuration["Parameters:param"] = "paramValue";

var connectionStringResource = builder.CreateResourceBuilder(
Expand All @@ -45,18 +52,22 @@ public async Task SetParametersTranslatesCompatibleParameterTypes()
.WithParameter("values", ["a", "b", "c"])
.WithParameter("conn", connectionStringResource)
.WithParameter("jsonObj", new JsonObject { ["key"] = "value" })
.WithParameter("param", param);
.WithParameter("param", param)
.WithParameter("expr", ReferenceExpression.Create($"{param.Resource}/1"))
.WithParameter("endpoint", container.GetEndpoint("http"));

var parameters = new JsonObject();
await BicepProvisioner.SetParametersAsync(parameters, bicep0.Resource);

Assert.Equal(6, parameters.Count);
Assert.Equal(8, parameters.Count);
Assert.Equal("john", parameters["name"]?["value"]?.ToString());
Assert.Equal(20, parameters["age"]?["value"]?.GetValue<int>());
Assert.Equal(["a", "b", "c"], parameters["values"]?["value"]?.AsArray()?.Select(v => v?.ToString()) ?? []);
Assert.Equal("connection string", parameters["conn"]?["value"]?.ToString());
Assert.Equal("value", parameters["jsonObj"]?["value"]?["key"]?.ToString());
Assert.Equal("paramValue", parameters["param"]?["value"]?.ToString());
Assert.Equal("paramValue/1", parameters["expr"]?["value"]?.ToString());
Assert.Equal("http://localhost:1023", parameters["endpoint"]?["value"]?.ToString());
}

[Fact]
Expand Down