From 0c020cb6e98b37643f69660e91b677fdde37278a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 7 Dec 2022 14:04:04 +0200 Subject: [PATCH] Use EnsureTask to reference shared target groups --- pkg/model/awsmodel/autoscalinggroup.go | 10 +++++++--- upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go | 6 +----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index 698a83b366..b3551251b2 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -480,7 +480,9 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil Shared: fi.PtrTo(true), } t.LoadBalancers = append(t.LoadBalancers, lb) - c.EnsureTask(lb) + if err := c.EnsureTask(lb); err != nil { + return nil, err + } } if extLB.TargetGroupARN != nil { @@ -489,13 +491,15 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil return nil, err } tg := &awstasks.TargetGroup{ - Name: fi.PtrTo(name + "-" + targetGroupName), + Name: fi.PtrTo(targetGroupName), Lifecycle: b.Lifecycle, ARN: extLB.TargetGroupARN, Shared: fi.PtrTo(true), } t.TargetGroups = append(t.TargetGroups, tg) - c.AddTask(tg) + if err := c.EnsureTask(tg); err != nil { + return nil, err + } } } sort.Stable(awstasks.OrderLoadBalancersByName(t.LoadBalancers)) diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go index 064c0eacd9..612ebb16f8 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go @@ -188,11 +188,7 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) { if err != nil { return nil, err } - if targetGroupName != awsup.GetResourceName32(c.Cluster.Name, "tcp") && targetGroupName != awsup.GetResourceName32(c.Cluster.Name, "tls") { - actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(targetGroupName)}) - } else { - actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(fi.ValueOf(g.AutoScalingGroupName) + "-" + targetGroupName)}) - } + actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(targetGroupName)}) } } sort.Stable(OrderTargetGroupsByName(actual.TargetGroups))