Fix: if without_template_settings is defined, validate revision is no… #574
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
…t set outside of it
RLRabinowitz
approved these changes
Jan 24, 2023
github-actions
bot
added
ready to merge
RLRabinowitz
requested changes
Jan 24, 2023
env0/resource_environment.go
Outdated
| Description: "the revision the environment is to be run against", | ||
| Optional: true, | ||
| Computed: true, | ||
| ConflictsWith: []string{"without_template_settings.0.revision"}, |
There was a problem hiding this comment.
I think we should conflict with without_template_settings in general.
If without_template_settings block exists, the revision shouldn't exist on the resource directly
If there's a without_template_settings but no without_template_settings.revision, and there's a revision: master, the revision used will be ''
RLRabinowitz
added
reviewed - awaiting author
and removed
ready to merge
RLRabinowitz
approved these changes
Jan 25, 2023
| repository = "%s" | ||
| terraform_version = "%s" | ||
| type = "%s" | ||
| revision = "%s" |
There was a problem hiding this comment.
IMO preferably remove this "revision" from the test
I think it's more important that this test fails when there's no revision in the without_template_settings at all
github-actions
bot
added
ready to merge
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.
…t set outside of it
Issue & Steps to Reproduce / Feature Request
fixes #573
Solution