Skip to content
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

Jump to bottom

WAF and wafregional token final retries #9826

Merged
merged 1 commit into from
Aug 21, 2019
Merged

WAF and wafregional token final retries #9826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions aws/waf_token_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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 {
Expand Down
14 changes: 11 additions & 3 deletions aws/wafregionl_token_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down