78 lines
3.4 KiB
Diff
78 lines
3.4 KiB
Diff
|
From 455475a4dbd9143605320fbcab748a569efecbcd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bert Blommers <info@bertblommers.nl>
|
||
|
|
Date: Tue, 28 Jun 2022 11:17:35 +0000
|
||
|
|
Subject: [PATCH] Route53 - wait times
|
||
|
|
|
||
|
|
---
|
||
|
|
internal/service/route53/record.go | 4 ++--
|
||
|
|
internal/service/route53/wait.go | 6 +++---
|
||
|
|
internal/service/route53/zone.go | 2 +-
|
||
|
|
internal/service/route53/zone_association.go | 2 +-
|
||
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
|
||
|
|
index 689d21387b..771d863a31 100644
|
||
|
|
--- a/internal/service/route53/record.go
|
||
|
|
+++ b/internal/service/route53/record.go
|
||
|
|
@@ -490,8 +490,8 @@ func WaitForRecordSetToSync(conn *route53.Route53, requestId string) error {
|
||
|
|
Target: []string{route53.ChangeStatusInsync},
|
||
|
|
Delay: time.Duration(rand.Int63n(recordSetSyncMaxDelay-recordSetSyncMinDelay)+recordSetSyncMinDelay) * time.Second,
|
||
|
|
MinTimeout: 5 * time.Second,
|
||
|
|
- PollInterval: 20 * time.Second,
|
||
|
|
- Timeout: 30 * time.Minute,
|
||
|
|
+ PollInterval: 5 * time.Second,
|
||
|
|
+ Timeout: 3 * time.Minute,
|
||
|
|
Refresh: func() (result interface{}, state string, err error) {
|
||
|
|
changeRequest := &route53.GetChangeInput{
|
||
|
|
Id: aws.String(requestId),
|
||
|
|
diff --git a/internal/service/route53/wait.go b/internal/service/route53/wait.go
|
||
|
|
index c47a81ef03..98c21e6b8e 100644
|
||
|
|
--- a/internal/service/route53/wait.go
|
||
|
|
+++ b/internal/service/route53/wait.go
|
||
|
|
@@ -13,13 +13,13 @@ import (
|
||
|
|
)
|
||
|
|
|
||
|
|
const (
|
||
|
|
- changeTimeout = 30 * time.Minute
|
||
|
|
+ changeTimeout = 3 * time.Minute
|
||
|
|
changeMinTimeout = 5 * time.Second
|
||
|
|
- changePollInterval = 15 * time.Second
|
||
|
|
+ changePollInterval = 5 * time.Second
|
||
|
|
changeMinDelay = 10
|
||
|
|
changeMaxDelay = 30
|
||
|
|
|
||
|
|
- hostedZoneDNSSECStatusTimeout = 5 * time.Minute
|
||
|
|
+ hostedZoneDNSSECStatusTimeout = 1 * time.Minute
|
||
|
|
|
||
|
|
keySigningKeyStatusTimeout = 5 * time.Minute
|
||
|
|
|
||
|
|
diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
|
||
|
|
index d91b13f953..eed86ef027 100644
|
||
|
|
--- a/internal/service/route53/zone.go
|
||
|
|
+++ b/internal/service/route53/zone.go
|
||
|
|
@@ -698,7 +698,7 @@ func waitForChangeSynchronization(conn *route53.Route53, changeID string) error
|
||
|
|
Delay: time.Duration(rand.Int63n(zoneChangeSyncMaxDelay-zoneChangeSyncMinDelay)+zoneChangeSyncMinDelay) * time.Second,
|
||
|
|
MinTimeout: 5 * time.Second,
|
||
|
|
PollInterval: time.Duration(rand.Int63n(zoneChangeSyncMaxPollInterval-zoneChangeSyncMinPollInterval)+zoneChangeSyncMinPollInterval) * time.Second,
|
||
|
|
- Timeout: 15 * time.Minute,
|
||
|
|
+ Timeout: 1 * time.Minute,
|
||
|
|
Refresh: func() (result interface{}, state string, err error) {
|
||
|
|
input := &route53.GetChangeInput{
|
||
|
|
Id: aws.String(changeID),
|
||
|
|
diff --git a/internal/service/route53/zone_association.go b/internal/service/route53/zone_association.go
|
||
|
|
index c11188caa9..0103797de7 100644
|
||
|
|
--- a/internal/service/route53/zone_association.go
|
||
|
|
+++ b/internal/service/route53/zone_association.go
|
||
|
|
@@ -84,7 +84,7 @@ func resourceZoneAssociationCreate(d *schema.ResourceData, meta interface{}) err
|
||
|
|
Delay: 30 * time.Second,
|
||
|
|
Pending: []string{route53.ChangeStatusPending},
|
||
|
|
Target: []string{route53.ChangeStatusInsync},
|
||
|
|
- Timeout: 10 * time.Minute,
|
||
|
|
+ Timeout: 1 * time.Minute,
|
||
|
|
MinTimeout: 2 * time.Second,
|
||
|
|
Refresh: resourceZoneAssociationRefreshFunc(conn, CleanChangeID(aws.StringValue(output.ChangeInfo.Id)), d.Id()),
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|