Skip to content

Rename resource relationship methods to reference relationship for consistency #8432

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 2 commits into from
Mar 31, 2025
Merged

Rename resource relationship methods to reference relationship for consistency #8432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafaea7
Rename resource relationship methods to reference relationship for co…
davidfowl Mar 31, 2025
abe846b
Rename resource relationship method to reference relationship for con…
davidfowl Mar 31, 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
12 changes: 6 additions & 6 deletions src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static BicepSecretOutputReference GetSecretOutput(this IResourceBuilder<A
public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, BicepOutputReference bicepOutputReference)
where T : IResourceWithEnvironment
{
builder.WithResourceRelationship(bicepOutputReference.Resource);
builder.WithReferenceRelationship(bicepOutputReference.Resource);

return builder.WithEnvironment(ctx =>
{
Expand Down Expand Up @@ -208,7 +208,7 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
{
BicepIdentifierHelpers.ThrowIfInvalid(name);

builder.WithResourceRelationship(value);
builder.WithReferenceRelationship(value);

builder.Resource.Parameters[name] = value;
return builder;
Expand All @@ -227,7 +227,7 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
{
BicepIdentifierHelpers.ThrowIfInvalid(name);

builder.WithResourceRelationship(value.Resource);
builder.WithReferenceRelationship(value.Resource);

builder.Resource.Parameters[name] = value.Resource;
return builder;
Expand All @@ -246,7 +246,7 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
{
BicepIdentifierHelpers.ThrowIfInvalid(name);

builder.WithResourceRelationship(value.Resource);
builder.WithReferenceRelationship(value.Resource);

builder.Resource.Parameters[name] = value;
return builder;
Expand All @@ -265,7 +265,7 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
{
BicepIdentifierHelpers.ThrowIfInvalid(name);

builder.WithResourceRelationship(value);
builder.WithReferenceRelationship(value);

builder.Resource.Parameters[name] = value;
return builder;
Expand All @@ -284,7 +284,7 @@ public static IResourceBuilder<T> WithParameter<T>(this IResourceBuilder<T> buil
{
BicepIdentifierHelpers.ThrowIfInvalid(name);

builder.WithResourceRelationship(value.Resource);
builder.WithReferenceRelationship(value.Resource);

builder.Resource.Parameters[name] = value;
return builder;
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting/ConnectionStringBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static IResourceBuilder<ConnectionStringResource> AddConnectionString(thi
{
var cs = new ConnectionStringResource(name, connectionStringExpression);
return builder.AddResource(cs)
.WithResourceRelationship(connectionStringExpression)
.WithReferenceRelationship(connectionStringExpression)
.WithInitialState(new CustomResourceSnapshot
{
ResourceType = "ConnectionString",
Expand Down
22 changes: 11 additions & 11 deletions src/Aspire.Hosting/ResourceBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu

var expression = value.GetExpression();

builder.WithResourceRelationship(expression);
builder.WithReferenceRelationship(expression);

return builder.WithEnvironment(context =>
{
Expand All @@ -75,7 +75,7 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
ArgumentNullException.ThrowIfNull(name);
ArgumentNullException.ThrowIfNull(value);

builder.WithResourceRelationship(value);
builder.WithReferenceRelationship(value);

return builder.WithEnvironment(context =>
{
Expand Down Expand Up @@ -144,7 +144,7 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
ArgumentNullException.ThrowIfNull(name);
ArgumentNullException.ThrowIfNull(endpointReference);

builder.WithResourceRelationship(endpointReference.Resource);
builder.WithReferenceRelationship(endpointReference.Resource);

return builder.WithEnvironment(context =>
{
Expand All @@ -166,7 +166,7 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
ArgumentNullException.ThrowIfNull(name);
ArgumentNullException.ThrowIfNull(parameter);

builder.WithResourceRelationship(parameter.Resource);
builder.WithReferenceRelationship(parameter.Resource);

return builder.WithEnvironment(context =>
{
Expand All @@ -192,7 +192,7 @@ public static IResourceBuilder<T> WithEnvironment<T>(
ArgumentNullException.ThrowIfNull(envVarName);
ArgumentNullException.ThrowIfNull(resource);

builder.WithResourceRelationship(resource.Resource);
builder.WithReferenceRelationship(resource.Resource);

return builder.WithEnvironment(context =>
{
Expand Down Expand Up @@ -363,7 +363,7 @@ public static IResourceBuilder<TDestination> WithReference<TDestination>(this IR
var resource = source.Resource;
connectionName ??= resource.Name;

builder.WithResourceRelationship(resource);
builder.WithReferenceRelationship(resource);

return builder.WithEnvironment(context =>
{
Expand Down Expand Up @@ -469,7 +469,7 @@ private static void ApplyEndpoints<T>(this IResourceBuilder<T> builder, IResourc
endpointReferenceAnnotation.EndpointNames.Add(endpointName);
}

builder.WithResourceRelationship(resourceWithEndpoints);
builder.WithReferenceRelationship(resourceWithEndpoints);
}

/// <summary>
Expand Down Expand Up @@ -1679,7 +1679,7 @@ public static IResourceBuilder<T> WithRelationship<T>(
/// <param name="builder">The resource builder.</param>
/// <param name="resource">The resource that the relationship is to.</param>
/// <returns>A resource builder.</returns>
public static IResourceBuilder<T> WithResourceRelationship<T>(
public static IResourceBuilder<T> WithReferenceRelationship<T>(
this IResourceBuilder<T> builder,
IResource resource) where T : IResource
{
Expand All @@ -1696,7 +1696,7 @@ public static IResourceBuilder<T> WithResourceRelationship<T>(
/// <param name="builder">The resource builder.</param>
/// <param name="expression">The reference expression.</param>
/// <returns>A resource builder.</returns>
public static IResourceBuilder<T> WithResourceRelationship<T>(
public static IResourceBuilder<T> WithReferenceRelationship<T>(
this IResourceBuilder<T> builder,
ReferenceExpression expression) where T : IResource
{
Expand All @@ -1715,7 +1715,7 @@ private static void WalkAndLinkResourceReferences<T>(IResourceBuilder<T> builder

void AddReference(IResource resource)
{
builder.WithResourceRelationship(resource);
builder.WithReferenceRelationship(resource);
}

void Walk(object value)
Expand Down Expand Up @@ -1755,7 +1755,7 @@ void Walk(object value)
/// <param name="builder">The resource builder.</param>
/// <param name="resourceBuilder">The resource builder that the relationship is to.</param>
/// <returns>A resource builder.</returns>
public static IResourceBuilder<T> WithResourceRelationship<T>(
public static IResourceBuilder<T> WithReferenceRelationship<T>(
this IResourceBuilder<T> builder,
IResourceBuilder<IResource> resourceBuilder) where T : IResource
{
Expand Down
Loading