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

service/waf: Only wrap errors returned by GetChangeToken in RetryWithToken #10242

Merged
merged 1 commit into from
Sep 27, 2019
Merged

service/waf: Only wrap errors returned by GetChangeToken in RetryWithToken #10242

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
9 changes: 6 additions & 3 deletions aws/waf_token_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ func (t *WafRetryer) RetryWithToken(f withTokenFunc) (interface{}, error) {
})
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)
}

out, err = f(tokenOut.ChangeToken)
}
if err != nil {
return nil, fmt.Errorf("Error getting WAF change token: %s", err)
return nil, err
}
return out, nil
}
Expand Down
9 changes: 6 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 @@ -43,12 +43,15 @@ func (t *WafRegionalRetryer) RetryWithToken(f withRegionalTokenFunc) (interface{
})
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)
}

out, err = f(tokenOut.ChangeToken)
}
if err != nil {
return nil, fmt.Errorf("Error getting WAF regional change token: %s", err)
return nil, err
}
return out, nil
}
Expand Down