Fix: approve_plan_automatically attribute fails for sub_environment

env0 · Sep 11, 2024 · 6604c6f · 6604c6f
1 parent 8411711
commit 6604c6f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/env0/resource_environment.go b/env0/resource_environment.go
@@ -1179,6 +1179,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 {
+		payload.UserRequiresApproval = boolPtr(false)
+	}
+
 	if isRedeploy {
 		if revision, ok := d.GetOk("without_template_settings.0.revision"); ok {
 			payload.BlueprintRevision = revision.(string)

diff --git a/env0/resource_environment_test.go b/env0/resource_environment_test.go
@@ -2929,7 +2929,8 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 			},
 		},
 		DeployRequest: &client.DeployRequest{
-			BlueprintId: environment.BlueprintId,
+			BlueprintId:          environment.BlueprintId,
+			UserRequiresApproval: boolPtr(false),
 			SubEnvironments: map[string]client.SubEnvironment{
 				subEnvironment.Alias: {
 					Workspace:            subEnvironment.Workspace,
@@ -2946,8 +2947,9 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 	}
 
 	deployRequest := client.DeployRequest{
-		BlueprintId:       environment.BlueprintId,
-		BlueprintRevision: environment.LatestDeploymentLog.BlueprintRevision,
+		BlueprintId:          environment.BlueprintId,
+		BlueprintRevision:    environment.LatestDeploymentLog.BlueprintRevision,
+		UserRequiresApproval: boolPtr(false),
 		SubEnvironments: map[string]client.SubEnvironment{
 			subEnvironment.Alias: {
 				Revision:             subEnvironment.Revision,

diff --git a/tests/integration/012_environment/main.tf b/tests/integration/012_environment/main.tf
@@ -257,7 +257,6 @@ resource "env0_environment" "workflow-environment" {
   name                       = "environment-workflow-${random_string.random.result}"
   project_id                 = env0_project.test_project.id
   template_id                = env0_template.workflow_template.id
-  approve_plan_automatically = true
 
   configuration {
     name  = "n1"
@@ -269,7 +268,7 @@ resource "env0_environment" "workflow-environment" {
   sub_environment_configuration {
     alias                      = "rootService1"
     revision                   = "master"
-    approve_plan_automatically = var.second_run ? true : false
+    approve_plan_automatically = var.second_run ? false : true 
     configuration {
       name  = "sub_env1_var1"
       value = "hello"