fix(compiler): treat top level anchors like nested anchors

go-vela · Jan 30, 2025 · 7d24754 · 7d24754
1 parent abe0d5f
commit 7d24754
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 15 deletions.
diff --git a/internal/testdata/buildkite.yml b/internal/testdata/buildkite.yml
@@ -6,13 +6,13 @@ aliases:
       image: alpine:latest
 
   env:
-    dev-env: &dev-environment
-      environment:
+    dev-env: &dev-parameters
+      parameters:
         REGION: dev 
 
 steps:
   - name: example
     <<: *alpine-image
-    <<: *dev-environment
+    <<: *dev-parameters
     commands:
       - echo $REGION
diff --git a/internal/testdata/buildkite_new_version.yml b/internal/testdata/buildkite_new_version.yml
@@ -6,13 +6,13 @@ aliases:
       image: alpine:latest
 
   env:
-    dev-env: &dev-environment
-      environment:
+    dev-env: &dev-parameters
+      parameters:
         REGION: dev 
 
 steps:
   - name: example
     <<: *alpine-image
-    <<: *dev-environment
+    <<: *dev-parameters
     commands:
       - echo $REGION
diff --git a/internal/testdata/go-yaml.yml b/internal/testdata/go-yaml.yml
@@ -6,14 +6,14 @@ aliases:
       image: alpine:latest
 
   env:
-    dev-env: &dev-environment
-      environment:
+    dev-env: &dev-parameters
+      parameters:
         REGION: dev 
 
 steps:
   - name: example
     <<:
       - *alpine-image
-      - *dev-environment
+      - *dev-parameters
     commands:
       - echo $REGION
diff --git a/internal/testdata/no_version.yml b/internal/testdata/no_version.yml
@@ -4,14 +4,14 @@ aliases:
       image: alpine:latest
 
   env:
-    dev-env: &dev-environment
-      environment:
+    dev-env: &dev-parameters
+      parameters:
         REGION: dev 
 
 steps:
   - name: example
     <<:
       - *alpine-image
-      - *dev-environment
+      - *dev-parameters
     commands:
       - echo $REGION
diff --git a/internal/testdata/top_level_anchor.yml b/internal/testdata/top_level_anchor.yml
@@ -0,0 +1,16 @@
+version: "1"
+
+<<: &alpine-image
+      image: alpine:latest
+
+<<: &dev-parameters
+      parameters:
+        REGION: dev 
+
+steps:
+  - name: example
+    <<:
+      - *alpine-image
+      - *dev-parameters
+    commands:
+      - echo $REGION
diff --git a/internal/testdata/top_level_anchor_legacy.yml b/internal/testdata/top_level_anchor_legacy.yml
@@ -0,0 +1,16 @@
+version: "legacy"
+
+<<: &alpine-image
+      image: alpine:latest
+
+<<: &dev-parameters
+      parameters:
+        REGION: dev 
+
+steps:
+  - name: example
+    <<:
+      - *alpine-image
+      - *dev-parameters
+    commands:
+      - echo $REGION
diff --git a/internal/yaml.go b/internal/yaml.go
@@ -105,8 +105,8 @@ func collapseMergeAnchors(node *yaml.Node, warnings []string) []string {
 			keyNode := node.Content[i]
 
 			// anchor found
-			if keyNode.Value == "<<" {
-				if (i+1) < len(node.Content) && node.Content[i+1].Kind == yaml.AliasNode {
+			if keyNode.Tag == "!!merge" && keyNode.Value == "<<" {
+				if (i + 1) < len(node.Content) {
 					anchors = append(anchors, node.Content[i+1])
 				}
 

diff --git a/internal/yaml_test.go b/internal/yaml_test.go
@@ -23,7 +23,7 @@ func TestInternal_ParseYAML(t *testing.T) {
 			&yaml.Step{
 				Name:  "example",
 				Image: "alpine:latest",
-				Environment: map[string]string{
+				Parameters: map[string]interface{}{
 					"REGION": "dev",
 				},
 				Pull: "not_present",
@@ -47,6 +47,18 @@ func TestInternal_ParseYAML(t *testing.T) {
 			file:      "testdata/go-yaml.yml",
 			wantBuild: wantBuild,
 		},
+		{
+			name:         "top level anchors",
+			file:         "testdata/top_level_anchor.yml",
+			wantBuild:    wantBuild,
+			wantWarnings: []string{`6:duplicate << keys in single YAML map`},
+		},
+		{
+			name:         "top level anchors legacy",
+			file:         "testdata/top_level_anchor_legacy.yml",
+			wantBuild:    wantBuild,
+			wantWarnings: []string{`using legacy version - address any incompatibilities and use "1" instead`},
+		},
 		{
 			name:         "buildkite legacy",
 			file:         "testdata/buildkite.yml",