Fix resource list usage of "parent" with entities depending on Org #1140
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
Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
* Add "parent" field into consideration when "org" is empty * Use client.GetAdminOrg, which uses the provider "org" field if the above ones are empty. * client.GetAdminOrg also returns a better error message Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
dataclouder
requested review from
lvirbalas,
Didainius,
adambarreiro and
adezxc
as code owners
lvirbalas
reviewed
Oct 19, 2023
adambarreiro
approved these changes
Oct 19, 2023
|
Is there a reason why org defined at provider level is not used? Is it just for resource and not for datasource? |
It is for both. The reason it was not used is just a plain bug. |
Oh yes, you already wrote it. |
lvirbalas
reviewed
Oct 20, 2023
Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
Signed-off-by: Giuseppe Maxia <gmaxia@vmware.com>
adezxc
approved these changes
Oct 20, 2023
lvirbalas
approved these changes
Oct 20, 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.
Entities depending directly on an organization should use the
"org"field to identify its parent.The
"parent"field, which is intended for intermediate entities, should not be used for this purpose.However, if users fill the "parent" field instead of "org", they get an ambiguous error, which doesn't explain what has happened.
This change allows
vcd_resource_listto consider both"org"and"parent"fields, as well as the"org"field in the provider block.The change is transparent for users. If the
"parent"field was used instead of"org", the organization is retrieved without complaints. In case of error, they get a clear message about what is missing.