Fix: env0_environment does not redeploy when revision is changed in w… #907
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
…ithout_template_settings
TomerHeber
commented
Jul 25, 2024
| @@ -732,6 +732,12 @@ func shouldUpdateTemplate(d *schema.ResourceData) bool { | |||
| } | |||
|
|
|||
| func shouldDeploy(d *schema.ResourceData) bool { | |||
| if _, ok := d.GetOk("without_template_settings.0"); ok { | |||
There was a problem hiding this comment.
added the required use-case.
TomerHeber
commented
Jul 25, 2024
| @@ -1126,8 +1132,7 @@ func getDeployPayload(d *schema.ResourceData, apiClient client.ApiClientInterfac | |||
| var err error | |||
|
|
|||
| if isTemplateless(d) { | |||
| templateId, ok := d.GetOk("without_template_settings.0.id") | |||
| if ok { | |||
| if templateId, ok := d.GetOk("without_template_settings.0.id"); ok { | |||
There was a problem hiding this comment.
no change... just one less line.
There was a problem hiding this comment.
this syntax is super strange ... do we use it a lot in this codebase / is it common in Go?
There was a problem hiding this comment.
Yes.
This is common go.
TomerHeber
commented
Jul 25, 2024
| @@ -1139,6 +1144,10 @@ func getDeployPayload(d *schema.ResourceData, apiClient client.ApiClientInterfac | |||
| } | |||
|
|
|||
| if isRedeploy { | |||
| if revision, ok := d.GetOk("without_template_settings.0.revision"); ok { | |||
There was a problem hiding this comment.
set the revision in the deploy request only if it's a redeploy.
TomerHeber
commented
Jul 25, 2024
| @@ -2541,6 +2541,13 @@ func TestUnitEnvironmentWithoutTemplateResource(t *testing.T) { | |||
|
|
|||
| // Update | |||
| mock.EXPECT().TemplateUpdate(template.Id, templateUpdatePayload).Times(1).Return(updatedTemplate, nil), | |||
| mock.EXPECT().ConfigurationSetsAssignments("ENVIRONMENT", environment.Id).Times(1).Return(nil, nil), | |||
| mock.EXPECT().EnvironmentDeploy(environment.Id, client.DeployRequest{ | |||
There was a problem hiding this comment.
Now deploy is called as part of the test.
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.
…ithout_template_settings
Issue & Steps to Reproduce / Feature Request
fixes #906
Solution