Improve handling of ValidationState

Author: sebastianrath

cmd/cmd_validate.go

@@ -116,14 +116,14 @@ func validateGraph(filePath string) error {
 		hasErrors = true
 	}
 
-	vs := &core.ValidationState{}
 	opts := core.RunOpts{
+		VS:              &core.ValidationState{},
 		OverrideSecrets: make(map[string]string),
 	}
 	if ghToken := u.GetGhTokenFromEnv(); ghToken != "" {
 		opts.OverrideSecrets["GITHUB_TOKEN"] = ghToken
 	}
-	_, errs := core.LoadGraph(graphYaml, nil, "", vs, opts)
+	_, errs := core.LoadGraph(graphYaml, nil, "", opts)
 
 	if len(errs) > 0 {
 		fmt.Printf("\n❌ Graph validation failed with %d error(s):\n", len(errs))
@@ -139,9 +139,9 @@ func validateGraph(filePath string) error {
 		hasErrors = true
 	}
 
-	if len(vs.Warnings) > 0 {
-		fmt.Printf("\n⚠️  %d warning(s):\n", len(vs.Warnings))
-		for i, w := range vs.Warnings {
+	if len(opts.VS.Warnings) > 0 {
+		fmt.Printf("\n⚠️  %d warning(s):\n", len(opts.VS.Warnings))
+		for i, w := range opts.VS.Warnings {
 			fmt.Printf("  %d. %s\n", i+1, w)
 		}
 	}

core/graph.go

@@ -319,7 +319,7 @@ func RunGraph(ctx context.Context, graphName string, graphContent []byte, opts R
 	os.Unsetenv("INPUT_GITHUB_TOKEN")
 	os.Unsetenv("INPUT_TOKEN")
 
-	ag, errs := LoadGraph(graphYaml, nil, "", nil, opts)
+	ag, errs := LoadGraph(graphYaml, nil, "", opts)
 	if len(errs) > 0 {
 		return CreateErr(nil, errs[0], "failed to load graph")
 	}
@@ -580,9 +580,9 @@ func RunGraph(ctx context.Context, graphName string, graphContent []byte, opts R
 	return mainErr
 }
 
-func LoadGraph(graphYaml map[string]any, parent NodeBaseInterface, parentId string, vs *ValidationState, opts RunOpts) (ActionGraph, []error) {
+func LoadGraph(graphYaml map[string]any, parent NodeBaseInterface, parentId string, opts RunOpts) (ActionGraph, []error) {
 
-	opts.VS = vs
+	vs := opts.VS
 	ag := NewActionGraph()
 
 	var err error
@@ -601,7 +601,7 @@ func LoadGraph(graphYaml map[string]any, parent NodeBaseInterface, parentId stri
 		}
 	}
 
-	err = LoadNodes(&ag, parent, parentId, graphYaml, vs, opts)
+	err = LoadNodes(&ag, parent, parentId, graphYaml, opts)
 	if err != nil && vs == nil {
 		return ActionGraph{}, []error{err}
 	}
@@ -682,14 +682,14 @@ func anyToPortDefinition[T any](o any) (T, error) {
 	return ret, err
 }
 
-func LoadNodes(ag *ActionGraph, parent NodeBaseInterface, parentId string, nodesYaml map[string]any, vs *ValidationState, opts RunOpts) error {
+func LoadNodes(ag *ActionGraph, parent NodeBaseInterface, parentId string, nodesYaml map[string]any, opts RunOpts) error {
 	nodesList, err := utils.GetTypedPropertyByPath[[]any](nodesYaml, "nodes")
 	if err != nil {
-		return collectOrReturn(err, vs)
+		return collectOrReturn(err, opts.VS)
 	}
 
 	for _, nodeData := range nodesList {
-		n, id, err := LoadNode(parent, parentId, nodeData, vs, opts)
+		n, id, err := LoadNode(parent, parentId, nodeData, opts)
 		if err != nil {
 			return err
 		}
@@ -704,7 +704,8 @@ func LoadNodes(ag *ActionGraph, parent NodeBaseInterface, parentId string, nodes
 	return nil
 }
 
-func LoadNode(parent NodeBaseInterface, parentId string, nodeData any, vs *ValidationState, opts RunOpts) (NodeBaseInterface, string, error) {
+func LoadNode(parent NodeBaseInterface, parentId string, nodeData any, opts RunOpts) (NodeBaseInterface, string, error) {
+	vs := opts.VS
 	nodeI, ok := nodeData.(map[string]any)
 	if !ok {
 		err := CreateErr(nil, nil, "node is not a map")

nodes/group@v1.go

@@ -179,11 +179,12 @@ func init() {
 			}
 		}
 
-		var subVs *core.ValidationState
 		if validate {
-			subVs = &core.ValidationState{}
+			opts.VS = &core.ValidationState{}
+		} else {
+			opts.VS = nil
 		}
-		ag, errs := core.LoadGraph(subGraph, group, parentId, subVs, opts)
+		ag, errs := core.LoadGraph(subGraph, group, parentId, opts)
 		if len(errs) > 0 {
 			if !validate {
 				return nil, errs

nodes/test@v1_test.go

@@ -356,7 +356,7 @@ executions: []
 		return nil, nil, nil, nil, err
 	}
 
-	ag, errs := core.LoadGraph(graphYaml, nil, "", nil, core.RunOpts{})
+	ag, errs := core.LoadGraph(graphYaml, nil, "", core.RunOpts{})
 	if errs != nil {
 		return nil, nil, nil, nil, errs[0]
 	}

tests_unit/disable_concurrency_input_test.go

@@ -18,7 +18,7 @@ func loadTestGraph(t *testing.T, graphStr string) core.ActionGraph {
 	if err := yaml.Unmarshal([]byte(graphStr), &graphYaml); err != nil {
 		t.Fatalf("unmarshal YAML: %v", err)
 	}
-	ag, errs := core.LoadGraph(graphYaml, nil, "", nil, core.RunOpts{})
+	ag, errs := core.LoadGraph(graphYaml, nil, "", core.RunOpts{})
 	if len(errs) > 0 {
 		t.Fatalf("LoadGraph: %v", errs[0])
 	}