Fix CR

env0 · Dec 15, 2021 · 7379180 · 7379180
1 parent 433a4e7
commit 7379180
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/env0/resource_environment.go b/env0/resource_environment.go
@@ -190,10 +190,10 @@ func setEnvironmentSchema(d *schema.ResourceData, environment client.Environment
 	if environment.AutoDeployOnPathChangesOnly != nil {
 		d.Set("auto_deploy_on_path_changes_only", *environment.AutoDeployOnPathChangesOnly)
 	}
-	setEnvironmentSchemaConfiguration(d, configurationVariables)
+	setEnvironmentConfigurationSchema(d, configurationVariables)
 }
 
-func setEnvironmentSchemaConfiguration(d *schema.ResourceData, configurationVariables []client.ConfigurationVariable) {
+func setEnvironmentConfigurationSchema(d *schema.ResourceData, configurationVariables []client.ConfigurationVariable) {
 	for index, configurationVariable := range configurationVariables {
 		variable := make(map[string]interface{})
 		variable["name"] = configurationVariable.Name
@@ -420,12 +420,9 @@ func getDeployPayload(d *schema.ResourceData, apiClient client.ApiClientInterfac
 	}
 
 	if configuration, ok := d.GetOk("configuration"); ok {
-		configurationChanges := client.ConfigurationChanges{}
+		configurationChanges := getConfigurationVariables(configuration.([]interface{}))
 		if isRedeploy {
-			configurationChanges = getUpdateConfigurationVariables(configuration.([]interface{}), d.Get("id").(string), apiClient)
-
-		} else {
-			configurationChanges = getConfigurationVariables(configuration.([]interface{}))
+			configurationChanges = getUpdateConfigurationVariables(configurationChanges, d.Get("id").(string), apiClient)
 		}
 		payload.ConfigurationChanges = &configurationChanges
 	}
@@ -451,12 +448,11 @@ func getTTl(date string) client.TTL {
 	}
 }
 
-func getUpdateConfigurationVariables(configuration []interface{}, environmentId string, apiClient client.ApiClientInterface) client.ConfigurationChanges {
+func getUpdateConfigurationVariables(configurationChanges client.ConfigurationChanges, environmentId string, apiClient client.ApiClientInterface) client.ConfigurationChanges {
 	existVariables, err := apiClient.ConfigurationVariables(client.ScopeEnvironment, environmentId)
 	if err != nil {
 		diag.Errorf("could not get environment configuration variables: %v", err)
 	}
-	configurationChanges := getConfigurationVariables(configuration)
 	configurationChanges = linkToExistConfigurationVariables(configurationChanges, existVariables)
 	configurationChanges = deleteUnusedConfigurationVariables(configurationChanges, existVariables)
 	return configurationChanges

diff --git a/env0/resource_environment_test.go b/env0/resource_environment_test.go
@@ -89,7 +89,7 @@ func TestUnitEnvironmentResource(t *testing.T) {
 		})
 	})
 
-	t.Run("Success in create and deploy with variables", func(t *testing.T) {
+	t.Run("Success in create and deploy with variables update", func(t *testing.T) {
 		environment := client.Environment{
 			Id:        "id0",
 			Name:      "my-environment",