fix: Same variable with a different scope now gets an ID (#836)

OctopusDeployLabs · Dec 4, 2024 · 1566f96 · 1566f96
1 parent d009e07
commit 1566f96
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/octopusdeploy_framework/resource_variable.go b/octopusdeploy_framework/resource_variable.go
@@ -267,13 +267,14 @@ func validateVariable(variableSet *variables.VariableSet, newVariable *variables
 	for _, v := range variableSet.Variables {
 		if v.Name == newVariable.Name && v.Type == newVariable.Type && (v.IsSensitive || v.Value == newVariable.Value) && v.Description == newVariable.Description && v.IsSensitive == newVariable.IsSensitive {
 			scopeMatches, _, err := variables.MatchesScope(v.Scope, &newVariable.Scope)
-			if err != nil || !scopeMatches {
+			if err != nil {
 				return err
 			}
-			if scopeMatches {
-				newVariable.ID = v.GetID()
-				return nil
+			if !scopeMatches {
+				continue
 			}
+			newVariable.ID = v.GetID()
+			return nil
 		}
 	}