WAF and wafregional token final retries (#9826)

hashicorp · Aug 21, 2019 · 3da4988 · 3da4988
1 parent 531759a
commit 3da4988
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/aws/waf_token_handlers.go b/aws/waf_token_handlers.go
@@ -20,10 +20,9 @@ func (t *WafRetryer) RetryWithToken(f withTokenFunc) (interface{}, error) {
 	defer awsMutexKV.Unlock("WafRetryer")
 
 	var out interface{}
+	var tokenOut *waf.GetChangeTokenOutput
 	err := resource.Retry(15*time.Minute, func() *resource.RetryError {
 		var err error
-		var tokenOut *waf.GetChangeTokenOutput
-
 		tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{})
 		if err != nil {
 			return resource.NonRetryableError(fmt.Errorf("Failed to acquire change token: %s", err))
@@ -39,8 +38,16 @@ func (t *WafRetryer) RetryWithToken(f withTokenFunc) (interface{}, error) {
 		}
 		return nil
 	})
-
-	return out, err
+	if isResourceTimeoutError(err) {
+		tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{})
+		if err == nil {
+			out, err = f(tokenOut.ChangeToken)
+		}
+	}
+	if err != nil {
+		return nil, fmt.Errorf("Error getting WAF change token: %s", err)
+	}
+	return out, nil
 }
 
 func newWafRetryer(conn *waf.WAF) *WafRetryer {

diff --git a/aws/wafregionl_token_handlers.go b/aws/wafregionl_token_handlers.go
@@ -22,9 +22,9 @@ func (t *WafRegionalRetryer) RetryWithToken(f withRegionalTokenFunc) (interface{
 	defer awsMutexKV.Unlock(t.Region)
 
 	var out interface{}
+	var tokenOut *waf.GetChangeTokenOutput
 	err := resource.Retry(15*time.Minute, func() *resource.RetryError {
 		var err error
-		var tokenOut *waf.GetChangeTokenOutput
 
 		tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{})
 		if err != nil {
@@ -41,8 +41,16 @@ func (t *WafRegionalRetryer) RetryWithToken(f withRegionalTokenFunc) (interface{
 		}
 		return nil
 	})
-
-	return out, err
+	if isResourceTimeoutError(err) {
+		tokenOut, err = t.Connection.GetChangeToken(&waf.GetChangeTokenInput{})
+		if err == nil {
+			out, err = f(tokenOut.ChangeToken)
+		}
+	}
+	if err != nil {
+		return nil, fmt.Errorf("Error getting WAF regional change token: %s", err)
+	}
+	return out, nil
 }
 
 func newWafRegionalRetryer(conn *wafregional.WAFRegional, region string) *WafRegionalRetryer {