Merge pull request #4686 from kersten/chore/normalize-error-handling-in-config-v3

k8s-ci-robot · web-flow · commit a04265218b55 · 2025-03-27T09:26:35.000-07:00
🌱 (chore): normalize error messages and wrap errors using %w
diff --git a/pkg/config/v3/config.go b/pkg/config/v3/config.go
@@ -318,11 +318,11 @@ func (c *Cfg) EncodePluginConfig(key string, configObj interface{}) error {
 	// Get object's bytes and set them under key in extra fields.
 	b, err := yaml.Marshal(configObj)
 	if err != nil {
-		return fmt.Errorf("failed to convert %T object to bytes: %s", configObj, err)
+		return fmt.Errorf("failed to convert %T object to bytes: %w", configObj, err)
 	}
 	var fields map[string]interface{}
 	if err := yaml.Unmarshal(b, &fields); err != nil {
-		return fmt.Errorf("failed to unmarshal %T object bytes: %s", configObj, err)
+		return fmt.Errorf("failed to unmarshal %T object bytes: %w", configObj, err)
 	}
 	if c.Plugins == nil {
 		c.Plugins = make(map[string]pluginConfig)

Original file line number	Diff line number	Diff line change
`@@ -318,11 +318,11 @@ func (c *Cfg) EncodePluginConfig(key string, configObj interface{}) error {`
`318`	`318`	`// Get object's bytes and set them under key in extra fields.`
`319`	`319`	`b, err := yaml.Marshal(configObj)`
`320`	`320`	`if err != nil {`
`321`		`- return fmt.Errorf("failed to convert %T object to bytes: %s", configObj, err)`
	`321`	`+ return fmt.Errorf("failed to convert %T object to bytes: %w", configObj, err)`
`322`	`322`	`}`
`323`	`323`	`var fields map[string]interface{}`
`324`	`324`	`if err := yaml.Unmarshal(b, &fields); err != nil {`
`325`		`- return fmt.Errorf("failed to unmarshal %T object bytes: %s", configObj, err)`
	`325`	`+ return fmt.Errorf("failed to unmarshal %T object bytes: %w", configObj, err)`
`326`	`326`	`}`
`327`	`327`	`if c.Plugins == nil {`
`328`	`328`	`c.Plugins = make(map[string]pluginConfig)`