Skip to content

[bugfix] aws_route53_zone: Enable accelerated recovery when multiple zones are configured #45457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewbankkit merged 3 commits into from
Dec 8, 2025
+38 −35
Merged

[bugfix] aws_route53_zone: Enable accelerated recovery when multiple zones are configured #45457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1286bb7
Use GlobalMutexKV mechanism
tabito-hara Dec 5, 2025
0336c80
Update the acctest for accelerated recovery with multiple zones
tabito-hara Dec 5, 2025
27f5083
add changelog
tabito-hara Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/45457.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_route53_zone: Operations to enable accelerated recovery are enforced to run serially when multiple hosted zones are configured
```
5 changes: 5 additions & 0 deletions internal/service/route53/zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@ func resourceZoneDelete(ctx context.Context, d *schema.ResourceData, meta any) d
}

func updateEnableAcceleratedRecovery(ctx context.Context, conn *route53.Client, zoneID string, enabled bool, timeout time.Duration) error {
const zoneMutexKey = "aws_route53_zone_accelerated_recovery"

conns.GlobalMutexKV.Lock(zoneMutexKey)
defer conns.GlobalMutexKV.Unlock(zoneMutexKey)

input := route53.UpdateHostedZoneFeaturesInput{
HostedZoneId: aws.String(zoneID),
EnableAcceleratedRecovery: aws.Bool(enabled),
Expand Down
65 changes: 30 additions & 35 deletions internal/service/route53/zone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,11 @@ func TestAccRoute53Zone_escapedSpace(t *testing.T) {

func TestAccRoute53Zone_enableAcceleratedRecovery(t *testing.T) {
ctx := acctest.Context(t)
var zone route53.GetHostedZoneOutput
resourceName := "aws_route53_zone.test"
zoneName := acctest.RandomDomainName()
var zone1, zone2 route53.GetHostedZoneOutput
resourceName1 := "aws_route53_zone.test1"
resourceName2 := "aws_route53_zone.test2"
zoneName1 := acctest.RandomDomainName()
zoneName2 := acctest.RandomDomainName()

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t) },
Expand All @@ -556,51 +558,39 @@ func TestAccRoute53Zone_enableAcceleratedRecovery(t *testing.T) {
CheckDestroy: testAccCheckZoneDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName, true),
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName1, zoneName2, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckZoneExists(ctx, resourceName, &zone),
acctest.MatchResourceAttrGlobalARNNoAccount(resourceName, names.AttrARN, "route53", regexache.MustCompile("hostedzone/.+")),
resource.TestCheckResourceAttr(resourceName, names.AttrName, zoneName),
resource.TestCheckResourceAttr(resourceName, "name_servers.#", "4"),
resource.TestCheckResourceAttrSet(resourceName, "primary_name_server"),
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"),
resource.TestCheckResourceAttr(resourceName, "vpc.#", "0"),
resource.TestCheckResourceAttr(resourceName, "enable_accelerated_recovery", acctest.CtTrue),
testAccCheckZoneExists(ctx, resourceName1, &zone1),
testAccCheckZoneExists(ctx, resourceName2, &zone2),
resource.TestCheckResourceAttr(resourceName1, "enable_accelerated_recovery", acctest.CtTrue),
resource.TestCheckResourceAttr(resourceName2, "enable_accelerated_recovery", acctest.CtTrue),
),
},
{
ResourceName: resourceName,
ResourceName: resourceName1,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{names.AttrForceDestroy},
},
{
// Disable accelerated recovery
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName, false),
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName1, zoneName2, false),
Check: resource.ComposeTestCheckFunc(
testAccCheckZoneExists(ctx, resourceName, &zone),
acctest.MatchResourceAttrGlobalARNNoAccount(resourceName, names.AttrARN, "route53", regexache.MustCompile("hostedzone/.+")),
resource.TestCheckResourceAttr(resourceName, names.AttrName, zoneName),
resource.TestCheckResourceAttr(resourceName, "name_servers.#", "4"),
resource.TestCheckResourceAttrSet(resourceName, "primary_name_server"),
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"),
resource.TestCheckResourceAttr(resourceName, "vpc.#", "0"),
resource.TestCheckResourceAttr(resourceName, "enable_accelerated_recovery", acctest.CtFalse),
testAccCheckZoneExists(ctx, resourceName1, &zone1),
testAccCheckZoneExists(ctx, resourceName2, &zone2),
resource.TestCheckResourceAttr(resourceName1, "enable_accelerated_recovery", acctest.CtFalse),
resource.TestCheckResourceAttr(resourceName2, "enable_accelerated_recovery", acctest.CtFalse),
),
},
{
// Re-enable accelerated recovery
// Check a resource can be destroyed with it enabled
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName, true),
Config: testAccZoneConfig_enableAcceleratedRecovery(zoneName1, zoneName2, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckZoneExists(ctx, resourceName, &zone),
acctest.MatchResourceAttrGlobalARNNoAccount(resourceName, names.AttrARN, "route53", regexache.MustCompile("hostedzone/.+")),
resource.TestCheckResourceAttr(resourceName, names.AttrName, zoneName),
resource.TestCheckResourceAttr(resourceName, "name_servers.#", "4"),
resource.TestCheckResourceAttrSet(resourceName, "primary_name_server"),
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"),
resource.TestCheckResourceAttr(resourceName, "vpc.#", "0"),
resource.TestCheckResourceAttr(resourceName, "enable_accelerated_recovery", acctest.CtTrue),
testAccCheckZoneExists(ctx, resourceName1, &zone1),
testAccCheckZoneExists(ctx, resourceName2, &zone2),
resource.TestCheckResourceAttr(resourceName1, "enable_accelerated_recovery", acctest.CtTrue),
resource.TestCheckResourceAttr(resourceName2, "enable_accelerated_recovery", acctest.CtTrue),
),
},
},
Expand Down Expand Up @@ -885,12 +875,17 @@ resource "aws_route53_zone" "test" {
`, rName, zoneName)
}

func testAccZoneConfig_enableAcceleratedRecovery(zoneName string, enableAcceleratedRecovery bool) string {
func testAccZoneConfig_enableAcceleratedRecovery(zoneName1, zoneName2 string, enableAcceleratedRecovery bool) string {
return fmt.Sprintf(`
resource "aws_route53_zone" "test" {
resource "aws_route53_zone" "test1" {
name = "%[1]s."

enable_accelerated_recovery = %[2]t
enable_accelerated_recovery = %[3]t
}
resource "aws_route53_zone" "test2" {
name = "%[2]s."

enable_accelerated_recovery = %[3]t
}
`, zoneName, enableAcceleratedRecovery)
`, zoneName1, zoneName2, enableAcceleratedRecovery)
}
Loading