Fix: configuration variable defined in env0_environment resource gett…

.github/workflows/pr-labeler.yml

@@ -13,6 +13,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Updated Paths
-        uses: actions/labeler@main # Reads from .github/labeler.yml
+        uses: actions/labeler@v4 # Reads from .github/labeler.yml
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

client/configuration_variable.go

@@ -13,6 +13,7 @@ const (
 	ScopeEnvironment   Scope = "ENVIRONMENT"
 	ScopeDeployment    Scope = "DEPLOYMENT"
 	ScopeDeploymentLog Scope = "DEPLOYMENT_LOG"
+	ScopeWorkflow      Scope = "WORKFLOW"
 )
 
 type Format string
@@ -104,6 +105,8 @@ func (client *ApiClient) ConfigurationVariablesByScope(scope Scope, scopeId stri
 		return nil, errors.New("no api to fetch configuration variables by deployment")
 	case scope == ScopeDeploymentLog:
 		params["deploymentLogId"] = scopeId
+	case scope == ScopeWorkflow:
+		params["workflowEnvironmentId"] = scopeId
 	}
 	err = client.http.Get("/configuration", params, &result)
 	if err != nil {

env0/resource_environment.go

@@ -586,7 +586,12 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta i
 		return diag.Errorf("could not get environment: %v", err)
 	}
 
-	environmentConfigurationVariables, err := apiClient.ConfigurationVariablesByScope(client.ScopeEnvironment, environment.Id)
+	scope := client.ScopeEnvironment
+	if _, ok := d.GetOk("sub_environment_configuration"); ok {
+		scope = client.ScopeWorkflow
+	}
+
+	environmentConfigurationVariables, err := apiClient.ConfigurationVariablesByScope(scope, environment.Id)
 	if err != nil {
 		return diag.Errorf("could not get environment configuration variables: %v", err)
 	}
