diff --git a/src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs b/src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs index 08acfe6151d..9db95dff2f1 100644 --- a/src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs +++ b/src/Aspire.Hosting.Azure/AzureBicepResourceExtensions.cs @@ -77,7 +77,7 @@ public static BicepSecretOutputReference GetSecretOutput(this IResourceBuilder WithEnvironment(this IResourceBuilder builder, string name, BicepOutputReference bicepOutputReference) where T : IResourceWithEnvironment { - builder.WithResourceRelationship(bicepOutputReference.Resource); + builder.WithReferenceRelationship(bicepOutputReference.Resource); return builder.WithEnvironment(ctx => { @@ -208,7 +208,7 @@ public static IResourceBuilder WithParameter(this IResourceBuilder buil { BicepIdentifierHelpers.ThrowIfInvalid(name); - builder.WithResourceRelationship(value); + builder.WithReferenceRelationship(value); builder.Resource.Parameters[name] = value; return builder; @@ -227,7 +227,7 @@ public static IResourceBuilder WithParameter(this IResourceBuilder buil { BicepIdentifierHelpers.ThrowIfInvalid(name); - builder.WithResourceRelationship(value.Resource); + builder.WithReferenceRelationship(value.Resource); builder.Resource.Parameters[name] = value.Resource; return builder; @@ -246,7 +246,7 @@ public static IResourceBuilder WithParameter(this IResourceBuilder buil { BicepIdentifierHelpers.ThrowIfInvalid(name); - builder.WithResourceRelationship(value.Resource); + builder.WithReferenceRelationship(value.Resource); builder.Resource.Parameters[name] = value; return builder; @@ -265,7 +265,7 @@ public static IResourceBuilder WithParameter(this IResourceBuilder buil { BicepIdentifierHelpers.ThrowIfInvalid(name); - builder.WithResourceRelationship(value); + builder.WithReferenceRelationship(value); builder.Resource.Parameters[name] = value; return builder; @@ -284,7 +284,7 @@ public static IResourceBuilder WithParameter(this IResourceBuilder buil { BicepIdentifierHelpers.ThrowIfInvalid(name); - builder.WithResourceRelationship(value.Resource); + builder.WithReferenceRelationship(value.Resource); builder.Resource.Parameters[name] = value; return builder; diff --git a/src/Aspire.Hosting/ConnectionStringBuilderExtensions.cs b/src/Aspire.Hosting/ConnectionStringBuilderExtensions.cs index d6dd087c7d9..a0a5cc5e54b 100644 --- a/src/Aspire.Hosting/ConnectionStringBuilderExtensions.cs +++ b/src/Aspire.Hosting/ConnectionStringBuilderExtensions.cs @@ -39,7 +39,7 @@ public static IResourceBuilder AddConnectionString(thi { var cs = new ConnectionStringResource(name, connectionStringExpression); return builder.AddResource(cs) - .WithResourceRelationship(connectionStringExpression) + .WithReferenceRelationship(connectionStringExpression) .WithInitialState(new CustomResourceSnapshot { ResourceType = "ConnectionString", diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs index 4e65e4bf098..2db159aeea4 100644 --- a/src/Aspire.Hosting/ResourceBuilderExtensions.cs +++ b/src/Aspire.Hosting/ResourceBuilderExtensions.cs @@ -52,7 +52,7 @@ public static IResourceBuilder WithEnvironment(this IResourceBuilder bu var expression = value.GetExpression(); - builder.WithResourceRelationship(expression); + builder.WithReferenceRelationship(expression); return builder.WithEnvironment(context => { @@ -75,7 +75,7 @@ public static IResourceBuilder WithEnvironment(this IResourceBuilder bu ArgumentNullException.ThrowIfNull(name); ArgumentNullException.ThrowIfNull(value); - builder.WithResourceRelationship(value); + builder.WithReferenceRelationship(value); return builder.WithEnvironment(context => { @@ -144,7 +144,7 @@ public static IResourceBuilder WithEnvironment(this IResourceBuilder bu ArgumentNullException.ThrowIfNull(name); ArgumentNullException.ThrowIfNull(endpointReference); - builder.WithResourceRelationship(endpointReference.Resource); + builder.WithReferenceRelationship(endpointReference.Resource); return builder.WithEnvironment(context => { @@ -166,7 +166,7 @@ public static IResourceBuilder WithEnvironment(this IResourceBuilder bu ArgumentNullException.ThrowIfNull(name); ArgumentNullException.ThrowIfNull(parameter); - builder.WithResourceRelationship(parameter.Resource); + builder.WithReferenceRelationship(parameter.Resource); return builder.WithEnvironment(context => { @@ -192,7 +192,7 @@ public static IResourceBuilder WithEnvironment( ArgumentNullException.ThrowIfNull(envVarName); ArgumentNullException.ThrowIfNull(resource); - builder.WithResourceRelationship(resource.Resource); + builder.WithReferenceRelationship(resource.Resource); return builder.WithEnvironment(context => { @@ -363,7 +363,7 @@ public static IResourceBuilder WithReference(this IR var resource = source.Resource; connectionName ??= resource.Name; - builder.WithResourceRelationship(resource); + builder.WithReferenceRelationship(resource); return builder.WithEnvironment(context => { @@ -469,7 +469,7 @@ private static void ApplyEndpoints(this IResourceBuilder builder, IResourc endpointReferenceAnnotation.EndpointNames.Add(endpointName); } - builder.WithResourceRelationship(resourceWithEndpoints); + builder.WithReferenceRelationship(resourceWithEndpoints); } /// @@ -1679,7 +1679,7 @@ public static IResourceBuilder WithRelationship( /// The resource builder. /// The resource that the relationship is to. /// A resource builder. - public static IResourceBuilder WithResourceRelationship( + public static IResourceBuilder WithReferenceRelationship( this IResourceBuilder builder, IResource resource) where T : IResource { @@ -1696,7 +1696,7 @@ public static IResourceBuilder WithResourceRelationship( /// The resource builder. /// The reference expression. /// A resource builder. - public static IResourceBuilder WithResourceRelationship( + public static IResourceBuilder WithReferenceRelationship( this IResourceBuilder builder, ReferenceExpression expression) where T : IResource { @@ -1715,7 +1715,7 @@ private static void WalkAndLinkResourceReferences(IResourceBuilder builder void AddReference(IResource resource) { - builder.WithResourceRelationship(resource); + builder.WithReferenceRelationship(resource); } void Walk(object value) @@ -1755,7 +1755,7 @@ void Walk(object value) /// The resource builder. /// The resource builder that the relationship is to. /// A resource builder. - public static IResourceBuilder WithResourceRelationship( + public static IResourceBuilder WithReferenceRelationship( this IResourceBuilder builder, IResourceBuilder resourceBuilder) where T : IResource {