fix(reset): Add cycle detection fix for services that are prefixed with the name of a preceding service

idsulik · glours · commit c2ef6386e230 · 2024-10-30T08:43:56.000+01:00
Signed-off-by: Suleiman Dibirov &lt;idsulik@gmail.com&gt;
diff --git a/loader/reset.go b/loader/reset.go
@@ -63,7 +63,7 @@ func (p *ResetProcessor) resolveReset(node *yaml.Node, path tree.Path) (*yaml.No
 	}
 
 	// Mark the current node as visited
-	p.visitedNodes[node] = pathStr
+	p.visitedNodes[node] = pathStr + "."
 
 	// If the node is an alias, We need to process the alias field in order to consider the !override and !reset tags
 	if node.Kind == yaml.AliasNode {
diff --git a/loader/reset_test.go b/loader/reset_test.go
@@ -83,22 +83,71 @@ networks:
 }
 
 func TestResetCycle(t *testing.T) {
-	_, err := Load(
-		types.ConfigDetails{
-			ConfigFiles: []types.ConfigFile{
-				{
-					Filename: "(inline)",
-					Content: []byte(`
+	tests := []struct {
+		name        string
+		config      string
+		expectError bool
+		errorMsg    string
+	}{
+		{
+			name: "no cycle",
+			config: `
+name: test
+services:
+  a: &a
+    image: alpine
+  a2: *a
+`,
+			expectError: false,
+			errorMsg:    "",
+		},
+		{
+			name: "no cycle reversed",
+			config: `
+name: test
+services:
+  a2: &a
+    image: alpine
+  a: *a
+`,
+			expectError: false,
+			errorMsg:    "",
+		},
+		{
+			name: "healthcheck_cycle",
+			config: `
 x-healthcheck: &healthcheck
   egress-service:
     <<: *healthcheck
-`),
-				},
-			},
-		}, func(options *Options) {
-			options.SkipNormalization = true
-			options.SkipConsistencyCheck = true
+`,
+			expectError: true,
+			errorMsg:    "cycle detected at path: x-healthcheck.egress-service",
 		},
-	)
-	assert.Error(t, err, "cycle detected at path: x-healthcheck.egress-service")
+	}
+
+	for _, tt := range tests {
+		t.Run(
+			tt.name, func(t *testing.T) {
+				_, err := Load(
+					types.ConfigDetails{
+						ConfigFiles: []types.ConfigFile{
+							{
+								Filename: "(inline)",
+								Content:  []byte(tt.config),
+							},
+						},
+					}, func(options *Options) {
+						options.SkipNormalization = true
+						options.SkipConsistencyCheck = true
+					},
+				)
+
+				if tt.expectError {
+					assert.Error(t, err, tt.errorMsg)
+				} else {
+					assert.NilError(t, err)
+				}
+			},
+		)
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (p ResetProcessor) resolveReset(node yaml.Node, path tree.Path) (*yaml.No`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// Mark the current node as visited`
`66`		`- p.visitedNodes[node] = pathStr`
	`66`	`+ p.visitedNodes[node] = pathStr + "."`
`67`	`67`
`68`	`68`	`// If the node is an alias, We need to process the alias field in order to consider the !override and !reset tags`
`69`	`69`	`if node.Kind == yaml.AliasNode {`