fix: Default values not recognized in job parameters of type steps

Author: rlegan

pkg/parser/executors.go

@@ -217,7 +217,7 @@ func (doc *YamlDocument) parseSingleExecutorDocker(nameNode *sitter.Node, valueN
 
 	parseDocker := func(blockNode *sitter.Node) {
 		// blockNode is a block_node
-		blockSequence := GetChildOfType(blockNode, "block_sequence")
+		blockSequence := GetChildSequence(blockNode)
 
 		if blockSequence == nil { //TODO: deal with errors
 			return

pkg/parser/parameters.go

@@ -246,12 +246,12 @@ func (doc *YamlDocument) parseStepsParameter(paramName string, paramNode *sitter
 		keyName := doc.GetNodeText(keyNode)
 		switch keyName {
 		case "default":
-			stepsNode := GetChildOfType(valueNode, "block_sequence")
+			stepsNode := GetChildSequence(valueNode)
 			if stepsNode == nil {
 				return
 			}
 			rng := NodeToRange(child)
-			astDefault, _ := doc.parseArrayParameterValue(paramName, stepsNode, rng)
+			astDefault, _ := doc.parseArrayParameterValue(paramName, stepsNode, rng, true)
 			stepsParam.Default = astDefault
 			stepsParam.DefaultRange = doc.getDefaultParameterRange(child)
 			stepsParam.HasDefault = true
@@ -327,9 +327,9 @@ func (doc *YamlDocument) parseParameterValue(child *sitter.Node) (ast.ParameterV
 		return doc.parseSimpleParameterValue(paramName, flowNodeChild, rng)
 
 	case "block_sequence":
-		return doc.parseArrayParameterValue(paramName, flowNodeChild, rng)
+		return doc.parseArrayParameterValue(paramName, flowNodeChild, rng, false)
 	case "flow_sequence":
-		return doc.parseArrayParameterValue(paramName, flowNodeChild, rng)
+		return doc.parseArrayParameterValue(paramName, flowNodeChild, rng, false)
 
 	case "double_quote_scalar":
 		return ast.ParameterValue{
@@ -390,12 +390,12 @@ func (doc *YamlDocument) parseParameterValue(child *sitter.Node) (ast.ParameterV
 	return ast.ParameterValue{Name: paramName}, nil // not supported atm by the parser
 }
 
-func (doc *YamlDocument) parseArrayParameterValue(paramName string, arrayParamNode *sitter.Node, rng protocol.Range) (ast.ParameterValue, error) {
+func (doc *YamlDocument) parseArrayParameterValue(paramName string, arrayParamNode *sitter.Node, rng protocol.Range, forceSteps bool) (ast.ParameterValue, error) {
 	// arrayParamNode is a flow_sequence or a block sequence
 	values := make([]ast.ParameterValue, 0)
 	iterateOnBlockSequence(arrayParamNode, func(child *sitter.Node) {
 		if child.Type() == "block_sequence_item" || child.Type() == "flow_node" {
-			if isStep(doc, child) {
+			if isStep(doc, child) || forceSteps {
 				steps := doc.parseSingleStep(child)
 				values = append(values, ast.ParameterValue{
 					Value:      steps,

pkg/parser/steps.go

@@ -12,7 +12,7 @@ func (doc *YamlDocument) parseSteps(stepsNode *sitter.Node) []ast.Step {
 	// stepsNode is a block_node
 	steps := make([]ast.Step, 0)
 
-	blockSequenceNode := GetChildOfType(stepsNode, "block_sequence")
+	blockSequenceNode := GetChildSequence(stepsNode)
 	iterateOnBlockSequence(blockSequenceNode, func(child *sitter.Node) {
 		if child.Type() == "block_sequence_item" {
 			steps = append(steps, doc.parseSingleStep(child)...)
@@ -126,7 +126,7 @@ func (doc *YamlDocument) parseStep(blockMapping *sitter.Node) []ast.Step {
 
 func (doc *YamlDocument) parseAnchorStep(blockNode *sitter.Node) []ast.Step {
 	blockMapping := GetChildOfType(blockNode, "block_mapping")
-	blockSequence := GetChildOfType(blockNode, "block_sequence")
+	blockSequence := GetChildSequence(blockNode)
 
 	if blockSequence != nil {
 		blockSequenceItem := GetChildOfType(blockSequence, "block_sequence_item")

pkg/parser/utils.go

@@ -55,6 +55,16 @@ func GetChildMapping(node *sitter.Node) *sitter.Node {
 	return GetChildOfType(node, "flow_mapping")
 }
 
+func GetChildSequence(node *sitter.Node) *sitter.Node {
+	blockMappingNode := GetChildOfType(node, "block_sequence")
+
+	if blockMappingNode != nil {
+		return blockMappingNode
+	}
+
+	return GetChildOfType(node, "flow_sequence")
+}
+
 func GetBlockMappingNode(streamNode *sitter.Node) *sitter.Node {
 	documentNode := GetChildOfType(streamNode, "document")
 	if documentNode.Type() != "document" {
@@ -113,7 +123,7 @@ func (doc *YamlDocument) getNodeTextArrayWithRange(valueNode *sitter.Node) []Tex
 	texts := make([]TextAndRange, 0)
 
 	if blockSequenceNode == nil {
-		blockSequenceNode = GetChildOfType(valueNode, "flow_sequence")
+		blockSequenceNode = GetChildSequence(valueNode)
 		if blockSequenceNode == nil {
 			return texts
 		}

pkg/parser/workflows.go

@@ -101,7 +101,7 @@ func (doc *YamlDocument) buildJobsDAG(jobRefs []ast.JobRef) map[string][]string
 
 func (doc *YamlDocument) parseJobReferences(jobsRefsNode *sitter.Node) []ast.JobRef {
 	// jobsRefsNode is block_node
-	blockSequenceNode := GetChildOfType(jobsRefsNode, "block_sequence")
+	blockSequenceNode := GetChildSequence(jobsRefsNode)
 	jobReferences := []ast.JobRef{}
 	if blockSequenceNode == nil {
 		return jobReferences

pkg/services/testdata/noErrors.yml

@@ -40,6 +40,16 @@ jobs:
     steps:
       - checkout
 
+  dummyJobWithStepParam:
+    executor:
+      name: &execRefBis go
+    parameters:
+      stepParam:
+        type: steps
+        default: []
+    steps:
+      - steps: << parameters.stepParam >>
+
 workflows:
   test-build:
     jobs:
@@ -62,6 +72,8 @@ workflows:
                 environment_type: something
                 environment: another thing
 
+      - dummyJobWithStepParam
+      
       - somejob:
           myparam: some-value
       - anotherjob