Pass full state to GetExternalNameFn function to access field other than ID #316
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
…han ID Signed-off-by: Sergen Yalçın <[email protected]>
ulucinar
reviewed
Dec 22, 2023
pkg/controller/external_nofork.go
Outdated
| if newState.ID == "" { | ||
| func (n *noForkExternal) setExternalName(mg xpresource.Managed, stateValueMap map[string]interface{}) (bool, error) { | ||
| id, ok := stateValueMap["id"] | ||
| if !ok { |
There was a problem hiding this comment.
To be precise, we also need to make sure that the Terraform ID is not an empty string, i.e., it may be in the map but its value could be the empty string:
Suggested change
| if !ok { | |
| if !ok || id.(string) == "" { |
, with the assumption that if the id key exists, its value is a string.
pkg/controller/external_nofork.go
Outdated
| if err != nil { | ||
| return false, errors.Wrapf(err, "failed to get the external-name from ID: %s", newState.ID) | ||
| return false, errors.Wrapf(err, "failed to get the external-name from ID: %s", id) |
There was a problem hiding this comment.
nit:
Suggested change
| return false, errors.Wrapf(err, "failed to get the external-name from ID: %s", id) | |
| return false, errors.Wrapf(err, "failed to compute the external-name from the state map of the resource with the ID %s", id) |
pkg/controller/external_nofork.go
Outdated
Comment on lines
604
to
605
| stateValueMap, err := n.fromInstanceStateToJSONMap(newState) | ||
| if _, err := n.setExternalName(mg, stateValueMap); err != nil { |
There was a problem hiding this comment.
Let's make sure we check any errors returned from n.fromInstanceStateToJSONMap:
Suggested change
| stateValueMap, err := n.fromInstanceStateToJSONMap(newState) | |
| if _, err := n.setExternalName(mg, stateValueMap); err != nil { | |
| stateValueMap, err := n.fromInstanceStateToJSONMap(newState) | |
| if err != nil { | |
| return managed.ExternalCreation{}, errors.Wrap(err, "failed to create the resource") | |
| } | |
| if _, err := n.setExternalName(mg, stateValueMap); err != nil { |
pkg/controller/external_nofork.go
Outdated
Comment on lines
608
to
610
| if err != nil { | ||
| return managed.ExternalCreation{}, err | ||
| } |
There was a problem hiding this comment.
This block would be moved:
Suggested change
| if err != nil { | |
| return managed.ExternalCreation{}, err | |
| } |
- Move the error check to the correct place Signed-off-by: Sergen Yalçın <[email protected]>
ulucinar
approved these changes
Dec 22, 2023
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.
Description of your changes
This PR passes full state to GetExternalNameFn function to access field other than ID.
I have:
make reviewableto ensure this PR is ready for review.backport release-x.ylabels to auto-backport this PR if necessary.How has this code been tested
Tested against keyVault.AccessPolicy resource in provider-azure