Skip to content

Commit

Permalink
Fix issue with duplicate entry in manifest for AWS CloudFormation ref…
Browse files Browse the repository at this point in the history
…erence (#5748)
  • Loading branch information
normj committed Sep 17, 2024
1 parent 8fd65d2 commit a8b0bed
Showing 1 changed file with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ public static StackOutputReference GetOutput(this IResourceBuilder<ICloudFormati
public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, StackOutputReference stackOutputReference)
where T : IResourceWithEnvironment
{
stackOutputReference.Resource.Annotations.Add(new CloudFormationReferenceAnnotation(builder.Resource.Name));
if (!stackOutputReference.Resource.Annotations.Any(x => x is CloudFormationReferenceAnnotation cf && string.Equals(cf.TargetResource, builder.Resource.Name, StringComparison.Ordinal)))
{
stackOutputReference.Resource.Annotations.Add(new CloudFormationReferenceAnnotation(builder.Resource.Name));
}

return builder.WithEnvironment(async ctx =>
{
Expand Down Expand Up @@ -149,7 +152,10 @@ public static IResourceBuilder<TDestination> WithReference<TDestination>(this IR
public static IResourceBuilder<TDestination> WithReference<TDestination>(this IResourceBuilder<TDestination> builder, IResourceBuilder<ICloudFormationResource> cloudFormationResourceBuilder, string configSection = Constants.DefaultConfigSection)
where TDestination : IResourceWithEnvironment
{
cloudFormationResourceBuilder.WithAnnotation(new CloudFormationReferenceAnnotation(builder.Resource.Name));
if (!cloudFormationResourceBuilder.Resource.Annotations.Any(x => x is CloudFormationReferenceAnnotation cf && string.Equals(cf.TargetResource, builder.Resource.Name, StringComparison.Ordinal)))
{
cloudFormationResourceBuilder.WithAnnotation(new CloudFormationReferenceAnnotation(builder.Resource.Name));
}

builder.WithEnvironment(async ctx =>
{
Expand Down

0 comments on commit a8b0bed

Please sign in to comment.