fix issues

env0 · Jun 18, 2024 · 2c2a370 · 2c2a370
1 parent cde389f
commit 2c2a370
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/env0/resource_environment.go b/env0/resource_environment.go
@@ -616,12 +616,7 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta
 }
 
 func getEnvironmentVariableSetIdsFromApi(d *schema.ResourceData, apiClient client.ApiClientInterface) ([]string, error) {
-	scope := "ENVIRONMENT"
-	if _, ok := d.GetOk("sub_environment_configuration"); ok {
-		scope = "WORKFLOW"
-	}
-
-	environmentVariableSets, err := apiClient.ConfigurationSetsAssignments(scope, d.Id())
+	environmentVariableSets, err := apiClient.ConfigurationSetsAssignments("ENVIRONMENT", d.Id())
 	if err != nil {
 		return nil, err
 	}

diff --git a/env0/resource_environment_test.go b/env0/resource_environment_test.go
@@ -2746,17 +2746,18 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 				mock.EXPECT().EnvironmentCreate(environmentCreatePayload).Times(1).Return(environment, nil),
 				mock.EXPECT().Environment(environment.Id).Times(1).Return(environment, nil),
 				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
-				mock.EXPECT().ConfigurationSetsAssignments("WORKFLOW", environment.Id).Times(1).Return(nil, nil),
+				mock.EXPECT().ConfigurationSetsAssignments("ENVIRONMENT", environment.Id).Times(1).Return(nil, nil),
 				mock.EXPECT().Environment(environment.Id).Times(1).Return(environment, nil),
 				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
-				mock.EXPECT().ConfigurationSetsAssignments("WORKFLOW", environment.Id).Times(1).Return(nil, nil),
+				mock.EXPECT().ConfigurationSetsAssignments("ENVIRONMENT", environment.Id).Times(1).Return(nil, nil),
+				mock.EXPECT().ConfigurationSetsAssignments("ENVIRONMENT", environment.Id).Times(1).Return(nil, nil),
 				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeEnvironment, subEnvrionmentWithId.Id).Times(1).Return(subEnvironment.Configuration, nil),
 				mock.EXPECT().EnvironmentDeploy(environment.Id, deployRequest).Times(1).Return(client.EnvironmentDeployResponse{
 					Id: environment.Id,
 				}, nil),
 				mock.EXPECT().Environment(environment.Id).Times(1).Return(environment, nil),
 				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
-				mock.EXPECT().ConfigurationSetsAssignments("WORKFLOW", environment.Id).Times(1).Return(nil, nil),
+				mock.EXPECT().ConfigurationSetsAssignments("ENVIRONMENT", environment.Id).Times(1).Return(nil, nil),
 				mock.EXPECT().EnvironmentDestroy(environment.Id).Times(1),
 			)
 		})