Merge pull request #1059 from MisterMX/fix/custom-plugins-hash

benjaminhuo · web-flow · commit 4233bb7177b6 · 2024-02-07T11:31:04.000+08:00
fix(fluentd): Use custom plugin content for hash generation
diff --git a/apis/fluentd/v1alpha1/plugins/params/model.go b/apis/fluentd/v1alpha1/plugins/params/model.go
@@ -72,6 +72,13 @@ func (ps *PluginStore) Hash() string {
 		c.Store[k] = v
 	}
 
+	// Custom plugins don't have stored properties but only contain the config
+	// as plain text.
+	// Set the content here to avoid generating the same hash code for all
+	// custom plugins resulting in only one custom plugin being ever set for
+	// one config.
+	c.Content = ps.Content
+
 	c.InsertChilds(ps.Childs...)
 	return utils.HashCode(c.String())
 }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,13 @@ func (ps *PluginStore) Hash() string {`
`72`	`72`	`c.Store[k] = v`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ // Custom plugins don't have stored properties but only contain the config`
	`76`	`+ // as plain text.`
	`77`	`+ // Set the content here to avoid generating the same hash code for all`
	`78`	`+ // custom plugins resulting in only one custom plugin being ever set for`
	`79`	`+ // one config.`
	`80`	`+ c.Content = ps.Content`
	`81`	`+`
`75`	`82`	`c.InsertChilds(ps.Childs...)`
`76`	`83`	`return utils.HashCode(c.String())`
`77`	`84`	`}`