Fix: approve_plan_automatically attribute fails for sub_environment #954
Conversation
| @@ -1179,6 +1190,11 @@ func getDeployPayload(d *schema.ResourceData, apiClient client.ApiClientInterfac | |||
| payload.BlueprintRevision = revision.(string) | |||
| } | |||
|
|
|||
| // For 'Workflows', the 'root' environment should never require a user approval. | |||
| if _, ok := d.GetOk("sub_environment_configuration"); ok { | |||
There was a problem hiding this comment.
this shouldn't be needed...
This might be a bug in the backend...
There was a problem hiding this comment.
it seems that the backend will error if this is 'undefined'.
There was a problem hiding this comment.
this could be overridden by a project policy, this is a good extra step anyways.
| @@ -415,7 +415,8 @@ func setEnvironmentSchema(ctx context.Context, d *schema.ResourceData, environme | |||
| d.Set("output", string(environment.LatestDeploymentLog.Output)) | |||
| } | |||
|
|
|||
| if environment.RequiresApproval != nil { | |||
| // Don't update this value for workflow environments - this value should always be 'false'. | |||
| if _, isWorkflow := d.GetOk("sub_environment_configuration"); !isWorkflow && environment.RequiresApproval != nil { | |||
There was a problem hiding this comment.
don't modify the schema for workflow environment...
generally this would not be required... however due to the change in line 1195 (which I believe is a backend issue) - I had to add this here.
(see my comment in line 1195).
env0/resource_environment.go
Outdated
| } | ||
|
|
||
| // For 'Workflows', the 'root' environment should never require an approval. | ||
| if _, ok := d.GetOk("sub_environment_configuration"); ok { |
There was a problem hiding this comment.
can we reuse the isWorkflow from line 980?
env0/resource_environment.go
Outdated
| // For 'Workflows', the 'root' environment should never require an approval. | ||
| if _, ok := d.GetOk("sub_environment_configuration"); ok { | ||
| payload.RequiresApproval = boolPtr(false) |
There was a problem hiding this comment.
how does this if block is different than the one above?
I'm a bit confused
There was a problem hiding this comment.
line 986 - is the use-case when someone excplicitly set 'approve_plan_automatically' to 'false' and it's a workflow - in that case we can quickly error out as bad schema set by the user.
line 992 - is the use-case where it's a workflow - the value is forced to be 'false'.
env0/resource_environment_test.go
Outdated
There was a problem hiding this comment.
Can we add a test of wrong terraform configuration where customer put approve_plan_automatically = false?
github-actions
bot
added
the
ready to merge
Issue & Steps to Reproduce / Feature Request
fixes #947
Solution
RequiredUserApprovalasfalsein the deploy payload (for the root env).