Fix refresh of target if upstream no longer exists #70
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
Provider should not throw error when upstream no longer exists as that means that the target no longer exists either.
Hopefully removes confusion regarding presence of upstream_url on service resource (kevholditch#52 (comment))
kevholditch
requested changes
Mar 13, 2019
kong/resource_kong_target_test.go
Outdated
|
|
||
| if len(targets) > 0 { | ||
| return fmt.Errorf("expecting zero target resources found %v", len(targets)) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("Error thrown when trying to read target: %v", err) |
There was a problem hiding this comment.
error string should begin with lowercase letter
|
|
||
| if err != nil { | ||
| return fmt.Errorf("could not delete kong upstream: %v", err) | ||
| } |
There was a problem hiding this comment.
combine if and err declaration onto one line...
err := testAccProvider.Meta().(*gokong.KongAdminClient).Upstreams().DeleteById(rs.Primary.ID); if err != nil {
return fmt.Errorf("could not delete kong upstream: %v", err)
}
kong/resource_kong_target.go
Outdated
| @@ -55,6 +55,14 @@ func resourceKongTargetCreate(d *schema.ResourceData, meta interface{}) error { | |||
| func resourceKongTargetRead(d *schema.ResourceData, meta interface{}) error { | |||
|
|
|||
| var ids = strings.Split(d.Id(), "/") | |||
|
|
|||
| // First check if the upstream exists. If it does not then the target no longer exists either. | |||
| upstream, _ := meta.(*gokong.KongAdminClient).Upstreams().GetById(ids[0]) | |||
There was a problem hiding this comment.
combine if and variable declaration onto one line...
upstream, _ := meta.(*gokong.KongAdminClient).Upstreams().GetById(ids[0]); if upstream == nil ...
kevholditch
approved these changes
Mar 13, 2019
|
@kevholditch Thanks for the feedback. Changes have been made. Wasn't familiar with the combination of var initialization and check for result in Go prior to now so have started my day learning something :) |
|
@onematchfox thanks for the contribution and helping to make the provider better. Cool that you started the day learning something! I'll merge your PR now and the changes will be in |
kevholditch
pushed a commit
that referenced
this pull request
Apr 12, 2019
* Fix refresh of target if upstream no longer exists Provider should not throw error when upstream no longer exists as that means that the target no longer exists either. * Adjust documentation of upstream name to match Kong's description Hopefully removes confusion regarding presence of upstream_url on service resource (#52 (comment)) * goimports * Code review adjustments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #69