r/aws_route53_record: Ignore InvalidChangeBatch errors on Delete

[ewbankkit]

Description

Restore pre-AWS SDK for Go v2 migration behavior.

terraform-provider-aws/internal/service/route53/record.go

Lines 736 to 761 in f00a844

	// Change batch for deleting
	changeBatch := &route53.ChangeBatch{
	Comment: aws.String("Deleted by Terraform"),
	Changes: []*route53.Change{
	{
	Action: aws.String(route53.ChangeActionDelete),
	ResourceRecordSet: rec,
	},
	},
	}
	input := &route53.ChangeResourceRecordSetsInput{
	ChangeBatch: changeBatch,
	HostedZoneId: aws.String(zoneID),
	}
	respRaw, err := DeleteRecordSet(ctx, conn, input)
	if err != nil {
	return sdkdiag.AppendErrorf(diags, "deleting Route 53 Record (%s): %s", d.Id(), err)
	}
	changeInfo := respRaw.(*route53.ChangeResourceRecordSetsOutput).ChangeInfo
	if changeInfo == nil {
	log.Printf("[INFO] No ChangeInfo Found. Waiting for Sync not required")
	return diags
	}

terraform-provider-aws/internal/service/route53/record.go

Lines 865 to 872 in f00a844

	func DeleteRecordSet(ctx context.Context, conn *route53.Route53, input *route53.ChangeResourceRecordSetsInput) (interface{}, error) {
	out, err := conn.ChangeResourceRecordSetsWithContext(ctx, input)
	if tfawserr.ErrCodeEquals(err, route53.ErrCodeInvalidChangeBatch) {
	return out, nil
	}
	return out, err
	}

Relations

Closes #37806.
Relates #37510.

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccRoute53Record_disappears\|TestAccRoute53Record_Disappears_multipleRecords\|TestAccRoute53Record_basic' PKG=route53        
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.2 test ./internal/service/route53/... -v -count 1 -parallel 20  -run=TestAccRoute53Record_disappears\|TestAccRoute53Record_Disappears_multipleRecords\|TestAccRoute53Record_basic -timeout 360m
=== RUN   TestAccRoute53Record_basic
=== PAUSE TestAccRoute53Record_basic
=== RUN   TestAccRoute53Record_disappears
=== PAUSE TestAccRoute53Record_disappears
=== RUN   TestAccRoute53Record_Disappears_multipleRecords
=== PAUSE TestAccRoute53Record_Disappears_multipleRecords
=== CONT  TestAccRoute53Record_basic
=== CONT  TestAccRoute53Record_Disappears_multipleRecords
=== CONT  TestAccRoute53Record_disappears
--- PASS: TestAccRoute53Record_disappears (187.60s)
--- PASS: TestAccRoute53Record_basic (203.94s)
--- PASS: TestAccRoute53Record_Disappears_multipleRecords (277.59s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/route53	281.939s

[github-actions]

Community Note

Voting for Prioritization

• Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
• Please see our prioritization guide for information on how we prioritize.
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

[github-actions]

This functionality has been released in v5.53.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.