From 8ad1f6ccc0eb220c2ec3614f3bbfb07e2d7f8d62 Mon Sep 17 00:00:00 2001
From: Tomer Heber <heber.tomer@gmail.com>
Date: Thu, 25 Apr 2024 09:11:20 -0500
Subject: [PATCH] =?UTF-8?q?Fix:=20sub=5Fenvironment=5Fconfiguration=20of?=
 =?UTF-8?q?=20environment=20is=20not=20passing=20work=E2=80=A6=20(#835)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env0/resource_environment.go      |  1 +
 env0/resource_environment_test.go | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/env0/resource_environment.go b/env0/resource_environment.go
index 279bb992..50f8ff85 100644
--- a/env0/resource_environment.go
+++ b/env0/resource_environment.go
@@ -884,6 +884,7 @@ func getCreatePayload(d *schema.ResourceData, apiClient client.ApiClientInterfac
 			deployPayload.SubEnvironments[subEnvironment.Alias] = client.SubEnvironment{
 				Revision:             subEnvironment.Revision,
 				ConfigurationChanges: subEnvironment.Configuration,
+				Workspace:            subEnvironment.Workspace,
 			}
 		}
 	}
diff --git a/env0/resource_environment_test.go b/env0/resource_environment_test.go
index 82439579..0e5a31c1 100644
--- a/env0/resource_environment_test.go
+++ b/env0/resource_environment_test.go
@@ -2357,6 +2357,8 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 		Type: (*client.ConfigurationVariableType)(intPtr(0)),
 	})
 
+	updatedSubEnvironment.Workspace = "workspace2"
+
 	subEnvrionmentWithId := subEnvironment
 	subEnvrionmentWithId.Id = workflowSubEnvironment.EnvironmentId
 
@@ -2405,6 +2407,7 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 			BlueprintId: environment.BlueprintId,
 			SubEnvironments: map[string]client.SubEnvironment{
 				subEnvironment.Alias: {
+					Workspace:            subEnvironment.Workspace,
 					Revision:             subEnvironment.Revision,
 					ConfigurationChanges: subEnvironment.Configuration,
 				},
@@ -2423,7 +2426,7 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 		SubEnvironments: map[string]client.SubEnvironment{
 			subEnvironment.Alias: {
 				Revision:             subEnvironment.Revision,
-				Workspace:            subEnvironment.Workspace,
+				Workspace:            updatedSubEnvironment.Workspace,
 				ConfigurationChanges: updatedSubEnvironment.Configuration,
 			},
 		},
@@ -2501,11 +2504,11 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 						environmentCreatePayload.Name,
 						environmentCreatePayload.ProjectId,
 						environment.BlueprintId,
-						subEnvironment.Alias,
-						subEnvironment.Revision,
-						subEnvironment.Workspace,
-						subEnvironment.Configuration[0].Name,
-						subEnvironment.Configuration[0].Value,
+						updatedSubEnvironment.Alias,
+						updatedSubEnvironment.Revision,
+						updatedSubEnvironment.Workspace,
+						updatedSubEnvironment.Configuration[0].Name,
+						updatedSubEnvironment.Configuration[0].Value,
 						updatedSubEnvironment.Configuration[1].Name,
 						updatedSubEnvironment.Configuration[1].Value,
 					),
@@ -2515,11 +2518,11 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 						resource.TestCheckResourceAttr(accessor, "project_id", environment.ProjectId),
 						resource.TestCheckResourceAttr(accessor, "template_id", environment.BlueprintId),
 						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.id", workflowSubEnvironment.EnvironmentId),
-						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.alias", subEnvironment.Alias),
-						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.revision", subEnvironment.Revision),
-						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.workspace", subEnvironment.Workspace),
-						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.0.name", subEnvironment.Configuration[0].Name),
-						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.0.value", subEnvironment.Configuration[0].Value),
+						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.alias", updatedSubEnvironment.Alias),
+						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.revision", updatedSubEnvironment.Revision),
+						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.workspace", updatedSubEnvironment.Workspace),
+						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.0.name", updatedSubEnvironment.Configuration[0].Name),
+						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.0.value", updatedSubEnvironment.Configuration[0].Value),
 						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.1.name", updatedSubEnvironment.Configuration[1].Name),
 						resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.configuration.1.value", updatedSubEnvironment.Configuration[1].Value),
 					),