builtin: Refactor resource.Retry to clarify return #5543
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phinze
force-pushed
the
phinze/retryerror-pointers-are-evil
branch
from
e5ac704
to
c52aee7
Compare
phinze
force-pushed
the
phinze/retryerror-pointers-are-evil
branch
from
c52aee7
to
5cb5927
Compare
| @@ -273,7 +276,8 @@ func resourceAwsLambdaPermissionDelete(d *schema.ResourceData, meta interface{}) | |||
| policy := LambdaPolicy{} | |||
| err = json.Unmarshal(policyInBytes, &policy) | |||
| if err != nil { | |||
| return fmt.Errorf("Error unmarshalling Lambda policy: %s", err) | |||
| return resource.RetryableError( | |||
| fmt.Errorf("Error unmarshalling Lambda policy: %s", err)) | |||
There was a problem hiding this comment.
Here's a good example of something that probably should be NonRetryable but I left because I wanted this to be purely a refactor.
phinze
force-pushed
the
phinze/retryerror-pointers-are-evil
branch
from
5cb5927
to
529d067
Compare
Change the `RetryFunc` from a plain `error` return type to a specialized `RetryError` which must decide whether it is retryable or not. Add `RetryableError` / `NonRetryableError` factory functions that callers are meant to use to build up these errors. This makes it eminently clear whether or not a given error is retryable from inside the client code. Goal here is to _not_ change any behavior, simply reflect the existing behavior with the new, clearer, API.
phinze
force-pushed
the
phinze/retryerror-pointers-are-evil
branch
from
529d067
to
108ccf0
Compare
|
LGTM assuming we don't want to change behaviour here |
phinze
added a commit
that referenced
this pull request
Mar 10, 2016
…e-evil builtin: Refactor resource.Retry to clarify return
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change the
RetryFuncfrom a plainerrorreturn type to aspecialized
RetryErrorwhich must decide whether it isretryable or not.
Add
RetryableError/NonRetryableErrorfactory functions thatcallers are meant to use to build up these errors.
This makes it eminently clear whether or not a given error is
retryable from inside the client code.
Goal here is to not change any behavior, simply reflect the
existing behavior with the new, clearer, API.