From 0f52b790513d0d2616549c7d73509d2cfd1f80db Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Sun, 6 Mar 2022 21:38:44 -0500 Subject: [PATCH 1/2] fix(aws-alb): destroy r53 record --- builtin/aws/alb/releaser.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/aws/alb/releaser.go b/builtin/aws/alb/releaser.go index 63b57fff942..086207005b3 100644 --- a/builtin/aws/alb/releaser.go +++ b/builtin/aws/alb/releaser.go @@ -649,7 +649,7 @@ func (r *Releaser) resourceRecordSetDestroy( r53 := route53.New(sess) records, err := r53.ListResourceRecordSets(&route53.ListResourceRecordSetsInput{ - HostedZoneId: aws.String(lbState.ZoneId), + HostedZoneId: aws.String(r.config.ZoneId), StartRecordName: aws.String(state.FQDN), StartRecordType: aws.String("A"), MaxItems: aws.String("1"), @@ -671,7 +671,7 @@ func (r *Releaser) resourceRecordSetDestroy( return nil } - log.Debug("removing route53 record", "zone-id", lbState.ZoneId) + log.Debug("removing route53 record", "zone-id", r.config.ZoneId) input := &route53.ChangeResourceRecordSetsInput{ ChangeBatch: &route53.ChangeBatch{ Changes: []*route53.Change{ @@ -690,7 +690,7 @@ func (r *Releaser) resourceRecordSetDestroy( }, Comment: aws.String("managed by waypoint"), }, - HostedZoneId: aws.String(lbState.ZoneId), + HostedZoneId: aws.String(r.config.ZoneId), } result, err := r53.ChangeResourceRecordSets(input) From 621965f09fb17c8343601d72bbad59b478f228b2 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Sun, 6 Mar 2022 21:42:29 -0500 Subject: [PATCH 2/2] add changelog --- .changelog/3076.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3076.txt diff --git a/.changelog/3076.txt b/.changelog/3076.txt new file mode 100644 index 00000000000..96aa2e91398 --- /dev/null +++ b/.changelog/3076.txt @@ -0,0 +1,3 @@ +```release-note:bug +plugin/aws-alb: Use Route53 zone id when destroying a resource record +```