Fix: variable set assignment drifts with parent projects

env0/resource_variable_set.go

@@ -300,11 +300,13 @@ func mergeVariables(schema []client.ConfigurationVariable, api []client.Configur
 		for _, avariable := range api {
 			if svariable.Name == avariable.Name && *svariable.Type == *avariable.Type {
 				found = true
+
 				if avariable.IsSensitive != nil && *avariable.IsSensitive {
 					// Sensitive - to avoid drift use the value from the schema
 					avariable.Value = svariable.Value
 				}
 				res.currentVariables = append(res.currentVariables, avariable)
+
 				break
 			}
 		}

env0/resource_variable_set_assignment.go

@@ -188,10 +188,16 @@ func resourceVariableSetAssignmentRead(ctx context.Context, d *schema.ResourceDa
 	}
 
 	for _, apiConfigurationSet := range apiConfigurationSets {
+		// Filter out irrelevant scopes.
 		if !strings.EqualFold(apiConfigurationSet.AssignmentScope, assignmentSchema.Scope) {
 			continue
 		}
 
+		// Filter out inherited scopes (e.g parent project).
+		if apiConfigurationSet.CreationScopeId != assignmentSchema.ScopeId {
+			continue
+		}
+
 		apiSetId := apiConfigurationSet.Id
 		found := false
 

env0/resource_variable_set_assignment_test.go

@@ -22,21 +22,30 @@ func TestUnitVariableSetAssignmentResource(t *testing.T) {
 			{
 				Id:              "a1",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 			{
 				Id:              "a2",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
+			},
+			{
+				Id:              "filtered_out",
+				AssignmentScope: scope,
+				CreationScopeId: "otherCreationScopeId",
 			},
 		}
 		// Validates that drifts do not occur due to ordering.
 		flippedConfigurationSetIds := []client.ConfigurationSet{
 			{
 				Id:              "a2",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 			{
 				Id:              "a1",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 		}
 
@@ -45,10 +54,12 @@ func TestUnitVariableSetAssignmentResource(t *testing.T) {
 			{
 				Id:              "a3",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 			{
 				Id:              "a1",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 		}
 
@@ -105,10 +116,12 @@ func TestUnitVariableSetAssignmentResource(t *testing.T) {
 			{
 				Id:              "a1",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 			{
 				Id:              "a2",
 				AssignmentScope: scope,
+				CreationScopeId: scopeId,
 			},
 		}