@@ -711,7 +716,7 @@ func deploy(d *schema.ResourceData, apiClient client.ApiClientInterface) diag.Di
 		for i, subEnvironment := range subEnvironments {
 			configuration := d.Get(fmt.Sprintf("sub_environment_configuration.%d.configuration", i)).([]interface{})
 			configurationChanges := getConfigurationVariablesFromSchema(configuration)
-			configurationChanges = getUpdateConfigurationVariables(configurationChanges, subEnvironment.Id, apiClient)
+			configurationChanges = getUpdateConfigurationVariables(configurationChanges, subEnvironment.Id, client.ScopeWorkflow, apiClient)
 
 			for i := range configurationChanges {
 				configurationChanges[i].Scope = client.ScopeEnvironment
@@ -936,7 +941,11 @@ func getDeployPayload(d *schema.ResourceData, apiClient client.ApiClientInterfac
 
 	if configuration, ok := d.GetOk("configuration"); ok && isRedeploy {
 		configurationChanges := getConfigurationVariablesFromSchema(configuration.([]interface{}))
-		configurationChanges = getUpdateConfigurationVariables(configurationChanges, d.Get("id").(string), apiClient)
+		scope := client.ScopeEnvironment
+		if _, ok := d.GetOk("sub_environment_configuration"); ok {
+			scope = client.ScopeWorkflow
+		}
+		configurationChanges = getUpdateConfigurationVariables(configurationChanges, d.Get("id").(string), scope, apiClient)
 		payload.ConfigurationChanges = &configurationChanges
 	}
 
@@ -961,8 +970,8 @@ func getTTl(date string) client.TTL {
 	}
 }
 
-func getUpdateConfigurationVariables(configurationChanges client.ConfigurationChanges, environmentId string, apiClient client.ApiClientInterface) client.ConfigurationChanges {
-	existVariables, err := apiClient.ConfigurationVariablesByScope(client.ScopeEnvironment, environmentId)
+func getUpdateConfigurationVariables(configurationChanges client.ConfigurationChanges, environmentId string, scope client.Scope, apiClient client.ApiClientInterface) client.ConfigurationChanges {
+	existVariables, err := apiClient.ConfigurationVariablesByScope(scope, environmentId)
 	if err != nil {
 		diag.Errorf("could not get environment configuration variables: %v", err)
 	}
@@ -1133,7 +1142,13 @@ func resourceEnvironmentImport(ctx context.Context, d *schema.ResourceData, meta
 	}
 	apiClient := meta.(client.ApiClientInterface)
 	d.SetId(environment.Id)
-	environmentConfigurationVariables, err := apiClient.ConfigurationVariablesByScope(client.ScopeEnvironment, environment.Id)
+
+	scope := client.ScopeEnvironment
+	if environment.LatestDeploymentLog.WorkflowFile != nil && len(environment.LatestDeploymentLog.WorkflowFile.Environments) > 0 {
+		scope = client.ScopeWorkflow
+	}
+
+	environmentConfigurationVariables, err := apiClient.ConfigurationVariablesByScope(scope, environment.Id)
 	if err != nil {
 		return nil, fmt.Errorf("could not get environment configuration variables: %v", err)
 	}

env0/resource_environment_test.go

@@ -2179,9 +2179,32 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 		},
 	}
 
+	configurationVariable := client.ConfigurationVariable{
+		Value: "v1",
+		Name:  "n1",
+		Type:  (*client.ConfigurationVariableType)(intPtr(0)),
+		Schema: &client.ConfigurationVariableSchema{
+			Type: "string",
+		},
+	}
+
 	environmentCreatePayload := client.EnvironmentCreate{
 		Name:      environment.Name,
 		ProjectId: environment.ProjectId,
+		ConfigurationChanges: &client.ConfigurationChanges{
+			{
+				Name:        "n1",
+				Value:       "v1",
+				Scope:       client.ScopeDeployment,
+				IsSensitive: boolPtr(false),
+				IsReadOnly:  boolPtr(false),
+				IsRequired:  boolPtr(false),
+				Schema: &client.ConfigurationVariableSchema{
+					Type: "string",
+				},
+				Type: (*client.ConfigurationVariableType)(intPtr(0)),
+			},
+		},
 		DeployRequest: &client.DeployRequest{
 			BlueprintId: environment.BlueprintId,
 			SubEnvironments: map[string]client.SubEnvironment{
@@ -2220,6 +2243,10 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 						project_id = "%s"
 						template_id = "%s"
 						force_destroy = true
+						configuration {
+							name = "n1"
+							value = "v1"
+						}
 						sub_environment_configuration {
 							alias = "%s"
 							revision = "%s"
@@ -2309,15 +2336,15 @@ func TestUnitEnvironmentWithSubEnvironment(t *testing.T) {
 				mock.EXPECT().Template(environmentCreatePayload.DeployRequest.BlueprintId).Times(1).Return(template, nil),
 				mock.EXPECT().EnvironmentCreate(environmentCreatePayload).Times(1).Return(environment, nil),
 				mock.EXPECT().Environment(environment.Id).Times(1).Return(environment, nil),
-				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeEnvironment, environment.Id).Times(1).Return(client.ConfigurationChanges{}, nil),
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
 				mock.EXPECT().Environment(environment.Id).Times(1).Return(environment, nil),
-				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeEnvironment, environment.Id).Times(1).Return(client.ConfigurationChanges{}, nil),
-				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeEnvironment, subEnvrionmentWithId.Id).Times(1).Return(subEnvironment.Configuration, nil),
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, 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.ScopeEnvironment, environment.Id).Times(1).Return(client.ConfigurationChanges{}, nil),
+				mock.EXPECT().ConfigurationVariablesByScope(client.ScopeWorkflow, environment.Id).Times(1).Return(client.ConfigurationChanges{configurationVariable}, nil),
 				mock.EXPECT().EnvironmentDestroy(environment.Id).Times(1),
 			)
 		})

tests/integration/012_environment/main.tf

@@ -208,6 +208,11 @@ resource "env0_environment" "workflow-environment" {
   template_id                = env0_template.workflow_template.id
   approve_plan_automatically = true
 
+  configuration {
+    name  = "n1"
+    value = "v1"
+  }
+
   sub_environment_configuration {
     alias    = "rootService1"
     revision = "master"